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

19118 Commits

Author SHA1 Message Date
Vincent Petry b752aff51d Fix migrator tests to use the correct migrator instances 2014-07-01 12:54:35 +02:00
Morris Jobke 88e6f5c318 Merge pull request #9292 from owncloud/issue/9161 
Use get random bytes as uniqeid() is not unique in some cases
 2014-07-01 09:51:45 +02:00
Steffen Lindner a67d24377e Merge pull request #9307 from Gomez/master 
Fixes typo with sendmail detection - fixes #9203
 2014-07-01 09:36:24 +02:00
Jenkins for ownCloud a878b42b42 [tx-robot] updated from transifex 2014-07-01 01:54:43 -04:00
Björn Schießle f3973c1c20 Merge pull request #9240 from owncloud/enc_check_if_file_exists 
[encryption] check if file still exists before removing encryption keys
 2014-06-30 21:23:59 +02:00
Jan-Christoph Borchardt 07ba9442db Merge pull request #9305 from owncloud/design-share-fixes 
Design share fixes
 2014-06-30 18:46:37 +02:00
Bjoern Schiessle 618c9fd033 improved error message 2014-06-30 16:28:40 +02:00
Steffen Lindner 1b871da59e Fixes typo with sendmail detection - fixes #9203 2014-06-30 15:01:12 +02:00
Jörn Friedrich Dreyer f35f14aa37 Merge pull request #9303 from owncloud/issue/8841 
Do not strict compare item source id so the dropdown is closed correctly
 2014-06-30 14:46:46 +02:00
Björn Schießle fa7446d86d Merge pull request #9301 from owncloud/dont_check_external_stoage_app 
[server2server-sharing] no longer check if the external storage app is enabled
 2014-06-30 14:22:16 +02:00
Joas Schilling 5e4ac548bb Use attr() instead of data() so the item ids work as intended 
Fix #8841
 2014-06-30 14:21:27 +02:00
Jan-Christoph Borchardt 63e6495e82 make expiration message grey, less present in dropdown 2014-06-30 14:08:36 +02:00
Jan-Christoph Borchardt c5fa9153ae fix expire message going out of box, fix #9280 2014-06-30 14:08:11 +02:00
Jan-Christoph Borchardt a4c693dd75 remove obsolete CSS, fix visual bug in share dialog #9255 2014-06-30 14:00:43 +02:00
Bjoern Schiessle 372d58544f no longer check if the external storage app is enabled, we use no the webdav implementation from core 2014-06-30 12:34:49 +02:00
Joas Schilling d94d307f52 Merge pull request #9207 from owncloud/prevent-default-for-mail-test 
Fix test mail behaviour
 2014-06-30 11:22:20 +02:00
Joas Schilling 0c711e1cfa Use get random bytes as uniqeid() is not unique in some cases 
Fix #9161
 2014-06-30 11:10:10 +02:00
Jenkins for ownCloud 589f68ebf6 [tx-robot] updated from transifex 2014-06-30 01:54:47 -04:00
Thomas Müller 9032ce4535 Merge pull request #9266 from owncloud/fix_objectstore_etag_update 
always regenerate etag when writing back file to objectstore
 2014-06-29 20:59:20 +02:00
Jenkins for ownCloud ebf93448f2 [tx-robot] updated from transifex 2014-06-29 01:56:00 -04:00
Morris Jobke 67d029a21e Merge pull request #9261 from owncloud/shorten_userid_columns 
shorten userid columns to 64 chars, ref #9186
 2014-06-28 15:41:36 +02:00
Morris Jobke 9890b1509d Merge pull request #8777 from owncloud/l10n-utils-and-defaults 
more strings to translate in utils also some fixes in defaults
 2014-06-28 15:40:49 +02:00
Volkan Gezer d918e5a68c Merge pull request #9278 from owncloud/l10n-servershare-dialog 
fix server share dialog title
 2014-06-28 14:44:37 +02:00
