summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix PHPdoc in lib/privateBart Visscher2014-04-1511-17/+42
* Merge pull request #8127 from owncloud/searchresults-mobileThomas Müller2014-04-152-7/+12
|\
| * search: fix color hex codeJan-Christoph Borchardt2014-04-151-1/+1
| * fix search box wrapping on very narrow screensJan-Christoph Borchardt2014-04-091-0/+1
| * search: change date color to grey for less distractionJan-Christoph Borchardt2014-04-091-0/+1
| * increase height of result for better clickabilityJan-Christoph Borchardt2014-04-091-1/+1
| * make search results work on mobile as wellJan-Christoph Borchardt2014-04-091-6/+9
* | Merge pull request #8209 from owncloud/set-language-explicitly-masterThomas Müller2014-04-152-0/+11
|\ \
| * | OCS API calls will always return English messagesThomas Müller2014-04-151-0/+3
| * | introduce new function to force a languageThomas Müller2014-04-151-0/+8
|/ /
* | Merge pull request #8200 from owncloud/js-cleanup-dialogs-masterThomas Müller2014-04-151-173/+166
|\ \
| * | javascript code cleanup + fixing syntax errorsThomas Müller2014-04-141-173/+166
* | | Merge pull request #7780 from owncloud/share-file-existsBjörn Schießle2014-04-152-0/+33
|\ \ \
| * | | add tests for sharing files the users doesn't have access toRobin Appelman2014-04-031-0/+23
| * | | Verify that a file exists before we share itRobin Appelman2014-04-021-0/+10
* | | | Merge pull request #8207 from owncloud/translate-name-email-changeLukas Reschke2014-04-152-2/+2
|\ \ \ \
| * | | | Make email display name change translatable againVolkan Gezer2014-04-152-2/+2
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-1512-12/+12
|/ / / /
* | | | Merge pull request #8059 from owncloud/countUsersInGroupLukas Reschke2014-04-148-1/+317
|\ \ \ \
| * | | | add tests for LDAPArthur Schiwon2014-04-081-0/+115
| * | | | fix return value when a search string was passed to return integer instead of...Arthur Schiwon2014-04-081-1/+2
| * | | | add group testsArthur Schiwon2014-04-081-0/+62
| * | | | ask implementsAction instead of checking method_exists for easier testingArthur Schiwon2014-04-081-1/+1
| * | | | implement countUsersInGroup in LDAP group backendArthur Schiwon2014-04-082-1/+92
| * | | | add optional countUsersInGroup method to group backendsArthur Schiwon2014-04-084-0/+47
* | | | | Merge pull request #8178 from owncloud/fix-request-parametersLukas Reschke2014-04-145-64/+64
|\ \ \ \ \
| * | | | | default to GET request when no method is set to fix unittests, also set parse...Bernhard Posselt2014-04-124-14/+25
| * | | | | Correctly process request parameters other than GET or POST, dont use globals...Bernhard Posselt2014-04-122-50/+39
* | | | | | Ignore jquery.multiselect.js - it's 3rdpartyThomas Müller2014-04-141-0/+1
| |_|_|/ / |/| | | |
* | | | | Revert "close-button for share_dropdown"Julian Müller2014-04-141-5/+0
* | | | | close-button for share_dropdownJulian Müller2014-04-141-0/+5
* | | | | Merge pull request #8181 from owncloud/fix_wrong_webdav_warningThomas Müller2014-04-142-0/+15
|\ \ \ \ \
| * | | | | Fix a wrong WebDAV Warning with self-signed-certskondou2014-04-132-0/+15
* | | | | | Merge pull request #8019 from owncloud/thumbnail_fixesThomas Müller2014-04-142-144/+230
|\ \ \ \ \ \
| * | | | | | adding unit test for cache mechanismThomas Müller2014-04-042-89/+145
| * | | | | | fixing typos/spellingsThomas Müller2014-04-042-20/+27
| * | | | | | fix float comparison for negative resultsJörn Friedrich Dreyer2014-04-031-2/+2
| * | | | | | extract more methodsJörn Friedrich Dreyer2014-04-021-46/+63
| * | | | | | extract method isCachedBiggerJörn Friedrich Dreyer2014-04-021-14/+33
| * | | | | | remove unnecessary codeJörn Friedrich Dreyer2014-04-021-16/+2
| * | | | | | compare floats with epsilonJörn Friedrich Dreyer2014-04-021-1/+2
* | | | | | | Merge pull request #8156 from owncloud/fix-middleware-containerThomas Müller2014-04-141-2/+2
|\ \ \ \ \ \ \
| * | | | | | | use references for middleware to fix problems on 5.3Bernhard Posselt2014-04-111-2/+3
| * | | | | | | fix the middleware registration process in the containerBernhard Posselt2014-04-101-3/+2
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-1430-213/+232
* | | | | | | | The latest developer manual linkVolkan Gezer2014-04-131-1/+1
* | | | | | | | Merge pull request #8188 from owncloud/print-does-also-take-arThomas Müller2014-04-131-4/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | p() and print_unescaped() also take arrays as parameterLukas Reschke2014-04-131-4/+5
* | | | | | | | | The latest developer manual linkVolkan Gezer2014-04-131-1/+1
* | | | | | | | | Merge pull request #8182 from owncloud/check-user-mountiRobin McCorkell2014-04-131-0/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |