]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
11 years agoadded icons and mimetypes for .msi and .exe files
Bernhard Posselt [Sat, 9 Feb 2013 17:09:03 +0000 (18:09 +0100)]
added icons and mimetypes for .msi and .exe files

11 years agoMerge pull request #1561 from Raydiation/master
Jörn Friedrich Dreyer [Sat, 9 Feb 2013 16:56:12 +0000 (08:56 -0800)]
Merge pull request #1561 from Raydiation/master

Moved the iframe height and width fix from js to css

11 years agoRevert "moved iframe height and width fix from js to css"
Bernhard Posselt [Sat, 9 Feb 2013 16:46:23 +0000 (17:46 +0100)]
Revert "moved iframe height and width fix from js to css"

This reverts commit 842fc85b9a42aaa0ce31c71e05507ed5eeaa6dc4.

11 years agoRevert "added exe and msi filetypes and icon"
Bernhard Posselt [Sat, 9 Feb 2013 16:46:07 +0000 (17:46 +0100)]
Revert "added exe and msi filetypes and icon"

This reverts commit aa1adf42c74569f2591a59855bf370584ed1e5cc.

11 years agoadded exe and msi filetypes and icon
Bernhard Posselt [Sat, 9 Feb 2013 12:32:52 +0000 (13:32 +0100)]
added exe and msi filetypes and icon

11 years agomoved iframe height and width fix from js to css
Bernhard Posselt [Sat, 9 Feb 2013 10:34:25 +0000 (11:34 +0100)]
moved iframe height and width fix from js to css

11 years agoMerge pull request #1566 from owncloud/fixing-1505-master
Thomas Müller [Sat, 9 Feb 2013 16:33:44 +0000 (08:33 -0800)]
Merge pull request #1566 from owncloud/fixing-1505-master

fixes zip download for folders containing a dot .....

11 years agoMerge pull request #1572 from owncloud/fix_empty_path_handling
icewind1991 [Sat, 9 Feb 2013 16:25:25 +0000 (08:25 -0800)]
Merge pull request #1572 from owncloud/fix_empty_path_handling

fix empty path handling

11 years agofix empty path handling
Jörn Friedrich Dreyer [Sat, 9 Feb 2013 15:58:55 +0000 (16:58 +0100)]
fix empty path handling

11 years agoRemove unneeded __destruct call in OC\Files\Storage\Temporary
Bart Visscher [Sat, 9 Feb 2013 15:18:30 +0000 (16:18 +0100)]
Remove unneeded __destruct call in OC\Files\Storage\Temporary

11 years agojson_encode the appid
Lukas Reschke [Sat, 9 Feb 2013 14:06:29 +0000 (15:06 +0100)]
json_encode the appid

11 years agoMerge pull request #1481 from owncloud/fixing-1354-master
Thomas Müller [Sat, 9 Feb 2013 13:13:33 +0000 (05:13 -0800)]
Merge pull request #1481 from owncloud/fixing-1354-master

basic WebDAV test in place now

11 years agoknow your libraries ;-)
Thomas Müller [Sat, 9 Feb 2013 12:51:44 +0000 (13:51 +0100)]
know your libraries ;-)

strrpos fails in cases the file in the path has no dot but the parent folder

11 years agoMerge pull request #1512 from owncloud/mapped-filename-storage
icewind1991 [Sat, 9 Feb 2013 12:45:25 +0000 (04:45 -0800)]
Merge pull request #1512 from owncloud/mapped-filename-storage

initial version of a local storage implementation which will use unique ...

11 years agoMerge pull request #1565 from owncloud/fix_replacing
Jörn Friedrich Dreyer [Sat, 9 Feb 2013 11:58:06 +0000 (03:58 -0800)]
Merge pull request #1565 from owncloud/fix_replacing

remove code properly to make @DeepDiver1975 happy ;)

