aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Move files_trashbin to PSR-4 (#24570)Joas Schilling2016-05-1218-14/+16
* Move dav app to PSR-4 (#24527)Joas Schilling2016-05-1294-7/+8
* Move Encryption app to PSR-4 (#24524)Joas Schilling2016-05-1239-98/+115
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-1222-4/+48
* Make permalinks work for trashed files (#24537)Vincent Petry2016-05-113-30/+139
* Move Provisioning api to PSR-4 (#24510)Joas Schilling2016-05-118-176/+194
* Merge pull request #24568 from owncloud/fix_24566Thomas Müller2016-05-111-1/+2
|\
| * Fix test race conditionRoeland Jago Douma2016-05-111-1/+2
* | use the UID for creating the session token, not the login nameChristoph Wurst2016-05-112-7/+14
* | create session token for DAV clients (sync clients)Christoph Wurst2016-05-111-0/+1
|/
* Merge pull request #24433 from owncloud/user_psr4Thomas Müller2016-05-111-5/+5
|\
| * fix usage of legacy class in LDAPMorris Jobke2016-05-101-5/+5
* | Yo-ho-oh - Murder all band 'o piratesThomas Müller2016-05-118-42/+0
* | [tx-robot] updated from transifexJenkins for ownCloud2016-05-116-4/+94
|/
* Merge pull request #24401 from owncloud/trash-list-cacheVincent Petry2016-05-101-46/+38
|\
| * use the cache for trash listingRobin Appelman2016-05-031-46/+38
* | Merge pull request #24434 from owncloud/permalinksLukas Reschke2016-05-1011-25/+317
|\ \
| * | Do not encode slashes in "dir" URL param in files JSVincent Petry2016-05-062-16/+33
| * | Add anchor icon in sidebar to copy permalinkVincent Petry2016-05-063-3/+53
| * | Auto-add fileid in URL for currently displayed folderVincent Petry2016-05-065-13/+78
| * | Add route to resolve fileid to files app URLVincent Petry2016-05-063-3/+163
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-10258-736/+668
* | | Merge pull request #24466 from owncloud/issue_13936_wording_ldapMorris Jobke2016-05-091-1/+1
|\ \ \
| * | | wording in LDAP wizarddavicente2016-05-041-1/+1
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-096-16/+38
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-0814-2/+120
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-0716-0/+64
* | | Merge pull request #24400 from owncloud/cache_shareManagerVincent Petry2016-05-061-4/+5
|\ \ \
| * | | Cache shareManagerRoeland Jago Douma2016-05-021-4/+5
| | |/ | |/|
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-0616-22/+104
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-0524-28/+132
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2016-05-048-12/+36
* | Merge pull request #24406 from owncloud/psr4-comments-systemtags-updatenotifi...Roeland Douma2016-05-0412-1/+3
|\ \
| * | Move comments, systemtags and updatenotifications to PSR-4Joas Schilling2016-05-0312-1/+3
* | | Merge pull request #24396 from owncloud/ctrlEnter-submit-commentblizzz2016-05-031-2/+7
|\ \ \
| * | | fixes indentationVincent Chan2016-05-031-1/+1
| * | | adds functionality to submit comments with cmd+EnterVincent Chan2016-05-031-4/+4
| * | | Submit comment on ctrl+EnterVincent Chan2016-05-021-0/+5
| | |/ | |/|
* | | Merge pull request #23844 from owncloud/disable-userThomas Müller2016-05-033-19/+128
|\ \ \
| * | | Add provisioning api to enable and disable usersThomas Müller2016-05-023-19/+128
* | | | Merge pull request #24389 from owncloud/login-by-emailLukas Reschke2016-05-033-0/+26
|\ \ \ \
| * | | | Fixing local event delivery for calendar events based on the email addressThomas Müller2016-05-023-0/+26
| | |/ / | |/| |
* | | | Merge pull request #24392 from owncloud/declare-cron-jobs-in-info.xmlThomas Müller2016-05-034-7/+3
|\ \ \ \
| * | | | Add background job declaration of dav app to info.xmlThomas Müller2016-05-034-7/+3
| | |_|/ | |/| |
* | | | Merge pull request #22989 from owncloud/lock_sharing_opsMorris Jobke2016-05-032-43/+222
|\ \ \ \ | |/ / / |/| | |
| * | | Unlock before all returnsRoeland Jago Douma2016-04-301-7/+50
| * | | Add locking to modifying operation of the OCS Share APIRoeland Jago Douma2016-04-302-39/+175
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-034-0/+4
* | | | Merge pull request #24394 from owncloud/cleanup_share_classmapRoeland Douma2016-05-037-19/+11
|\ \ \ \
| * | | | Cleanup Files_Sharing CLASSPATHRoeland Jago Douma2016-05-027-19/+11
| | |/ / | |/| |