summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #25238 from owncloud/files-trashlistnamecorruptionVincent Petry2016-06-232-0/+24
|\ | | | | Fix trashed file name corruption when rerendering trashbin list
| * Fix trashed file name corruption when rerendering trashbin listVincent Petry2016-06-232-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 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.js
| * | 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 size
| * | 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:list
| * | | 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
|\ \ \ \ | | | | | | | | | | Add timeouts to make the UI usable again when a remote share is unrea…
| * | | | 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
|\ \ \ \ | | | | | | | | | | Token login validation
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | app passwords/device tokens wording
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-firemkdirhooksforparentsVincent Petry2016-06-221-1/+22
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Fire hooks for mkdir for folder upload
| * | | | | Fire hooks for mkdir for folder uploadkarakayasemi2016-06-211-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 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
|\ \ \ \ \ | | | | | | | | | | | | Don't rely on the notify socket but on the service responding
| * | | | | 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
| | | | | |
* | | | | | redirect to new login route (#25099)Christoph Wurst2016-06-212-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-passwordChristoph Wurst2016-06-216-0/+143
|\ \ \ \ \ \ | | | | | | | | | | | | | | update session token password on user password change
| * | | | | | pass new password instead of usernameChristoph Wurst2016-06-211-1/+1
| | | | | | |
| * | | | | | update session token password on user password changeChristoph Wurst2016-06-216-0/+143
| | | | | | |
* | | | | | | Contacts API: replace raw image data with url (#25081)Georg Ehrke2016-06-2111-39/+384
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add uri to AddressBookImpl array * Introduce ImageExportPlugin for CardDav * add plugin to v1 routes * replace binary contact photo with link * update tests * Adding unit tests
* | | | | | fix broken unit test (#25198)Thomas Müller2016-06-211-1/+8
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #25042 from owncloud/session-settings-ellipsisVincent Petry2016-06-213-33/+36
|\ \ \ \ \ | | | | | | | | | | | | add overflow ellipsis to session and device tokens list
| * | | | | Fix tooltip position in token listVincent Petry2016-06-171-6/+4
| | | | | |
| * | | | | rearrange personal settings sectionsChristoph Wurst2016-06-101-28/+28
| | | | | |
| * | | | | add tooltip to token namesChristoph Wurst2016-06-101-1/+2
| | | | | |
| * | | | | add overflow ellipsis to session and device tokens listChristoph Wurst2016-06-101-0/+4
| | | | | |
* | | | | | Filter out group shares for owner where owner is included (#25190)Vincent Petry2016-06-212-2/+132
| |/ / / / |/| | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-214-0/+8
| | | | |
* | | | | Catch exceptions while creating shared mounts (#25077)Robin Appelman2016-06-202-11/+25
| | | | |
* | | | | Don't send activity to non-admins when assigning invisible tags (#25192)Vincent Petry2016-06-201-0/+4
| | | | |
* | | | | Merge pull request #25173 from owncloud/fix_conversion_issuesVincent Petry2016-06-204-0/+6
|\ \ \ \ \ | | | | | | | | | | | | Fix conversion issues
| * | | | | Fix conversion issuesJuan Pablo Villafáñez2016-06-204-0/+6
| | |_|_|/ | |/| | | | | | | | | | | | | Change to phpdoc type for automatic conversion