summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add comment to "getMailHeaderColor"Lukas Reschke2016-06-271-0/+5
* Use stream instead of renameLukas Reschke2016-06-272-14/+45
* Replace OC_Defaults with \OC::$server->getThemingDefaults()Lukas Reschke2016-06-271-6/+1
* design and layout fixes for Theming appJan-Christoph Borchardt2016-06-272-15/+29
* make sure that the preview gets updated every time a new image gets uploadedBjoern Schiessle2016-06-271-2/+3
* scale preview imageBjoern Schiessle2016-06-271-3/+5
* Adjust integration testLukas Reschke2016-06-271-0/+1
* Disable drop zoneLukas Reschke2016-06-271-0/+2
* Fix indentationLukas Reschke2016-06-271-3/+3
* Check if server is installedLukas Reschke2016-06-271-1/+1
* Migrate logic to dynamic controllerLukas Reschke2016-06-2716-259/+982
* add some visual feedback if the operation was succesful or notBjoern Schiessle2016-06-274-16/+82
* write theme settings to databaseBjoern Schiessle2016-06-2713-12/+3115
* basic information architecture for the theming appJan-Christoph Borchardt2016-06-272-3/+20
* initial commit for the theming appBjoern Schiessle2016-06-277-0/+97
* Merge pull request #226 from nextcloud/master-upstream-syncLukas Reschke2016-06-26247-657/+2501
|\
| * Merge remote-tracking branch 'upstream/master' into master-upstream-syncLukas Reschke2016-06-26247-657/+2501
| |\
| | * [tx-robot] updated from transifexJenkins for ownCloud2016-06-2618-2/+114
| | * [tx-robot] updated from transifexJenkins for ownCloud2016-06-258-2/+130
| | * Merge pull request #25259 from owncloud/search-fixsearchfromotherfilelistsChristoph Wurst2016-06-241-2/+9
| | |\
| | | * Hide search results after switching directoryVincent Petry2016-06-241-0/+7
| | | * Fix search result link for file results outside default listVincent Petry2016-06-241-2/+2
| | * | Merge pull request #25257 from owncloud/comments-showerroronsaveChristoph Wurst2016-06-243-8/+12
| | |\ \ | | | |/ | | |/|
| | | * Show error message when posting an invalid commentVincent Petry2016-06-243-8/+12
| | * | Merge pull request #25171 from owncloud/files_external-list-allVincent Petry2016-06-245-10/+81
| | |\ \
| | | * | Add option to `occ files_external:list` to show all configured mountsRobin Appelman2016-06-235-10/+81
| | * | | Merge pull request #25239 from owncloud/setupchecks-preventreloadVincent Petry2016-06-241-2/+4
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Don't reload page in case of auth errors during setup checksVincent Petry2016-06-231-2/+4
| | * | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-2482-6/+336
| | * | | Merge pull request #25238 from owncloud/files-trashlistnamecorruptionVincent Petry2016-06-232-0/+24
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Fix trashed file name corruption when rerendering trashbin listVincent Petry2016-06-232-0/+24
| | | |/
| | * | [tx-robot] updated from transifexJenkins for ownCloud2016-06-23132-270/+166
| | * | Merge pull request #25233 from owncloud/iedavclient-nullheadersMorris Jobke2016-06-221-0/+1
| | |\ \
| | | * | Init the headers in iedavclient.jsVincent Petry2016-06-221-0/+1
| | |/ /
| | * | Merge pull request #25225 from owncloud/enc-revertversionsizeVincent Petry2016-06-221-1/+8
| | |\ \
| | | * | Rollback version must also adjust cached sizeVincent Petry2016-06-221-1/+8
| | * | | Merge pull request #25223 from owncloud/external-list-default-optionsVincent Petry2016-06-221-1/+3
| | |\ \ \
| | | * | | Hide more default options in occ files_external:listRobin Appelman2016-06-221-1/+3
| | * | | | Merge pull request #25123 from owncloud/issue-23005-broken-remote-sharesVincent Petry2016-06-225-10/+40
| | |\ \ \ \
| | | * | | | Increase fed share timeout from 3 to 10 + unit testsVincent Petry2016-06-225-15/+30
| | | * | | | Add timeouts to make the UI usable again when a remote share is unreachableJoas Schilling2016-06-224-5/+20
| | | | |/ / | | | |/| |
| | * | | | Merge pull request #25172 from owncloud/token-login-validationVincent Petry2016-06-2211-204/+281
| | |\ \ \ \
| | | * | | | fix unit test warning/errorsChristoph Wurst2016-06-202-26/+25
| | | * | | | fix DefaultTokenMapperTestChristoph Wurst2016-06-201-0/+4
| | | * | | | fix default token provider testsChristoph Wurst2016-06-201-26/+0
| | | * | | | fix nitpickChristoph Wurst2016-06-201-2/+3
| | | * | | | fix user session testsChristoph Wurst2016-06-201-73/+73
| | | * | | | dont create a session token for clients, validate the app password insteadChristoph Wurst2016-06-171-8/+24
| | | * | | | store last check timestamp in token instead of sessionChristoph Wurst2016-06-178-77/+160
| | | * | | | use token last_activity instead of session valueChristoph Wurst2016-06-174-22/+22