Volkan Gezer ae68a773c0 more strings to translate in utils also some fixes in defaults 2014-06-28 13:29:24 +02:00
Morris Jobke d5462fdb50 Merge pull request #9265 from owncloud/fix-whitespace 
fix trailing whitespace noted by Scrutinizer
 2014-06-28 12:26:09 +02:00
Morris Jobke cec20d5049 Merge pull request #9020 from owncloud/l10n-external-errors-fix 
some strings to localize external mount api responses. fix #8094
 2014-06-28 11:40:32 +02:00
Morris Jobke 2b8745842b trigger db update 2014-06-28 11:18:58 +02:00
Jenkins for ownCloud 26d0978993 [tx-robot] updated from transifex 2014-06-28 01:54:54 -04:00
Volkan Gezer 11788c9579 fix server share dialog title 2014-06-28 01:54:51 +02:00
Björn Schießle 75222501ee Merge pull request #9264 from owncloud/share-linkshareusefilesource 
Use file_source to find matching share for nested link shares
 2014-06-27 23:31:34 +02:00
Bjoern Schiessle 1004836fd3 unit tests 2014-06-27 23:09:31 +02:00
Bjoern Schiessle e4c45b5e26 check if file exists before deleting keys, and add debug output for every 
delete operation
 2014-06-27 23:09:31 +02:00
Bjoern Schiessle 706a8ace58 normalize path before comparison to make sure that we always find the mount point 2014-06-27 22:53:26 +02:00
icewind1991 1a3e698294 Merge pull request #9263 from owncloud/remote-share-update 
Better detecting of remote changes for external shares
 2014-06-27 19:31:18 +02:00
Jörn Friedrich Dreyer 23fa75f5ac always regenerate etag when writing back file to objectstore 2014-06-27 18:49:06 +02:00
Jan-Christoph Borchardt b7cb4f5a63 fix trailing whitespace noted by Scrutinizer 2014-06-27 18:25:56 +02:00
Vincent Petry d9d816bd98 Unit tests for share dropdown with nested link share 2014-06-27 18:21:02 +02:00
Vincent Petry 7a1b45c43b Merge pull request #9260 from owncloud/fileactions-lateregisterinpublicpage 
Allow late registration of file actions in public page
 2014-06-27 18:00:32 +02:00
Jan-Christoph Borchardt a18658fa7f Merge pull request #9256 from owncloud/design-mobile-shared 
show share action of shared items darker to distinguish from non-shared,...
 2014-06-27 17:59:48 +02:00
Vincent Petry 0bd17eff42 Use file_source to find matching share for nested link shares 2014-06-27 17:56:09 +02:00
Morris Jobke 44e1bfb0ea Merge pull request #9259 from owncloud/fix-rename-icon 
fix rename icon, fix #9257
 2014-06-27 17:41:23 +02:00
Robin Appelman 1bb1504d24 Improve comment 2014-06-27 17:31:51 +02:00
Robin Appelman db3f0cee4a Fix parsing of webdav permissions 2014-06-27 17:28:56 +02:00
Robin Appelman 6f5d5b9a30 Also check for updated permissions for webdav storages 2014-06-27 17:27:47 +02:00
Robin Appelman 5b8c2ac750 Use the etag to check for updates in webdav storages where available 2014-06-27 17:10:46 +02:00
Vincent Petry fd8b5680dd Merge pull request #8383 from owncloud/object_storage 
Object storage
 2014-06-27 16:53:03 +02:00
Jörn Friedrich Dreyer b4f40e4da0 shorten userid columns to 64 chars, ref #9186 2014-06-27 16:48:42 +02:00
Vincent Petry 0ff30a7d5e Remove missed console.log in file list 2014-06-27 16:10:37 +02:00
Vincent Petry 13b7937381 Allow late registration of file actions in public page 2014-06-27 16:10:20 +02:00
Jan-Christoph Borchardt e33fa226cd fix rename icon, fix #9257 2014-06-27 15:53:32 +02:00