11 years agoremove code properly
Georg Ehrke [Sat, 9 Feb 2013 11:38:40 +0000 (12:38 +0100)]
remove code properly

11 years agoMerge pull request #1560 from owncloud/fix_replacing
Bernhard Posselt [Sat, 9 Feb 2013 11:28:40 +0000 (03:28 -0800)]
Merge pull request #1560 from owncloud/fix_replacing

remove (comment out) old code to fix replacing of files

11 years agoMerge pull request #1545 from owncloud/fix-oc_webroot
Thomas Müller [Sat, 9 Feb 2013 11:27:22 +0000 (03:27 -0800)]
Merge pull request #1545 from owncloud/fix-oc_webroot

fixup oc_webroot correctly before and after setup

11 years agoMerge pull request #1537 from owncloud/fix_sharing_dropdown_event_handlers
Thomas Müller [Sat, 9 Feb 2013 11:23:19 +0000 (03:23 -0800)]
Merge pull request #1537 from owncloud/fix_sharing_dropdown_event_handlers

attach handlers to document instead of filelist

11 years agoMerge pull request #1562 from schiesbn/fix_naming
Bernhard Posselt [Sat, 9 Feb 2013 11:21:30 +0000 (03:21 -0800)]
Merge pull request #1562 from schiesbn/fix_naming

rename trash to trash bin

11 years agoMerge pull request #1521 from schiesbn/label_fixed
Björn Schießle [Sat, 9 Feb 2013 11:14:25 +0000 (03:14 -0800)]
Merge pull request #1521 from schiesbn/label_fixed

don't call the delete button unshare, unshare operation no longer available

11 years agorename trash to trash bin
Björn Schießle [Sat, 9 Feb 2013 11:01:49 +0000 (12:01 +0100)]
rename trash to trash bin

11 years agomoved iframe height and width fix from js to css
Bernhard Posselt [Sat, 9 Feb 2013 10:34:25 +0000 (11:34 +0100)]
moved iframe height and width fix from js to css

11 years agoremove (comment out) old code to fix replacing of files
Georg Ehrke [Sat, 9 Feb 2013 10:27:03 +0000 (11:27 +0100)]
remove (comment out) old code to fix replacing of files

11 years agoMerge pull request #1550 from owncloud/fix-files-download-links
Jörn Friedrich Dreyer [Sat, 9 Feb 2013 09:28:25 +0000 (01:28 -0800)]
Merge pull request #1550 from owncloud/fix-files-download-links

Fix files router download links

11 years agoMerge pull request #1541 from owncloud/fixing-1540-master
Jörn Friedrich Dreyer [Sat, 9 Feb 2013 09:17:11 +0000 (01:17 -0800)]
Merge pull request #1541 from owncloud/fixing-1540-master

remove undefined function FileList.finishDelete

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 8 Feb 2013 23:14:08 +0000 (00:14 +0100)]
[tx-robot] updated from transifex

11 years agoMerge pull request #1547 from owncloud/navigation-color
Thomas Müller [Fri, 8 Feb 2013 21:30:25 +0000 (13:30 -0800)]
Merge pull request #1547 from owncloud/navigation-color

brighter grey for the navigation bar

11 years agoMerge pull request #1548 from owncloud/installation-improvements
Thomas Müller [Fri, 8 Feb 2013 21:27:15 +0000 (13:27 -0800)]
Merge pull request #1548 from owncloud/installation-improvements

Installation improvements

11 years agoFix files router download links
Bart Visscher [Fri, 8 Feb 2013 21:05:13 +0000 (22:05 +0100)]
Fix files router download links

11 years agouse proper HTML for other security warning too
Jan-Christoph Borchardt [Fri, 8 Feb 2013 18:59:42 +0000 (19:59 +0100)]
use proper HTML for other security warning too

11 years agobrighter grey for the navigation bar, hopefully solves the weird similarity to the...
Jan-Christoph Borchardt [Fri, 8 Feb 2013 18:33:22 +0000 (19:33 +0100)]
brighter grey for the navigation bar, hopefully solves the weird similarity to the header

