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

8602 Commits

Author SHA1 Message Date
Jenkins for ownCloud 2821f7241b [tx-robot] updated from transifex 2014-08-07 01:55:10 -04:00
Thomas Müller 6599dc1b5c Merge pull request #10186 from owncloud/versioning_fix_path 
[versioning] make sure that getVersions() return the correct path
 2014-08-06 09:30:28 +02:00
Morris Jobke 9fb79c86f0 Merge pull request #10191 from owncloud/sharing_rm_trailing_slash 
[sharing] remove trailing slash
 2014-08-05 23:13:35 +02:00
Bjoern Schiessle f451173817 remove unused variable 2014-08-05 20:34:18 +02:00
Bjoern Schiessle 785ae5dc9a add unit test to make sure getVersions returns the correct result 2014-08-05 17:26:23 +02:00
Bjoern Schiessle b7ada5da57 make sure that the versions array contains the correct path 2014-08-05 17:25:55 +02:00
Morris Jobke c83c90342e Merge pull request #10168 from owncloud/parallel-download-on-public-shared-folder-master 
close session right before the download starts - this enables parallel d...
 2014-08-05 14:54:44 +02:00
Arthur Schiwon 7fd7706542 Hack to avoid Agent DN + Password being overwritten by some ugly browsers with stored site credentials 
Conflicts:
	apps/user_ldap/css/settings.css
 2014-08-05 12:14:29 +02:00
Thomas Müller b68275baba close session right before the download starts - this enables parallel downloads 2014-08-05 11:21:42 +02:00
Jenkins for ownCloud 5ecbc27753 [tx-robot] updated from transifex 2014-08-05 02:05:17 -04:00
Jenkins for ownCloud 5a2952e2eb [tx-robot] updated from transifex 2014-08-04 01:54:39 -04:00
Jenkins for ownCloud d1aaa7a12e [tx-robot] updated from transifex 2014-08-02 01:54:33 -04:00
Robin Appelman 4886c8582d Merge pull request #9529 from helmutschneider/fix-8326 
Fixes #8326: deletion of directories on S3
 2014-08-01 14:04:21 +02:00
Morris Jobke 6cbfe8fd98 Merge pull request #10067 from owncloud/fix-#9119 
Quick fix for #9119. Increase preview to keep empty message more centered
 2014-08-01 09:25:15 +02:00
Jenkins for ownCloud 86cdfa3db3 [tx-robot] updated from transifex 2014-08-01 01:54:28 -04:00
Jörn Friedrich Dreyer dc6180427c Merge pull request #10048 from owncloud/fix_search_in_shared_files 
traverse folders in php to search in shared files
 2014-07-31 18:27:47 +02:00
Jörn Friedrich Dreyer 1af436cb59 add test for search() in shared cache 2014-07-31 15:07:49 +02:00
Jörn Friedrich Dreyer a7b4cd77b1 traverse folders in php to search in shared files 2014-07-31 12:05:29 +02:00
Thomas Müller 4eb2b4e1b0 Merge pull request #10051 from owncloud/preview-empty-text 
Use svg mimeicons for empty text files
 2014-07-31 11:38:29 +02:00
Jenkins for ownCloud c1562057e8 [tx-robot] updated from transifex 2014-07-31 01:55:01 -04:00
Remco Brenninkmeijer a1b5bc8684 Quick fix for #9119. Increase preview to keep empty message more centered and push footer down. 2014-07-30 22:41:17 +02:00
Jan-Christoph Borchardt 8389ff5875 Merge pull request #10054 from owncloud/dont_preload_videos 
don't preload videos on public sharing, fixes #10042
 2014-07-30 21:10:57 +02:00
Morris Jobke 62b37fbb99 Merge pull request #10024 from owncloud/preview-restrict-height 
Also keep maxY into account when scaling a preview while preserving aspect ratio
 2014-07-30 17:22:20 +02:00
