Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | initial commit for the theming app | Bjoern Schiessle | 2016-06-27 | 7 | -0/+97 |
| | |||||
* | Merge pull request #226 from nextcloud/master-upstream-sync | Lukas Reschke | 2016-06-26 | 247 | -657/+2501 |
|\ | | | | | [Master] upstream sync | ||||
| * | Merge remote-tracking branch 'upstream/master' into master-upstream-sync | Lukas Reschke | 2016-06-26 | 247 | -657/+2501 |
| |\ | |||||
| | * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-26 | 18 | -2/+114 |
| | | | |||||
| | * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-25 | 8 | -2/+130 |
| | | | |||||
| | * | Merge pull request #25259 from owncloud/search-fixsearchfromotherfilelists | Christoph Wurst | 2016-06-24 | 1 | -2/+9 |
| | |\ | | | | | | | | | Fix search result link for file results outside default list | ||||
| | | * | Hide search results after switching directory | Vincent Petry | 2016-06-24 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | When clicking on a folder result in the search result list, the result box for "results in another folder" must disappear. | ||||
| | | * | Fix search result link for file results outside default list | Vincent Petry | 2016-06-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | When outside the "All files" list, the search result link must properly redirect to the "All files" list. | ||||
| | * | | Merge pull request #25257 from owncloud/comments-showerroronsave | Christoph Wurst | 2016-06-24 | 3 | -8/+12 |
| | |\ \ | | | |/ | | |/| | Show error message when posting an invalid comment | ||||
| | | * | Show error message when posting an invalid comment | Vincent Petry | 2016-06-24 | 3 | -8/+12 |
| | | | | | | | | | | | | | | | | | | | | When an internal server error occurs while creating or updating a comment, display a proper error notification in the UI. | ||||
| | * | | Merge pull request #25171 from owncloud/files_external-list-all | Vincent Petry | 2016-06-24 | 5 | -10/+81 |
| | |\ \ | | | | | | | | | | | Add option to `occ files_external:list` to show all configured mounts | ||||
| | | * | | Add option to `occ files_external:list` to show all configured mounts | Robin Appelman | 2016-06-23 | 5 | -10/+81 |
| | | | | | |||||
| | * | | | Merge pull request #25239 from owncloud/setupchecks-preventreload | Vincent Petry | 2016-06-24 | 1 | -2/+4 |
| | |\ \ \ | | | |_|/ | | |/| | | Don't reload page in case of auth errors during setup checks | ||||
| | | * | | Don't reload page in case of auth errors during setup checks | Vincent Petry | 2016-06-23 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | If an error occurs during setup checks, do not let the global ajax error handler reload the page. | ||||
| | * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-24 | 82 | -6/+336 |
| | | | | | |||||
| | * | | | Merge pull request #25238 from owncloud/files-trashlistnamecorruption | Vincent Petry | 2016-06-23 | 2 | -0/+24 |
| | |\ \ \ | | | |_|/ | | |/| | | Fix trashed file name corruption when rerendering trashbin list | ||||
| | | * | | Fix trashed file name corruption when rerendering trashbin list | Vincent Petry | 2016-06-23 | 2 | -0/+24 |
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | The trashbin code does some gymnastics with the file data at render time. This fix makes sure that the modifications done on the file data are only local to the rendering code and doesn't affect the actual file data from the file list. | ||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-23 | 132 | -270/+166 |
| | | | | |||||
| | * | | Merge pull request #25233 from owncloud/iedavclient-nullheaders | Morris Jobke | 2016-06-22 | 1 | -0/+1 |
| | |\ \ | | | | | | | | | | | Init the headers in iedavclient.js | ||||
| | | * | | Init the headers in iedavclient.js | Vincent Petry | 2016-06-22 | 1 | -0/+1 |
| | |/ / | |||||
| | * | | Merge pull request #25225 from owncloud/enc-revertversionsize | Vincent Petry | 2016-06-22 | 1 | -1/+8 |
| | |\ \ | | | | | | | | | | | Rollback version must also adjust cached size | ||||
| | | * | | Rollback version must also adjust cached size | Vincent Petry | 2016-06-22 | 1 | -1/+8 |
| | | | | | |||||
| | * | | | Merge pull request #25223 from owncloud/external-list-default-options | Vincent Petry | 2016-06-22 | 1 | -1/+3 |
| | |\ \ \ | | | | | | | | | | | | | Hide more default options in occ files_external:list | ||||
| | | * | | | Hide more default options in occ files_external:list | Robin Appelman | 2016-06-22 | 1 | -1/+3 |
| | | | | | | |||||
| | * | | | | Merge pull request #25123 from owncloud/issue-23005-broken-remote-shares | Vincent Petry | 2016-06-22 | 5 | -10/+40 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Add timeouts to make the UI usable again when a remote share is unrea… | ||||
| | | * | | | | Increase fed share timeout from 3 to 10 + unit tests | Vincent Petry | 2016-06-22 | 5 | -15/+30 |
| | | | | | | | |||||
| | | * | | | | Add timeouts to make the UI usable again when a remote share is unreachable | Joas Schilling | 2016-06-22 | 4 | -5/+20 |
| | | | |/ / | | | |/| | | |||||
| | * | | | | Merge pull request #25172 from owncloud/token-login-validation | Vincent Petry | 2016-06-22 | 11 | -204/+281 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Token login validation | ||||
| | | * | | | | fix unit test warning/errors | Christoph Wurst | 2016-06-20 | 2 | -26/+25 |
| | | | | | | | |||||
| | | * | | | | fix DefaultTokenMapperTest | Christoph Wurst | 2016-06-20 | 1 | -0/+4 |
| | | | | | | | |||||
| | | * | | | | fix default token provider tests | Christoph Wurst | 2016-06-20 | 1 | -26/+0 |
| | | | | | | | |||||
| | | * | | | | fix nitpick | Christoph Wurst | 2016-06-20 | 1 | -2/+3 |
| | | | | | | | |||||
| | | * | | | | fix user session tests | Christoph Wurst | 2016-06-20 | 1 | -73/+73 |
| | | | | | | | |||||
| | | * | | | | dont create a session token for clients, validate the app password instead | Christoph Wurst | 2016-06-17 | 1 | -8/+24 |
| | | | | | | | |||||
| | | * | | | | store last check timestamp in token instead of session | Christoph Wurst | 2016-06-17 | 8 | -77/+160 |
| | | | | | | | |||||
| | | * | | | | use token last_activity instead of session value | Christoph Wurst | 2016-06-17 | 4 | -22/+22 |
| | | | | | | | |||||
| | * | | | | | Merge pull request #25134 from owncloud/app-passwords | Vincent Petry | 2016-06-22 | 4 | -36/+36 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | app passwords/device tokens wording | ||||
| | | * | | | | | use theme name instead of hard-coded 'ownCloud' | Christoph Wurst | 2016-06-21 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | fix tranlations | Christoph Wurst | 2016-06-21 | 1 | -3/+3 |
| | | | | | | | | |||||
| | | * | | | | | app passwords/device tokens wording | Christoph Wurst | 2016-06-21 | 4 | -36/+36 |
| | | | | | | | | |||||
| | * | | | | | | occ web executor (#24957) | VicDeo | 2016-06-22 | 7 | -6/+324 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial web executor * Fix PHPDoc Fix broken integration test OccControllerTests do not require database access - moch them all! Kill unused sprintf | ||||
| | * | | | | | | Merge pull request #25208 from owncloud/uploadfolder-firemkdirhooksforparents | Vincent Petry | 2016-06-22 | 1 | -1/+22 |
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | Fire hooks for mkdir for folder upload | ||||
| | | * | | | | | Fire hooks for mkdir for folder upload | karakayasemi | 2016-06-21 | 1 | -1/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fromTmpFile function, usual mkdir call is only working for file's parent directory. Does not care upper parent folders. I added a recursive function that creates parent non-existing folders with usual mkdir. | ||||
| | * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-22 | 26 | -12/+174 |
| | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Fix null pointer exception in user_ldap (#25062) | Jörn Friedrich Dreyer | 2016-06-21 | 1 | -1/+8 |
| | | | | | | | |||||
| | * | | | | | Merge pull request #24505 from owncloud/ceph-wait-for-http | Vincent Petry | 2016-06-21 | 2 | -4/+9 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Don't rely on the notify socket but on the service responding | ||||
| | | * | | | | | Wait for port being accessible in addition to the notify socket | Thomas Müller | 2016-06-17 | 1 | -0/+5 |
| | | | | | | | | |||||
| | | * | | | | | Give mysql docker more time to start up | Thomas Müller | 2016-06-17 | 1 | -4/+4 |
| | | | | | | | | |||||
| | * | | | | | | redirect to new login route (#25099) | Christoph Wurst | 2016-06-21 | 2 | -5/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * redirect to new login route * encode anchor in url and restore it client-side | ||||
| | * | | | | | | Merge pull request #25196 from owncloud/update-session-token-password | Christoph Wurst | 2016-06-21 | 6 | -0/+143 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | update session token password on user password change |