summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #25251 from owncloud/authtoken-assetpipelinefixVincent Petry2016-06-273-11/+11
|\ \ \ \ \ \
| * | | | | | Use OC.Backbone instead of Backbone directly in authtoken JS codeVincent Petry2016-06-233-11/+11
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #25154 from owncloud/token-login-check-loginnameVincent Petry2016-06-272-2/+41
|\ \ \ \ \ \
| * | | | | | check login name when authenticating with client tokenChristoph Wurst2016-06-242-2/+41
| | |_|_|_|/ | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-2710-0/+32
* | | | | | [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
* | | | | Merge pull request #25134 from owncloud/app-passwordsVincent Petry2016-06-224-36/+36
|\ \ \ \ \
| * | | | | use theme name instead of hard-coded 'ownCloud'Christoph Wurst2016-06-211-1/+1
| * | | | | fix tranlationsChristoph Wurst2016-06-211-3/+3
| * | | | | app passwords/device tokens wordingChristoph Wurst2016-06-214-36/+36
* | | | | | occ web executor (#24957)VicDeo2016-06-227-6/+324
* | | | | | Merge pull request #25208 from owncloud/uploadfolder-firemkdirhooksforparentsVincent Petry2016-06-221-1/+22
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fire hooks for mkdir for folder uploadkarakayasemi2016-06-211-1/+22
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-2226-12/+174
| |/ / / / |/| | | |
* | | | | Fix null pointer exception in user_ldap (#25062)Jörn Friedrich Dreyer2016-06-211-1/+8
* | | | | Merge pull request #24505 from owncloud/ceph-wait-for-httpVincent Petry2016-06-212-4/+9
|\ \ \ \ \
| * | | | | Wait for port being accessible in addition to the notify socketThomas Müller2016-06-171-0/+5
| * | | | | Give mysql docker more time to start upThomas Müller2016-06-171-4/+4