Commit Graph

19703 Commits

Author SHA1 Message Date
Robin Appelman bf8f910a32 Fix Folder::getById 2014-08-05 16:58:10 +02:00
Morris Jobke 54030f4eef Merge pull request #10176 from owncloud/fix-install-icon-size
use correct app-icon class for new apps as well, fix icon size
2014-08-05 16:04:30 +02:00
Tom Needham 61c6864ca1 Merge pull request #10166 from owncloud/sharing_dont_display_share_permission
[sharing] respect "sharing allowed" setting in the share dialog
2014-08-05 14:45:09 +01:00
Morris Jobke 892d824804 Merge pull request #10154 from owncloud/uninstall-undefined-appitem
Fix undefined variable when uninstalling an app
2014-08-05 15:13:15 +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
Jan-Christoph Borchardt fa9659ae69 use correct app-icon class for new apps as well, fix icon size 2014-08-05 14:23:25 +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
Bjoern Schiessle 41cca70a63 don't display share permission if resharing was disabled by the admin 2014-08-05 10:57:51 +02:00
Morris Jobke c0e78d9841 Merge pull request #10151 from owncloud/issue/9912
Increase word wrap limit for emails to 78 characters
2014-08-05 08:20:57 +02:00
Jenkins for ownCloud 5ecbc27753 [tx-robot] updated from transifex 2014-08-05 02:05:17 -04:00
Raghu Nayyar 5302f9aadd Merge pull request #10143 from owncloud/fix-top-border
no top border for first settings item, detail enhancement
2014-08-05 10:57:12 +05:30
Robin Appelman 087e68b11a Fix undefined variable when uninstalling an app 2014-08-04 17:42:02 +02:00
Joas Schilling f4c7e3c1e9 Merge pull request #10083 from th3fallen/fix-9969-take-two
Fix 9969
2014-08-04 17:41:03 +02:00
blizzz 5a833b3acd Merge pull request #10150 from owncloud/fix-9782
Set group usercount to 0, not '', fixes #9782
2014-08-04 17:28:34 +02:00
Thomas Müller 66a3a641b9 Merge pull request #10138 from owncloud/innodb-repair-non-oc
Dont touch non-oc tables when doing the InnoDB repair step
2014-08-04 16:23:46 +02:00
Joas Schilling c1b8d93cb0 Increase word wrap limit for emails to 78 characters 2014-08-04 16:05:09 +02:00
tomneedham 7c39c02ee5 Set group usercount to 0, not '', fixes #9782 2014-08-04 13:55:33 +00:00
Jan-Christoph Borchardt 349933fdd5 no top border for first settings item, detail enhancement 2014-08-04 14:42:47 +02:00
Robin Appelman ca463f9c10 Dont touch non-oc tables when doing the InnoDB repair step 2014-08-04 13:14:12 +02:00
Thomas Müller 65903a012a Merge pull request #10025 from owncloud/l10n-typo
typo fix from transifex suggestion
2014-08-04 11:03:50 +02:00
Jenkins for ownCloud 5a2952e2eb [tx-robot] updated from transifex 2014-08-04 01:54:39 -04:00
Jenkins for ownCloud c26bc445b4 [tx-robot] updated from transifex 2014-08-03 01:54:25 -04:00
Jenkins for ownCloud d1aaa7a12e [tx-robot] updated from transifex 2014-08-02 01:54:33 -04:00
Volkan Gezer 7a07690b25 expire -> expiration 2014-08-02 04:02:39 +02:00
Jan-Christoph Borchardt 4303d8bf63 Merge pull request #10097 from owncloud/background-fix
Remove old color of body
2014-08-01 19:39:13 +02:00
Thomas Müller 8e6409a932 Merge pull request #10098 from owncloud/fix-10094-master
prevent PHP errors and enhance logging
2014-08-01 15:51:11 +02:00
Morris Jobke 46fae0a1da add white as background-color 2014-08-01 15:37:36 +02: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
Jörn Friedrich Dreyer a0ab4c2434 fix return documentation 2014-08-01 13:42:35 +02:00
Thomas Müller 378f35f0ec prevent PHP errors and enhance logging 2014-08-01 09:54:32 +02:00
Morris Jobke 293e671d2c Remove old color of body
* only visible in public view as ugly grey pane behind the footer
2014-08-01 09:33:32 +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
Morris Jobke b3157172a0 Merge pull request #10085 from owncloud/fixes-for-filepicker
Fixes for filepicker
2014-08-01 08:36:20 +02:00
Jenkins for ownCloud 86cdfa3db3 [tx-robot] updated from transifex 2014-08-01 01:54:28 -04:00
Volkan Gezer 5f015067f4 suggestions by deepdiver 2014-08-01 01:39:52 +02: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
Jan-Christoph Borchardt 79305a0476 also fix filepicker for smaller screen sizes 2014-07-31 17:35:32 +02:00
Jan-Christoph Borchardt b9468825eb fix date display in filepicker 2014-07-31 16:57:44 +02:00
Jan-Christoph Borchardt 12829cdb9c fix long filename display in filepicker 2014-07-31 16:56:19 +02:00
Clark Tomlinson b04bab0ac7 Merge branch 'fix-9969-take-two' of https://github.com/th3fallen/core into fix-9969-take-two 2014-07-31 09:34:42 -04:00
Clark Tomlinson 26af116fcd Removing unnecessary switch statements in fopen methods. 2014-07-31 09:34:27 -04:00
Jörn Friedrich Dreyer 1af436cb59 add test for search() in shared cache 2014-07-31 15:07:49 +02:00
Clark Tomlinson 222b9fd22b Resolving 9969 resubmitting to fix rebase issue. 2014-07-31 08:53:42 -04: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
Sander fd1bb688f9 Merge pull request #10055 from owncloud/notification-fix
Fix notification preventing top bar clickability
2014-07-30 21:16:30 +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