summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [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
| | |/ / | |/| |
* / | | Move activity manager to the namespaceJoas Schilling2016-05-021-2/+2
|/ / /
* | | Merge pull request #24238 from owncloud/caldav-test-event-in-far-futureJoas Schilling2016-05-023-4/+8
|\ \ \
| * | | firstoccurence and lastoccurence have a length now - triggering BIGINT on pos...Thomas Müller2016-04-292-1/+3
| * | | Test an event in the far future - refs #24221Thomas Müller2016-04-291-3/+5
* | | | Merge pull request #24376 from owncloud/remove_dead_codeRoeland Douma2016-05-021-15/+0
|\ \ \ \
| * | | | Remove dead codeRoeland Jago Douma2016-05-021-15/+0
* | | | | Merge pull request #24341 from owncloud/scan-nfd-showwarningMorris Jobke2016-05-022-2/+19
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix SMB storage to not normalize UTF8Vincent Petry2016-04-291-1/+1
| * | | | Add files:scan warning when NFD or incompatible encoding foundVincent Petry2016-04-291-1/+18
| | |/ / | |/| |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-0210-0/+22
| |/ / |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-0118-24/+116
* | | There is no need to do old etag propagationRoeland Jago Douma2016-04-302-101/+0
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2016-04-3014-20/+26
|/
* [tx-robot] updated from transifexJenkins for ownCloud2016-04-2916-0/+110
* Merge pull request #24287 from owncloud/smb-110Vincent Petry2016-04-288-41/+122
|\
| * update icewind/streams to 1.1.0Robin Appelman2016-04-268-41/+122
* | [tx-robot] updated from transifexJenkins for ownCloud2016-04-2820-0/+180
* | Merge pull request #22777 from owncloud/encrypt_all_master_keyThomas Müller2016-04-274-29/+116
|\ \
| * | if we don't have a encrypted file key we can return a empty string right awayBjoern Schiessle2016-04-262-5/+38
| * | don't create a private-/public-key pair for each user if the master key is en...Bjoern Schiessle2016-04-263-24/+78
| |/
* | [tx-robot] updated from transifexJenkins for ownCloud2016-04-2734-2/+92