summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #18809 from owncloud/fix-tags-fileinfomodelRobin Appelman2015-09-032-1/+22
|\
| * Tags in FileInfo map must be an arrayVincent Petry2015-09-032-1/+22
* | Merge pull request #18803 from owncloud/toggle-svgRobin Appelman2015-09-033-4/+4
|\ \ | |/ |/|
| * use SVG for toggle image instead of PNG, fix installation and personal settin...Jan-Christoph Borchardt2015-09-033-4/+4
* | Merge pull request #18798 from owncloud/collapse-html-codeJan-Christoph Borchardt2015-09-032-5/+10
|\ \
| * | Collapse HTML code for federated codeLukas Reschke2015-09-032-5/+10
* | | Merge pull request #18777 from owncloud/locking-defaultMorris Jobke2015-09-032-8/+6
|\ \ \ | |/ / |/| |
| * | update config sampleRobin Appelman2015-09-021-4/+2
| * | enable transational locking by defaultRobin Appelman2015-09-021-4/+4
* | | Merge pull request #18780 from owncloud/isimage-fallbackMorris Jobke2015-09-032-15/+64
|\ \ \
| * | | Fix sidebar thumbnail loading JS unit testsVincent Petry2015-09-032-15/+64
| * | | fallback for isimageRobin Appelman2015-09-021-1/+1
| |/ /
* | | Merge pull request #18787 from owncloud/encode-tags-in-jsonLukas Reschke2015-09-033-8/+22
|\ \ \
| * | | Encode HTML tags in JSONLukas Reschke2015-09-033-8/+22
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-036-16/+192
| |_|/ |/| |
* | | Merge pull request #18764 from owncloud/login-template-accessibilityMorris Jobke2015-09-031-1/+1
|\ \ \
| * | | add title attribute for the login buttonChristoph Wurst2015-09-021-1/+1
* | | | Merge pull request #18682 from owncloud/quota-select-styleJan-Christoph Borchardt2015-09-033-2/+14
|\ \ \ \ | |_|/ / |/| | |
| * | | use proper triangle for multiselect dropdowns as wellJan-Christoph Borchardt2015-09-033-2/+4
| * | | Makes settings select like multiselectRaghu Nayyar2015-09-031-0/+10
* | | | Merge pull request #18783 from owncloud/revert-18773-fix-useless-deletesJoas Schilling2015-09-021-4/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Revert "Soft fail when deleting and no entry found"Joas Schilling2015-09-021-4/+0
|/ / /
* | | Merge pull request #18773 from owncloud/fix-useless-deletesRobin McCorkell2015-09-021-0/+4
|\ \ \
| * | | Soft fail when deleting and no entry foundRobin McCorkell2015-09-021-0/+4
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-026-0/+218
* | | Merge pull request #18632 from owncloud/sidebad-image-previewJan-Christoph Borchardt2015-09-026-13/+154
|\ \ \
| * | | larger preview for images in the sidebarRobin Appelman2015-09-024-7/+81
| * | | allow handling thumbnail errorsRobin Appelman2015-09-021-1/+4
| * | | Allow creating previewss that cover the specified dimensionsRobin Appelman2015-09-022-6/+70
| | |/ | |/|
* | | Merge pull request #18752 from owncloud/proper-setup-checkMorris Jobke2015-09-022-1/+29
|\ \ \ | |/ / |/| |
| * | use config.php value instead of version stringMorris Jobke2015-09-022-1/+29
* | | Merge pull request #18744 from owncloud/fix-ocs-routerMorris Jobke2015-09-021-2/+3
|\ \ \ | |/ / |/| |
| * | Delay adding OCS prefix to route collection until all is loadedRobin McCorkell2015-09-011-2/+3
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-0134-2/+248
* | | Merge pull request #18707 from owncloud/autotest-xdebugRobin McCorkell2015-09-012-0/+12
|\ \ \
| * | | Allow easy XDEBUG debugging with autotestRobin McCorkell2015-08-312-0/+12
* | | | Merge pull request #18743 from owncloud/autoloader-check-log-pathRobin Appelman2015-09-011-1/+1
|\ \ \ \
| * | | | Show the path as part of the exception for not allowed autoloading pathsRobin Appelman2015-09-011-1/+1
* | | | | Merge pull request #18234 from owncloud/ocs_api_for_sharees_listBjörn Schießle2015-09-013-0/+1417
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Bring the coverage back to 100%Joas Schilling2015-08-262-25/+169
| * | | | Adjust testsJoas Schilling2015-08-262-403/+348
| * | | | Fix performance issues of the sharees apiJoas Schilling2015-08-262-179/+151
| * | | | Manually query for the last idJoas Schilling2015-08-261-1/+11
| * | | | Fix wrong value for datetime fieldJoas Schilling2015-08-261-1/+2
| * | | | Rename file to match the class nameJoas Schilling2015-08-261-0/+0
| * | | | Add tests for "getShareesForShareIds()"Joas Schilling2015-08-261-0/+93
| * | | | Do not return the current user himselfJoas Schilling2015-08-262-5/+44
| * | | | Take a list of share IDs instead of the user and group namesJoas Schilling2015-08-263-67/+118
| * | | | Inject the logger as wellJoas Schilling2015-08-263-31/+44
| * | | | Add all possible links next, prev, first and lastJoas Schilling2015-08-262-16/+88