aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-04204-3282/+3308
* 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 #24411 from owncloud/share_psr4Roeland Douma2016-05-045-0/+0
|\ \
| * | Move \OC\Share to PSR-4Roeland Jago Douma2016-05-035-0/+0
* | | 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-0317-55/+620
|\ \ \ \
| * | | | Modified expected output according to rullzerSergio Bertolin2016-05-022-2/+4
| * | | | OCS API should catch LoginExceptionsRoeland Jago Douma2016-05-021-1/+5
| * | | | Added integration tests directly in the code PRSergio Bertolín2016-05-024-3/+259
| * | | | Integration test for a disabled userThomas Müller2016-05-023-1/+33
| * | | | Add provisioning api to enable and disable usersThomas Müller2016-05-023-19/+128
| * | | | Add occ commands to enable and disable a user + a disabled user can no longer...Thomas Müller2016-05-028-34/+196
* | | | | Merge pull request #24389 from owncloud/login-by-emailLukas Reschke2016-05-037-5/+60
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Allow login by email addressThomas Müller2016-05-022-5/+13
| * | | | Fixing local event delivery for calendar events based on the email addressThomas Müller2016-05-025-0/+47
* | | | | Merge pull request #24387 from owncloud/locking-mark-reload-freeThomas Müller2016-05-031-0/+3
|\ \ \ \ \
| * | | | | free up memory when releasing the last shared lockRobin Appelman2016-05-021-0/+3
* | | | | | Merge pull request #24392 from owncloud/declare-cron-jobs-in-info.xmlThomas Müller2016-05-038-12/+23
|\ \ \ \ \ \
| * | | | | | Add background job declaration of dav app to info.xmlThomas Müller2016-05-034-7/+3
| * | | | | | Allow declaration of background jobs in info.xmlThomas Müller2016-05-034-5/+20
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #24408 from owncloud/improve-server-containerThomas Müller2016-05-032-3/+14
|\ \ \ \ \ \
| * | | | | | Add methods to public interfaceJoas Schilling2016-05-031-0/+12
| * | | | | | Fix doc blockJoas Schilling2016-05-031-1/+1
| * | | | | | Use internal tag so IDEs highlight the usageJoas Schilling2016-05-031-2/+1
| |/ / / / /
* | | | | | Merge pull request #24405 from owncloud/user_db_capped_cacheThomas Müller2016-05-031-1/+11
|\ \ \ \ \ \
| * | | | | | Use a CappedCache in the user database backendRoeland Jago Douma2016-05-031-1/+11
| |/ / / / /
* | | | | | Merge pull request #24404 from owncloud/log_psr4Thomas Müller2016-05-0310-18/+29
|\ \ \ \ \ \
| * | | | | | Move \OC\Log to PSR-4Roeland Jago Douma2016-05-035-0/+0
| * | | | | | Move OC_Log_xx to \OC\Log namespaceRoeland Jago Douma2016-05-038-18/+29
| |/ / / / /
* | | | | | 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
* | | | | | Merge pull request #24375 from owncloud/archive_moveLukas Reschke2016-05-036-27/+37
|\ \ \ \ \ \
| * | | | | | Move OC_Archive to \OC\Archive\ArchiveRoeland Jago Douma2016-05-024-7/+6
| * | | | | | Move OC_Archive_XX to PSR-4Roeland Jago Douma2016-05-025-24/+35
* | | | | | | Merge pull request #24386 from owncloud/psr4-for-appsMorris Jobke2016-05-032-3/+25
|\ \ \ \ \ \ \
| * | | | | | | Use lib/ instead of src/ because that is what people are used toJoas Schilling2016-05-021-1/+1
| * | | | | | | Register the PSR-4 path on loadAppJoas Schilling2016-05-021-2/+21
| * | | | | | | Keep the composer instance so we can add psr4 paths laterJoas Schilling2016-05-021-1/+4
| | |_|_|/ / / | |/| | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-036-4/+44
* | | | | | | Merge pull request #24394 from owncloud/cleanup_share_classmapRoeland Douma2016-05-037-19/+11
|\ \ \ \ \ \ \
| * | | | | | | Cleanup Files_Sharing CLASSPATHRoeland Jago Douma2016-05-027-19/+11
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #24381 from owncloud/correc_typehintRoeland Douma2016-05-031-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Use correct typehintRoeland Jago Douma2016-05-021-1/+1
* | | | | | | | Merge pull request #24380 from owncloud/move-activity-manager-to-namespaceRoeland Douma2016-05-035-21/+24
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Move activity manager to the namespaceJoas Schilling2016-05-025-21/+24