11 years agoMerge pull request #1439 from owncloud/fix-archive-tar-on-win32-master
Thomas Müller [Fri, 8 Feb 2013 18:18:49 +0000 (10:18 -0800)]
Merge pull request #1439 from owncloud/fix-archive-tar-on-win32-master

quick fixing this require_once.

11 years agofix-oc_webroot
Bart Visscher [Fri, 8 Feb 2013 17:44:52 +0000 (18:44 +0100)]
fix-oc_webroot

11 years agoremove unused code
Thomas Müller [Fri, 8 Feb 2013 17:04:27 +0000 (18:04 +0100)]
remove unused code

11 years agoremove undefined function FileList.finishDelete
Thomas Müller [Fri, 8 Feb 2013 14:51:28 +0000 (15:51 +0100)]
remove undefined function FileList.finishDelete

11 years agoin case curl is not present we cannot test
Thomas Müller [Fri, 8 Feb 2013 14:23:26 +0000 (15:23 +0100)]
in case curl is not present we cannot test

11 years agoquick fixing this require_once.
Thomas Mueller [Thu, 24 Jan 2013 15:56:23 +0000 (16:56 +0100)]
quick fixing this require_once.

On windows the wrong file will be required: lib/archive/tar.php and not Archive/Tar.php.

Best would be to rename the lib/archive/tar.php or put it into a different folder

11 years agoMerge pull request #1539 from owncloud/fixing-1508-master
Bart Visscher [Fri, 8 Feb 2013 13:25:00 +0000 (05:25 -0800)]
Merge pull request #1539 from owncloud/fixing-1508-master

missing comma in sql statement

11 years agomissing comma in sql statement
Thomas Müller [Fri, 8 Feb 2013 12:49:26 +0000 (13:49 +0100)]
missing comma in sql statement

11 years agoimprove and shorten security warning, add link to docs, fix #1342
Jan-Christoph Borchardt [Fri, 8 Feb 2013 12:37:57 +0000 (13:37 +0100)]
improve and shorten security warning, add link to docs, fix #1342

11 years agoMerge pull request #1534 from owncloud/files_l10n
Thomas Müller [Fri, 8 Feb 2013 11:58:17 +0000 (03:58 -0800)]
Merge pull request #1534 from owncloud/files_l10n

Add translation support back to move/rename

11 years agoFiles: explicitly define
Robin Appelman [Fri, 8 Feb 2013 11:03:28 +0000 (12:03 +0100)]
Files: explicitly define

11 years agoattach handlers to document instead of filelist, minor whitespace cleanups
Jörn Friedrich Dreyer [Fri, 8 Feb 2013 10:05:56 +0000 (11:05 +0100)]
attach handlers to document instead of filelist, minor whitespace cleanups

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 7 Feb 2013 23:13:16 +0000 (00:13 +0100)]
[tx-robot] updated from transifex

11 years agoFiles: rename 'space' to 'storage' in upload.php
Robin Appelman [Thu, 7 Feb 2013 22:59:14 +0000 (23:59 +0100)]
Files: rename 'space' to 'storage' in upload.php

11 years agoFiles: add translation support back to move/rename
Robin Appelman [Thu, 7 Feb 2013 22:57:18 +0000 (23:57 +0100)]
Files: add translation support back to move/rename

11 years agoMerge pull request #1527 from owncloud/simplyfy_file_mimetype_parsing
icewind1991 [Thu, 7 Feb 2013 22:47:10 +0000 (14:47 -0800)]
Merge pull request #1527 from owncloud/simplyfy_file_mimetype_parsing

simplyfy mimetype parsing of 'file' output

11 years agoMerge pull request #1514 from owncloud/fix-setup
Lukas Reschke [Thu, 7 Feb 2013 21:48:44 +0000 (13:48 -0800)]
Merge pull request #1514 from owncloud/fix-setup

Fix setup

11 years agoMerge pull request #1529 from owncloud/installation-login-fixes
Thomas Müller [Thu, 7 Feb 2013 21:40:25 +0000 (13:40 -0800)]
Merge pull request #1529 from owncloud/installation-login-fixes

Installation login fixes

11 years agoMerge pull request #1507 from tripflex/master
Bart Visscher [Thu, 7 Feb 2013 20:49:14 +0000 (12:49 -0800)]
Merge pull request #1507 from tripflex/master

remove float left from actions div class

fixes #1504

11 years agoMerge pull request #1526 from owncloud/l10n-support-master
Lukas Reschke [Thu, 7 Feb 2013 20:38:36 +0000 (12:38 -0800)]
Merge pull request #1526 from owncloud/l10n-support-master

L10n support master

11 years agoFill oc_webroot with the expected value
Bart Visscher [Thu, 7 Feb 2013 20:13:57 +0000 (21:13 +0100)]
Fill oc_webroot with the expected value

11 years agoMerge pull request #1530 from owncloud/fix-warning-displayname-layout
blizzz [Thu, 7 Feb 2013 19:25:33 +0000 (11:25 -0800)]
Merge pull request #1530 from owncloud/fix-warning-displayname-layout

Fix warning with displayname in user layout template

11 years agoMerge pull request #1531 from owncloud/cron_no_routes
blizzz [Thu, 7 Feb 2013 19:22:58 +0000 (11:22 -0800)]
Merge pull request #1531 from owncloud/cron_no_routes

Fix router warnings when running as CLI

11 years agoFix previous commit
Robin Appelman [Thu, 7 Feb 2013 17:30:01 +0000 (18:30 +0100)]
Fix previous commit

11 years agoUse dummy request method in CLI
Robin Appelman [Thu, 7 Feb 2013 17:28:56 +0000 (18:28 +0100)]
Use dummy request method in CLI

