mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,117 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

9117 Commits

Author SHA1 Message Date
Sam Tuke 06847f609b Improved support for detecting and recrypting legacy files. Bugs remain. 2013-01-31 19:40:51 +00:00
Sam Tuke c6b3bdd5a0 Fixed compatibility with filecache rewrite merge 2013-01-31 17:51:46 +00:00
Sam Tuke 2183f77527 Fixed incompatibilities with filecache rewrite merge 2013-01-31 16:49:07 +00:00
Sam Tuke 31e723a907 Merge github.com:owncloud/core 
Conflicts:
	lib/public/share.php
 2013-01-31 16:30:37 +00:00
Jenkins for ownCloud 209d599ec5 [tx-robot] updated from transifex 2013-01-31 17:05:21 +01:00
Thomas Mueller 4162ba4d41 adding l10n support to files_trashbin 2013-01-31 16:48:41 +01:00
Jan-Christoph Borchardt 43f8bf8e5c Merge pull request #1358 from owncloud/button-fix 
increase opacity of buttons, fix for dark backgrounds like header in pub...
 2013-01-31 06:40:14 -08:00
Jan-Christoph Borchardt f0ca8eeba4 no box-shadow for public share download button 2013-01-31 15:21:50 +01:00
Björn Schießle 8dd9dedee8 Merge pull request #1266 from schiesbn/trash_bin 
Trash bin
 2013-01-31 06:18:22 -08:00
Robin Appelman 54d46fe43c remove outdated line 2013-01-31 15:00:48 +01:00
Björn Schießle c8a4878b77 is_writable() is now isUpdatable() with the new filesystem 2013-01-31 14:55:14 +01:00
Björn Schießle dff5148f6d debug output removed 2013-01-31 14:48:57 +01:00
Jan-Christoph Borchardt 300ecc2ed2 change button box-shadow from hard white to slight transparent 2013-01-31 12:59:36 +01:00
Björn Schießle 13165bbea2 Merge pull request #1390 from schiesbn/search_display_name_and_uid 
Search display name and uid
 2013-01-31 03:53:32 -08:00
Björn Schießle 77765bd967 remove some left over comments 2013-01-31 12:17:23 +01:00
Björn Schießle ab255e8bb6 add missing brackets 2013-01-31 12:12:39 +01:00
Björn Schießle 9a19c0af4b search for display name and uid (with no display name) since it is possible that not all users have a seperate display name 2013-01-31 12:09:42 +01:00
Björn Schießle 54eeb8b8fc fix merge conflict 2013-01-31 10:55:59 +01:00
Björn Schießle 9c83b307f6 keep mtime 2013-01-31 10:50:02 +01:00
Björn Schießle 2ddd40ed41 rename 'undelete' to 'restore' 2013-01-31 10:06:02 +01:00
Jenkins for ownCloud 00a30e6651 [tx-robot] updated from transifex 2013-01-31 00:31:28 +01:00
Robin Appelman 5d0c5c854b Cache: use greaterEquals in tests cases to prevent failures due to race conditions 2013-01-30 23:15:45 +01:00
icewind1991 0cde86ac55 Merge pull request #673 from owncloud/filesystem 
Filecache rewrite
 2013-01-30 13:22:33 -08:00
Sam Tuke c7b1bdf00e Fixed handling of keyfile subdir creation 
Improved keyfile subdir deletion (1 bug remains here)
 2013-01-30 18:52:02 +00:00
Robin Appelman 6043789394 Bumb version number for displayname db upgrade 2013-01-30 19:37:02 +01:00
Robin Appelman 207aa22d12 merge master into filesystem 2013-01-30 19:24:24 +01:00
Robin Appelman 95352fbc15 Files: Dont get maxUploadSize if the filecache needs to be upgraded 2013-01-30 19:19:19 +01:00
Robin Appelman af3b0e30ed Cache: don't insert duplicated during upgrade 2013-01-30 19:19:19 +01:00
Sam Tuke 61b23ce6cc Working on support for deleting directories (removing all keyfiles) 2013-01-30 17:25:17 +00:00
Thomas Müller 2fbf3d4090 Merge pull request #1381 from schiesbn/make_strings_translatable 
make strings translatable
 2013-01-30 08:11:18 -08:00
Björn Schießle 92921ceefd make strings translatable 2013-01-30 16:28:41 +01:00
Björn Schießle 9ca0a93847 make spinner title translatable 2013-01-30 16:20:13 +01:00
Björn Schießle c62a38fcb1 add spinner for undelete operation for visualisation 2013-01-30 15:35:24 +01:00
Thomas Müller 4786327901 Merge pull request #1225 from owncloud/add_multiselect_dnd 
add multselect dnd
 2013-01-30 05:41:01 -08:00
Lukas Reschke bb48e0bbba Merge pull request #1377 from irgsmirx/patch-3 
Update lib/base.php
 2013-01-30 05:37:52 -08:00
Björn Schießle 1592764a60 show a spinner instead of the delete button while moving files to the trash bin 2013-01-30 14:32:20 +01:00
irgsmirx 0bce22966c Update lib/base.php 
Correction of typo "locate" -> "locale".
 2013-01-30 14:27:08 +01:00
Jörn Friedrich Dreyer 81a398c22c use $.trim() for IE8 2013-01-30 13:29:24 +01:00
Björn Schießle e6f1544f51 fix OC_Log::ERROR call 2013-01-30 13:04:32 +01:00
Björn Schießle a6e5f4b85c some minor improvements 2013-01-30 13:01:53 +01:00
Jörn Friedrich Dreyer 99dfaee1f6 reset checkbox after getting selected files instead of ofter dragging, speed up revert 2013-01-30 12:59:35 +01:00
Jörn Friedrich Dreyer 1d0ee61f3a use post instead of get 2013-01-30 12:59:35 +01:00
Jörn Friedrich Dreyer 0089b17749 add multselect dnd 2013-01-30 12:59:34 +01:00
Björn Schießle 9639544ca0 make background transparent 2013-01-30 12:56:22 +01:00
Thomas Müller 5761bd771f Merge pull request #1227 from owncloud/hideuploadprogresscancelinielt10 
hide upload progress bar and cancel action in IE < 10
 2013-01-30 02:48:12 -08:00
Jörn Friedrich Dreyer a6040d0cc7 Merge pull request #1308 from TheSFReader/master 
Changed the linkTo function (from Helper class) to get rid of an unnecessary (and potentially non conform) leading '&' character when adding arguments
 2013-01-30 02:37:11 -08:00
Björn Schießle d6adab6734 improved message if trash bin is empty 2013-01-30 10:07:29 +01:00
Arthur Schiwon 8fd263ef63 LDAP: update quota on every uncached userExists, i.e. also on every isLoggedIn, fixes #1278 2013-01-30 03:57:46 +01:00
Jenkins for ownCloud 68266e70f2 [tx-robot] updated from transifex 2013-01-30 00:25:41 +01:00
Lukas Reschke 250c565d2b Merge pull request #1360 from owncloud/display_name 
introduction of display names
 2013-01-29 14:05:54 -08:00