]>
source.dussan.org Git - nextcloud-server.git/log
Thomas Mueller [Sun, 10 Feb 2013 16:31:12 +0000 (17:31 +0100)]
no need to implement createUser in web dav auth
Thomas Müller [Sat, 9 Feb 2013 18:15:23 +0000 (19:15 +0100)]
Merge branch 'master' into fixing-1424-master
Thomas Müller [Sat, 9 Feb 2013 17:59:41 +0000 (09:59 -0800)]
Merge pull request #1546 from owncloud/fix-loading-hooks
Fix loading hooks when going though the routing system
Thomas Müller [Sat, 9 Feb 2013 17:58:05 +0000 (09:58 -0800)]
Merge pull request #1543 from owncloud/utf8-locale-master
some systems use en_US.UTF8 instead of en_US.UTF-8
Thomas Müller [Sat, 9 Feb 2013 17:57:23 +0000 (09:57 -0800)]
Merge pull request #1570 from owncloud/refactor_filelist_addFile_addDir
extract common code
Thomas Müller [Sat, 9 Feb 2013 17:56:26 +0000 (09:56 -0800)]
Merge pull request #1569 from owncloud/clean-app-id
Remove invalid characters from app id to prevent loading of invalid reso...
Bernhard Posselt [Sat, 9 Feb 2013 17:14:40 +0000 (09:14 -0800)]
Merge pull request #1575 from owncloud/exec_mimetype
added 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
Sam Tuke [Sat, 9 Feb 2013 17:04:47 +0000 (09:04 -0800)]
Merge pull request #1383 from owncloud/files_encryption-style-fixes
first style fixes - @samtuke: I added some TODO regarding undefined vari...
Thomas Müller [Sat, 9 Feb 2013 17:01:38 +0000 (18:01 +0100)]
cleanup - more to come after
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
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 .
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 .
Bernhard Posselt [Sat, 9 Feb 2013 12:32:52 +0000 (13:32 +0100)]
added exe and msi filetypes and icon
Bernhard Posselt [Sat, 9 Feb 2013 10:34:25 +0000 (11:34 +0100)]
moved iframe height and width fix from js to css
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 .....
Thomas Müller [Sat, 9 Feb 2013 16:28:30 +0000 (17:28 +0100)]
Merge branch 'master' into clean-app-id
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
Jörn Friedrich Dreyer [Sat, 9 Feb 2013 15:58:55 +0000 (16:58 +0100)]
fix empty path handling
Bart Visscher [Sat, 9 Feb 2013 15:18:30 +0000 (16:18 +0100)]
Remove unneeded __destruct call in OC\Files\Storage\Temporary
Bart Visscher [Sat, 9 Feb 2013 14:03:47 +0000 (15:03 +0100)]
Remove invalid characters from app id to prevent loading of invalid resources
Lukas Reschke [Sat, 9 Feb 2013 14:06:29 +0000 (15:06 +0100)]
json_encode the appid
Jörn Friedrich Dreyer [Sat, 9 Feb 2013 13:42:03 +0000 (14:42 +0100)]
extract common code
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
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
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 ...
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 ;)
Sam Tuke [Sat, 9 Feb 2013 11:52:11 +0000 (11:52 +0000)]
Merge branch 'master' into files_encryption-style-fixes
Conflicts:
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/util.php
Georg Ehrke [Sat, 9 Feb 2013 11:38:40 +0000 (12:38 +0100)]
remove code properly
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
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
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
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
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
Björn Schießle [Sat, 9 Feb 2013 11:01:49 +0000 (12:01 +0100)]
rename trash to trash bin
Bernhard Posselt [Sat, 9 Feb 2013 10:34:25 +0000 (11:34 +0100)]
moved iframe height and width fix from js to css
Georg Ehrke [Sat, 9 Feb 2013 10:27:03 +0000 (11:27 +0100)]
remove (comment out) old code to fix replacing of files
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
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
Jenkins for ownCloud [Fri, 8 Feb 2013 23:14:08 +0000 (00:14 +0100)]
[tx-robot] updated from transifex
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
Thomas Müller [Fri, 8 Feb 2013 21:27:15 +0000 (13:27 -0800)]
Merge pull request #1548 from owncloud/installation-improvements
Installation improvements
Bart Visscher [Fri, 8 Feb 2013 21:05:13 +0000 (22:05 +0100)]
Fix files router download links
Jan-Christoph Borchardt [Fri, 8 Feb 2013 18:59:42 +0000 (19:59 +0100)]
use proper HTML for other security warning too
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
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.
Bart Visscher [Fri, 8 Feb 2013 18:06:59 +0000 (19:06 +0100)]
Always load the apps before trying to match a route
Bart Visscher [Fri, 8 Feb 2013 17:53:43 +0000 (18:53 +0100)]
Better way of getting the navigation entries for an app
Bart Visscher [Fri, 8 Feb 2013 17:44:52 +0000 (18:44 +0100)]
fix-oc_webroot
Thomas Müller [Fri, 8 Feb 2013 17:04:27 +0000 (18:04 +0100)]
remove unused code
Thomas Müller [Fri, 8 Feb 2013 16:49:54 +0000 (17:49 +0100)]
some systems use en_US.UTF8 instead of en_US.UTF-8
Thomas Müller [Fri, 8 Feb 2013 16:16:18 +0000 (17:16 +0100)]
on creation only test for existing users if the backend supports user creation
this solves the issue where no users can be created any more if backends are active which always return true on userExists() like WebDAV Auth
Thomas Müller [Fri, 8 Feb 2013 14:51:28 +0000 (15:51 +0100)]
remove undefined function FileList.finishDelete
Thomas Müller [Fri, 8 Feb 2013 14:23:26 +0000 (15:23 +0100)]
in case curl is not present we cannot test
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
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
Thomas Müller [Fri, 8 Feb 2013 12:49:26 +0000 (13:49 +0100)]
missing comma in sql statement
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
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
Robin Appelman [Fri, 8 Feb 2013 11:03:28 +0000 (12:03 +0100)]
Files: explicitly define
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
Jenkins for ownCloud [Thu, 7 Feb 2013 23:13:16 +0000 (00:13 +0100)]
[tx-robot] updated from transifex
Robin Appelman [Thu, 7 Feb 2013 22:59:14 +0000 (23:59 +0100)]
Files: rename 'space' to 'storage' in upload.php
Robin Appelman [Thu, 7 Feb 2013 22:57:18 +0000 (23:57 +0100)]
Files: add translation support back to move/rename
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
Lukas Reschke [Thu, 7 Feb 2013 21:48:44 +0000 (13:48 -0800)]
Merge pull request #1514 from owncloud/fix-setup
Fix setup
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
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
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
Bart Visscher [Thu, 7 Feb 2013 20:13:57 +0000 (21:13 +0100)]
Fill oc_webroot with the expected value
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
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
Robin Appelman [Thu, 7 Feb 2013 17:30:01 +0000 (18:30 +0100)]
Fix previous commit
Robin Appelman [Thu, 7 Feb 2013 17:28:56 +0000 (18:28 +0100)]
Use dummy request method in CLI
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)
Bart Visscher [Thu, 7 Feb 2013 17:07:27 +0000 (18:07 +0100)]
Fix warning with displayname in user layout template
Robin Appelman [Thu, 7 Feb 2013 16:53:38 +0000 (17:53 +0100)]
Don't try to use routes when called from cli
Jörn Friedrich Dreyer [Thu, 7 Feb 2013 16:42:03 +0000 (17:42 +0100)]
simplyfy mimetype parsing of 'file' output
Jan-Christoph Borchardt [Thu, 7 Feb 2013 16:41:24 +0000 (17:41 +0100)]
make show password not specific to log in
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
Jan-Christoph Borchardt [Thu, 7 Feb 2013 16:02:43 +0000 (17:02 +0100)]
some comments for CSS documentation
Jan-Christoph Borchardt [Thu, 7 Feb 2013 15:57:54 +0000 (16:57 +0100)]
fix database labels having left padding
Thomas Mueller [Thu, 7 Feb 2013 15:49:36 +0000 (16:49 +0100)]
l10n support enhanced in core
Thomas Mueller [Thu, 7 Feb 2013 15:34:57 +0000 (16:34 +0100)]
l10n support enhanced in files_versions
Thomas Mueller [Thu, 7 Feb 2013 15:31:04 +0000 (16:31 +0100)]
l10n support enhanced in files_trashbin
Thomas Mueller [Thu, 7 Feb 2013 15:17:54 +0000 (16:17 +0100)]
l10n support enhanced in files_version
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).
Arthur Schiwon [Thu, 7 Feb 2013 15:05:45 +0000 (16:05 +0100)]
Typo
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
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
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
Björn Schießle [Thu, 7 Feb 2013 12:16:15 +0000 (13:16 +0100)]
remove debug output
Björn Schießle [Thu, 7 Feb 2013 12:14:45 +0000 (13:14 +0100)]
rename OCA_Trash to OCA\Files_Trashbin
Björn Schießle [Thu, 7 Feb 2013 11:45:27 +0000 (12:45 +0100)]
OCA_Versions is now known as OCA\Files_Versions
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
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
Björn Schießle [Thu, 7 Feb 2013 09:13:09 +0000 (10:13 +0100)]
add class hascontrols to trash bin file table
Bart Visscher [Thu, 7 Feb 2013 07:12:09 +0000 (08:12 +0100)]
Fix disabling setup form on submit
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
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