summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add links to load GDrive/Dropbox configuration pagesRobin McCorkell2016-05-036-4/+58
* Allow multiple custom JS filesRobin McCorkell2016-05-038-18/+32
* 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
* | | | | | | Merge pull request #24322 from owncloud/install-and-uninstall-repair-stepsThomas Müller2016-05-029-90/+90
|\ \ \ \ \ \ \
| * | | | | | | Move uninstall repair step execution to the correct placeThomas Müller2016-05-022-7/+12
| * | | | | | | Repair steps no longer implement the Emitter interfaceThomas Müller2016-05-021-11/+0
| * | | | | | | Fix installer file locationThomas Müller2016-05-021-0/+0
| * | | | | | | OC_Installer -> \OC\InstallerThomas Müller2016-05-026-43/+52
| * | | | | | | Adding repair steps for install and uninstall - fixes #24306Thomas Müller2016-05-024-36/+33
* | | | | | | | Merge pull request #24229 from owncloud/session-id-wrapperRoeland Douma2016-05-026-2/+95
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | throw SessionNotAvailableException if session_id returns empty stringChristoph Wurst2016-04-266-5/+51
| * | | | | | | add ISession::getId() wrapper for session_idChristoph Wurst2016-04-255-0/+47
* | | | | | | | Merge pull request #24336 from owncloud/issue-24328-remove-password-from-exce...Thomas Müller2016-05-022-1/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove the password from the validateUserPass() method as wellJoas Schilling2016-05-022-1/+16
* | | | | | | | | Merge pull request #24385 from owncloud/DeepDiver1975-patch-1Thomas Müller2016-05-021-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Fix undefined variable $exThomas Müller2016-05-021-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #24327 from owncloud/better-callForAllUsers-performanceThomas Müller2016-05-021-6/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | When we iterate over all users that might be too much memoryJoas Schilling2016-04-281-4/+9
| * | | | | | | Don't loop over the backends, we already know where the user should beJoas Schilling2016-04-281-3/+3
* | | | | | | | Merge pull request #24238 from owncloud/caldav-test-event-in-far-futureJoas Schilling2016-05-023-4/+8
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |