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

17215 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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 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
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
9de3c1b59d Merge pull request #8165 from owncloud/karma-removewarnings 
Remove annoying karma 404 warnings for images
 2014-04-13 12:40:42 +02:00
Lukas Reschke
2454759af7 Check whether the user has permissions to add personal storage backends 2014-04-13 11:01:50 +02:00
Jenkins for ownCloud
982d2bcc5b [tx-robot] updated from transifex 2014-04-13 01:55:12 -04:00
kondou
d98ae4f9b2 Fix a wrong WebDAV Warning with self-signed-certs 
Occuring in the admin interface
 2014-04-13 05:24:29 +02:00
Volkan Gezer
7fa0c3b7b7 fix translation link 2014-04-13 01:47:03 +02:00
Volkan Gezer
b92f411a36 upda mailinglist address 2014-04-13 01:45:10 +02:00
Volkan Gezer
4d4db23745 fix contribute link 2014-04-12 23:47:32 +02:00
Bernhard Posselt
62cce982bb default to GET request when no method is set to fix unittests, also set parsed json parameters on the post attribute 2014-04-12 16:17:49 +02:00
Bernhard Posselt
e7fa2790f3 Correctly process request parameters other than GET or POST, dont use globals in the class but inject it 2014-04-12 15:02:19 +02:00
Jenkins for ownCloud
329b8f3e99 [tx-robot] updated from transifex 2014-04-12 01:56:11 -04:00
Bernhard Posselt
4af72a076d use references for middleware to fix problems on 5.3 2014-04-11 20:50:49 +02:00
Lukas Reschke
266325eac4 Merge pull request #8168 from owncloud/only-encode-dangerous-char 
Only encode dangerous dangerous characters
 2014-04-11 20:44:39 +02:00
Lukas Reschke
77ecfdd1a4 Only encode dangerous dangerous characters 
There is no need to encode all characters into HTML entities, only potential dangerous characters as &, ", ', < and > should get encoded.

This may fix issues like https://github.com/owncloud/calendar/pull/394
 2014-04-11 19:42:15 +02:00
Lukas Reschke
e704bc2bf0 Merge pull request #7807 from sarciszewski/patch-1 
Update crypt.php
 2014-04-11 19:19:02 +02:00
Björn Schießle
10dc1de644 Merge pull request #8069 from owncloud/fix-localization-issues-with-file-encrypt-app 
Fix some localization issues with file encryption/decryption strings
 2014-04-11 17:22:13 +02:00
Vincent Petry
e92fe47d2a Remove annoying karma 404 warnings for images 
Karma now serves images from core to avoid polluting the logs with a lot
of 404 warnings.

This also makes it easier to read the test errors during development.
 2014-04-11 15:25:40 +02:00
Volkan Gezer
d67cba973e Typo fix. 2014-04-11 15:23:43 +02:00
Jenkins for ownCloud
36107e1bad [tx-robot] updated from transifex 2014-04-11 01:55:15 -04:00
Thomas Müller
dcca5f7bdd Merge pull request #5857 from owncloud/type-ahead-share-by-mail-master 
introduce auto completion on share email - integrated with the contactsm...
 2014-04-11 00:04:58 +02:00
Lukas Reschke
d229856fc5 Merge pull request #8076 from owncloud/enable-dav-browser 
Re-enable the sabredav browser plugin to fix sync client setup
 2014-04-10 21:47:03 +02:00
Bernhard Posselt
763da4258e fix the middleware registration process in the container 2014-04-10 20:51:03 +02:00
Bernhard Posselt
2fc6fb36ad Merge pull request #8139 from owncloud/fix-middleware-registration 
register middleware as string to not force request to be instantiated to...
 2014-04-10 20:24:30 +02:00