Georg Ehrke 3d0bcb7c46 don't preload videos on public sharing, fixes #10042 2014-07-30 17:06:41 +02:00
Robin Appelman 4a9b0d5465 Use svg mimeicons for empty text files 2014-07-30 16:31:37 +02:00
Bjoern Schiessle 1a797f90bb add unit test for rename and copy operation 2014-07-30 15:14:01 +02:00
Bjoern Schiessle dba2574c52 make sure that we always find all versions 2014-07-30 15:14:01 +02:00
Bjoern Schiessle c738f71657 make the versions and encryption app aware of the copy operation 2014-07-30 15:14:01 +02:00
Robin Appelman c066320208 Also keep maxY into account when scaling a preview while preserving aspect ratio 2014-07-30 13:52:40 +02:00
Björn Schießle 2946a63f6b Merge pull request #9721 from owncloud/enc_define_type_in_pre_hook 
[encryption] define type in pre hook
 2014-07-29 16:29:28 +02:00
Björn Schießle f7d60f1190 Merge pull request #9951 from owncloud/enc_inproved_error_messages 
show a warning in the personal settings and admin settins if the encyption keys are not initialized
 2014-07-29 16:27:24 +02:00
Björn Schießle 03f7c5c561 Merge pull request #9983 from owncloud/sharing_add_unshare_to_overview 
update attributes for share-with-user view
 2014-07-29 14:00:57 +02:00
Jenkins for ownCloud 29a3f1e2af [tx-robot] updated from transifex 2014-07-29 09:16:02 +02:00
Bjoern Schiessle aff948925a update attributes for share with user list, file should always have delete permissions, this means unshare in this context, and the overview page is always a root view 2014-07-28 22:04:13 +02:00
Björn Schießle c53b56e313 Merge pull request #9798 from owncloud/ocs_share_api_add_expire_date 
[share api] add OCS api call to set expire date for link shares
 2014-07-28 17:28:32 +02:00
Jan-Christoph Borchardt 13ca1c6a99 Merge pull request #9585 from owncloud/design-fix-public-footer 
move public page footer rules from sharing app to core so it is used by other apps too
 2014-07-28 12:53:29 +02:00
Bjoern Schiessle b7958f79c3 adjust error code 2014-07-28 12:39:22 +02:00
Bjoern Schiessle de4233bc1c show a warning in the personal settings and admin settins if the encyption keys are not initialized 2014-07-28 11:31:06 +02:00
Jenkins for ownCloud a169572223 [tx-robot] updated from transifex 2014-07-28 01:54:30 -04:00
Jenkins for ownCloud 9a4d2871eb [tx-robot] updated from transifex 2014-07-27 01:54:31 -04:00
Jenkins for ownCloud 010732019a [tx-robot] updated from transifex 2014-07-26 01:54:40 -04:00
Bjoern Schiessle ecc1f92bb6 add OCS api call to set expire date for link shares 2014-07-25 13:38:18 +02:00
Björn Schießle 40f2a34be1 Merge pull request #9867 from owncloud/fix_sharing_update 
fix sharing update, add proper escaping
 2014-07-25 10:16:22 +02:00
Jenkins for ownCloud 3f58d949e0 [tx-robot] updated from transifex 2014-07-25 01:54:32 -04:00
Bjoern Schiessle c22b5c7884 fix sharing update, add proper escaping 2014-07-24 20:16:40 +02:00
Morris Jobke fa333c02a0 Merge pull request #9703 from owncloud/files-preview-animate 
[OC 7] Fix preview animation on uploading
 2014-07-24 14:19:00 +02:00
Jenkins for ownCloud e2327f83ed [tx-robot] updated from transifex 2014-07-24 01:54:37 -04:00
Robin Appelman 97de7bb23e Fix remote share when remote server is installed at the root 2014-07-23 13:45:56 +02:00
Vincent Petry 5565eabb81 Merge pull request #9683 from owncloud/fix_#8819_sorting 
Fix #8819 sorting
 2014-07-22 10:11:00 +02:00
Jenkins for ownCloud 5696a88fc3 [tx-robot] updated from transifex 2014-07-22 01:54:29 -04:00