11 years agomake show password toggle work for installation (once #1525 is fixed)
Jan-Christoph Borchardt [Thu, 7 Feb 2013 17:04:14 +0000 (18:04 +0100)]
make show password toggle work for installation (once #1525 is fixed)

11 years agoFix warning with displayname in user layout template
Bart Visscher [Thu, 7 Feb 2013 17:07:27 +0000 (18:07 +0100)]
Fix warning with displayname in user layout template

11 years agoDon't try to use routes when called from cli
Robin Appelman [Thu, 7 Feb 2013 16:53:38 +0000 (17:53 +0100)]
Don't try to use routes when called from cli

11 years agosimplyfy mimetype parsing of 'file' output
Jörn Friedrich Dreyer [Thu, 7 Feb 2013 16:42:03 +0000 (17:42 +0100)]
simplyfy mimetype parsing of 'file' output

11 years agomake show password not specific to log in
Jan-Christoph Borchardt [Thu, 7 Feb 2013 16:41:24 +0000 (17:41 +0100)]
make show password not specific to log in

11 years agoremove duplicate show password toggle code, move current one to proper location
Jan-Christoph Borchardt [Thu, 7 Feb 2013 16:04:03 +0000 (17:04 +0100)]
remove duplicate show password toggle code, move current one to proper location

11 years agosome comments for CSS documentation
Jan-Christoph Borchardt [Thu, 7 Feb 2013 16:02:43 +0000 (17:02 +0100)]
some comments for CSS documentation

11 years agofix database labels having left padding
Jan-Christoph Borchardt [Thu, 7 Feb 2013 15:57:54 +0000 (16:57 +0100)]
fix database labels having left padding

11 years agol10n support enhanced in core
Thomas Mueller [Thu, 7 Feb 2013 15:49:36 +0000 (16:49 +0100)]
l10n support enhanced in core

11 years agol10n support enhanced in files_versions
Thomas Mueller [Thu, 7 Feb 2013 15:34:57 +0000 (16:34 +0100)]
l10n support enhanced in files_versions

11 years agol10n support enhanced in files_trashbin
Thomas Mueller [Thu, 7 Feb 2013 15:31:04 +0000 (16:31 +0100)]
l10n support enhanced in files_trashbin

11 years agol10n support enhanced in files_version
Thomas Mueller [Thu, 7 Feb 2013 15:17:54 +0000 (16:17 +0100)]
l10n support enhanced in files_version

11 years agoMerge pull request #1524 from owncloud/fix_ldaps_tls_setting
blizzz [Thu, 7 Feb 2013 15:06:35 +0000 (07:06 -0800)]
Merge pull request #1524 from owncloud/fix_ldaps_tls_setting

LDAP: don't try to put TLS on top of already secure connection (will fail).

11 years agoTypo
Arthur Schiwon [Thu, 7 Feb 2013 15:05:45 +0000 (16:05 +0100)]
Typo

11 years agoMerge pull request #1451 from eMerzh/fix_1065
Thomas Müller [Thu, 7 Feb 2013 14:27:58 +0000 (06:27 -0800)]
Merge pull request #1451 from eMerzh/fix_1065

Add Redirect to getUrlContent fix #1065

11 years agoMerge pull request #1518 from schiesbn/trash_layout_fix
blizzz [Thu, 7 Feb 2013 12:40:51 +0000 (04:40 -0800)]
Merge pull request #1518 from schiesbn/trash_layout_fix

add class hascontrols to trash bin file table

11 years agoMerge pull request #1522 from schiesbn/trash_bin_fix
Björn Schießle [Thu, 7 Feb 2013 12:38:22 +0000 (04:38 -0800)]
Merge pull request #1522 from schiesbn/trash_bin_fix

OCA_Versions is now known as OCA\Files_Versions

11 years agoremove debug output
Björn Schießle [Thu, 7 Feb 2013 12:16:15 +0000 (13:16 +0100)]
remove debug output

11 years agorename OCA_Trash to OCA\Files_Trashbin
Björn Schießle [Thu, 7 Feb 2013 12:14:45 +0000 (13:14 +0100)]
rename OCA_Trash to OCA\Files_Trashbin

11 years agoOCA_Versions is now known as OCA\Files_Versions
Björn Schießle [Thu, 7 Feb 2013 11:45:27 +0000 (12:45 +0100)]
OCA_Versions is now known as OCA\Files_Versions

11 years agodon't call the delete button unshare, unshare operation no longer available
Björn Schießle [Thu, 7 Feb 2013 11:42:09 +0000 (12:42 +0100)]
don't call the delete button unshare, unshare operation no longer available

11 years agoMerge branch 'master' into fixing-1354-master
Thomas Mueller [Thu, 7 Feb 2013 09:44:28 +0000 (10:44 +0100)]
Merge branch 'master' into fixing-1354-master

Conflicts:
settings/admin.php
settings/templates/admin.php

11 years agoadd class hascontrols to trash bin file table
Björn Schießle [Thu, 7 Feb 2013 09:13:09 +0000 (10:13 +0100)]
add class hascontrols to trash bin file table

11 years agoFix disabling setup form on submit
Bart Visscher [Thu, 7 Feb 2013 07:12:09 +0000 (08:12 +0100)]
Fix disabling setup form on submit

11 years agoDefine the variables that are expected to exist but won't be set in setup
Bart Visscher [Thu, 7 Feb 2013 07:11:18 +0000 (08:11 +0100)]
Define the variables that are expected to exist but won't be set in setup

11 years agoMove loading of js_config to templatelayout
Bart Visscher [Thu, 7 Feb 2013 07:09:53 +0000 (08:09 +0100)]
Move loading of js_config to templatelayout

Also check for installed flag because this isn't available before setup

11 years agoshow webdav test results in admin section as well
Thomas Mueller [Wed, 6 Feb 2013 23:49:39 +0000 (00:49 +0100)]
show webdav test results in admin section as well

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 6 Feb 2013 23:11:04 +0000 (00:11 +0100)]
[tx-robot] updated from transifex

11 years agoinitial version of a local storage implementation which will use unique slugified...
Thomas Mueller [Wed, 6 Feb 2013 22:36:38 +0000 (23:36 +0100)]
initial version of a local storage implementation which will use unique slugified filename on the local filesystem.
This implementation will only be enabled on windows based system to solve the issues around UTF-8 file names with php on windows.

11 years agoMerge pull request #1500 from chriskoch/patch-1
Frank Karlitschek [Wed, 6 Feb 2013 21:00:10 +0000 (13:00 -0800)]
Merge pull request #1500 from chriskoch/patch-1

Update lib/public/util.php

11 years agoMerge pull request #1509 from owncloud/correct-public-contacts-tests
Lukas Reschke [Wed, 6 Feb 2013 20:29:51 +0000 (12:29 -0800)]
Merge pull request #1509 from owncloud/correct-public-contacts-tests

Correct lib/public/contacts.php tests

11 years agoMerge pull request #1443 from owncloud/use-module-file-info-master
Lukas Reschke [Wed, 6 Feb 2013 19:53:13 +0000 (11:53 -0800)]
Merge pull request #1443 from owncloud/use-module-file-info-master

we get best results regarding mime type detection if we use fileinfo - l...

11 years agoMerge pull request #1506 from owncloud/files_encryption
Lukas Reschke [Wed, 6 Feb 2013 19:47:55 +0000 (11:47 -0800)]
Merge pull request #1506 from owncloud/files_encryption

Files encryption

11 years agoMerge pull request #1498 from schiesbn/delete_trash
Lukas Reschke [Wed, 6 Feb 2013 19:27:32 +0000 (11:27 -0800)]
Merge pull request #1498 from schiesbn/delete_trash

delete files from trash bin permanently

11 years agoMerge pull request #1363 from owncloud/FixPasswordChange
Lukas Reschke [Wed, 6 Feb 2013 19:14:59 +0000 (11:14 -0800)]
Merge pull request #1363 from owncloud/FixPasswordChange

Fix password change

11 years agoReverted fix temporarily; another fix by LukasReschke is awaiting merge
Sam Tuke [Wed, 6 Feb 2013 19:06:55 +0000 (19:06 +0000)]
Reverted fix temporarily; another fix by  LukasReschke is awaiting merge

11 years agoRemove left float from actions div class
Myles McNamara [Wed, 6 Feb 2013 18:44:41 +0000 (13:44 -0500)]
Remove left float from actions div class

11 years agoMerge branch 'master' into files_encryption
Sam Tuke [Wed, 6 Feb 2013 18:26:44 +0000 (18:26 +0000)]
Merge branch 'master' into files_encryption

11 years agoAdded comment
Sam Tuke [Wed, 6 Feb 2013 18:24:35 +0000 (18:24 +0000)]
Added comment

11 years agoMerge pull request #1502 from owncloud/gitignore-cloud9
Thomas Müller [Wed, 6 Feb 2013 18:16:49 +0000 (10:16 -0800)]
Merge pull request #1502 from owncloud/gitignore-cloud9

gitignore Cloud9IDE system folder

11 years agoMerge pull request #1501 from owncloud/fix-shorttag
Jan-Christoph Borchardt [Wed, 6 Feb 2013 18:01:40 +0000 (10:01 -0800)]
Merge pull request #1501 from owncloud/fix-shorttag

fix shorttag issue mentioned in #1357

11 years agoRemoved debugging code
Sam Tuke [Wed, 6 Feb 2013 17:59:47 +0000 (17:59 +0000)]
Removed debugging code

11 years agoAdded comments
Sam Tuke [Wed, 6 Feb 2013 17:43:03 +0000 (17:43 +0000)]
Added comments