wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
17263 commits 157 branches 562 tags 714 MiB
Commit graph

17263 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jenkins for ownCloud
a7d7ca2fb3 [tx-robot] updated from transifex 2014-04-17 01:56:06 -04:00
Morris Jobke
5a1a056c6d Merge pull request #8183 from owncloud/move-security-headers 
Move security headers
 2014-04-16 23:46:20 +02:00
Morris Jobke
2f6eed4f9d Merge pull request #7994 from owncloud/fix-login-fields 
Fix login fields
 2014-04-16 23:17:49 +02:00
Jan-Christoph Borchardt
7178e39569 Merge pull request #8235 from owncloud/fix-error-mobile 
fix error display on smaller screens, fix #8090
 2014-04-16 21:35:43 +02:00
Jan-Christoph Borchardt
03ad908c30 fix overlapping infield labels 2014-04-16 17:49:46 +02:00
Jan-Christoph Borchardt
067a5cdee7 fix database infield label indentation 2014-04-16 17:44:05 +02:00
Jan-Christoph Borchardt
6a79b7f2b5 fix sizing for fields when password is shown 2014-04-16 17:43:15 +02:00
Jan-Christoph Borchardt
e68006c0ce Merge pull request #8157 from owncloud/share-expiration-smooth-hide 
Expiration date is hidden smoothly
 2014-04-16 17:10:14 +02:00
Jan-Christoph Borchardt
7110ecbf06 fix error display on smaller screens, fix #8090 2014-04-16 15:31:15 +02:00
blizzz
f6551d214f Merge pull request #7815 from owncloud/ldap_fix_usercount_master 
correct LDAP user count on setup with many users (occ user:report)
 2014-04-16 10:36:19 +02:00
Jenkins for ownCloud
23f2c48a43 [tx-robot] updated from transifex 2014-04-16 01:57:34 -04:00
Thomas Müller
8bc7174bdc Merge pull request #8104 from owncloud/lukepolo-master 
Added the ability to Drag and Drop folders [chrome]
 2014-04-15 21:39:32 +02:00
Thomas Müller
83e8981e24 add link to further discussion about that folder check 2014-04-15 21:39:13 +02:00
Thomas Müller
7f4fefd7ad Merge pull request #8211 from owncloud/flush-head-master 
Flush the Buffer Early - right after head
 2014-04-15 21:34:22 +02:00
Lukas Reschke
8322a9e5c2 Merge pull request #8210 from owncloud/enhance-assets-management-master 
adding checks and log messages regarding the assets folder
 2014-04-15 20:07:07 +02:00
Lukas Reschke
ffab31e3ee Merge pull request #8197 from owncloud/secure_mimetypes 
White-list known secure mime types. Refs. #8184
 2014-04-15 19:50:33 +02:00
blizzz
9de1cc52c0 Merge pull request #8216 from owncloud/usermanager_fix_limitoffset 
Remove limit and offset manipulation when getting users or groups, be…
 2014-04-15 19:14:57 +02:00
Arthur Schiwon
450de0091a adjust tests accordingly 2014-04-15 17:53:57 +02:00
Arthur Schiwon
64679b2e62 Remove limit and offset manipulation when getting users or groups, because it does not work when more than one user or group backend. Fixing it would be too costly performancewise, so we switch back to the model used in OC 5: limit and offset are effective per backend, and not a general constraint 2014-04-15 17:46:48 +02:00
Thomas Müller
d826f33fae Merge pull request #8127 from owncloud/searchresults-mobile 
make search results work on mobile as well
 2014-04-15 17:10:01 +02:00
Thomas Müller
242b3e240d Merge pull request #8209 from owncloud/set-language-explicitly-master 
Set language explicitly master
 2014-04-15 16:57:38 +02:00
Thomas Müller
30168169b9 Flush the Buffer Early - right after head 2014-04-15 16:56:45 +02:00
Thomas Müller
02726acbc8 adding checks and log messages regarding the assets folder 2014-04-15 16:26:12 +02:00
Thomas Müller
596177727a OCS API calls will always return English messages 2014-04-15 15:32:08 +02:00
Thomas Müller
e125dc60cd introduce new function to force a language 2014-04-15 15:12:25 +02:00
Thomas Müller
2eeab60378 Merge pull request #8200 from owncloud/js-cleanup-dialogs-master 
javascript code cleanup + fixing syntax errors
 2014-04-15 14:20:09 +02:00
Jan-Christoph Borchardt
f24b150989 search: fix color hex code 2014-04-15 11:25:38 +02:00
Björn Schießle
2dbb2db7e0 Merge pull request #7780 from owncloud/share-file-exists 
Verify that a file exists before we share it
 2014-04-15 11:23:17 +02:00
Lukas Reschke
1ea8b644b6 Merge pull request #8207 from owncloud/translate-name-email-change 
Make email, display name change translatable again
 2014-04-15 08:47:42 +02:00
Jenkins for ownCloud
ef63153ff5 [tx-robot] updated from transifex 2014-04-15 01:55:06 -04:00
Volkan Gezer
1903895172 Make email display name change translatable again 2014-04-15 00:27:54 +02:00
Lukas Reschke
340089f270 Merge pull request #8059 from owncloud/countUsersInGroup 
add optional countUsersInGroup method to group backends
 2014-04-14 20:45:12 +02:00
Lukas Reschke
9046f7b2f8 Merge pull request #8178 from owncloud/fix-request-parameters 
Correctly process request parameters other than GET or POST, dont use gl...
 2014-04-14 20:42:26 +02:00
Thomas Müller
4fcb93578b Ignore jquery.multiselect.js - it's 3rdparty 2014-04-14 19:56:23 +02:00
Thomas Müller
1fdd17b9b1 javascript code cleanup + fixing syntax errors 2014-04-14 19:29:00 +02:00
Julian Müller
463df08088 Revert "close-button for share_dropdown" 
This reverts commit 3bc3d4c9f3.
 2014-04-14 18:40:24 +02:00
Julian Müller
3bc3d4c9f3 close-button for share_dropdown 2014-04-14 18:26:45 +02:00
Thomas Tanghus
2fb68c120b Added explanation to mimetypes.list.php to avoid future confusion. 2014-04-14 18:21:19 +02:00
Thomas Tanghus
51e47319ef White-list known secure mime types. Refs. #8184 2014-04-14 17:17:50 +02:00
Thomas Müller
fe364656a4 Merge pull request #8181 from owncloud/fix_wrong_webdav_warning 
Fix a wrong WebDAV Warning with self-signed-certs
 2014-04-14 16:53:06 +02:00
Thomas Müller
8df19c4379 Merge pull request #8019 from owncloud/thumbnail_fixes 
Thumbnail fixes
 2014-04-14 16:23:03 +02:00
Thomas Müller
71de321869 Merge pull request #8156 from owncloud/fix-middleware-container 
fix the middleware registration process in the container
 2014-04-14 14:53:58 +02:00
Lukas Reschke
c123dc7de4 Fix typo 
Thanks @DeepDiver1975
 2014-04-14 10:15:31 +02:00
Jenkins for ownCloud
2a2aabbdaf [tx-robot] updated from transifex 2014-04-14 01:55:09 -04:00
Volkan Gezer
d93b5f9927 The latest developer manual link 2014-04-13 23:24:00 +02:00
Thomas Müller
0a473229e0 Merge pull request #8188 from owncloud/print-does-also-take-ar 
p() and print_unescaped() also take arrays as parameter
 2014-04-13 23:04:04 +02:00
Volkan Gezer
440c040ffc The latest developer manual link 2014-04-13 22:10:38 +02:00
Robin McCorkell
2e95101f86 Merge pull request #8182 from owncloud/check-user-mounti 
Check whether the user has permissions to add personal storage backends
 2014-04-13 17:13:49 +01:00
Lukas Reschke
eecc400698 p() and print_unescaped() also take arrays as parameter 
This fixes some scrutinizer issues.
 2014-04-13 16:18:05 +02:00
Lukas Reschke
387d46cb98 Typo + Line breaks 2014-04-13 12:54:26 +02:00