summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-112-2/+2
|
* Merge pull request #24379 from owncloud/remove-unneeded-codeLukas Reschke2016-05-102-35/+2
|\ | | | | Remove unneeded private wrapper methods
| * Remove unneeded private wrapper methodsMorris Jobke2016-05-022-35/+2
| |
* | Fix phpdocRoeland Jago Douma2016-05-101-2/+1
| |
* | Merge pull request #24434 from owncloud/permalinksLukas Reschke2016-05-101-20/+2
|\ \ | | | | | | Permalinks
| * | Send permalink in internal share notification emailsVincent Petry2016-05-061-20/+2
| | |
* | | Make update server URL configurableLukas Reschke2016-05-091-6/+2
| | | | | | | | | | | | Currently testing the updates is a big problem and not really super easy possible. Since we now have a new updater server we should also make this configurable so that people can properly test updates.
* | | Merge pull request #24419 from owncloud/allow-di-for-migration-stepsThomas Müller2016-05-091-7/+12
|\ \ \ | | | | | | | | Allow migration steps to use automatic DI
| * | | Allow migration steps to use automatic DIJoas Schilling2016-05-031-7/+12
| | | |
* | | | Merge pull request #24457 from JetUni/patch-1Thomas Müller2016-05-091-4/+4
|\ \ \ \ | | | | | | | | | | Set higher timeout limit
| * | | | Set higher timeout limitJarrett2016-05-051-4/+4
| | | | | | | | | | | | | | | Set the timeout limit to be 20 instead of 5 for machines that take longer to load the apps from apps.owncloud.org so that it doesn't show up blank.
* | | | | Merge pull request #24490 from owncloud/capability_psr4Thomas Müller2016-05-091-0/+0
|\ \ \ \ \ | | | | | | | | | | | | Move \OCP\Capabilities to PSR-4
| * | | | | Move \OCP\Capabilities to PSR-4Roeland Jago Douma2016-05-091-0/+0
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-092-0/+6
|/ / / / /
* | | | | Merge pull request #24483 from owncloud/backgroundjob_psr4Thomas Müller2016-05-092-0/+0
|\ \ \ \ \ | | | | | | | | | | | | Move \OCP\BackgroundJob to PSR-4
| * | | | | Move \OCP\BackgroundJob to PSR-4Roeland Jago Douma2016-05-072-0/+0
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-082-0/+2
|/ / / / /
* | | | | Merge pull request #24475 from owncloud/appframework_psr4Morris Jobke2016-05-0730-0/+0
|\ \ \ \ \ | | | | | | | | | | | | Move \OCP\AppFramework to PSR-4
| * | | | | Move \OCP\AppFramework to PSR-4Roeland Jago Douma2016-05-0630-0/+0
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-072-0/+4
|/ / / / /
* | | | | Move \OCP\App to PSR-4Roeland Jago Douma2016-05-062-0/+0
| | | | |
* | | | | Merge pull request #24455 from owncloud/activity_psr4Thomas Müller2016-05-064-0/+0
|\ \ \ \ \ | | | | | | | | | | | | Move \OCP\Activity to PSR-4
| * | | | | Move \OCP\Activity to PSR-4Roeland Jago Douma2016-05-054-0/+0
| | |_|/ / | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-064-0/+8
| |/ / / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-0518-0/+50
|/ / /
* | | Merge pull request #24432 from ↵Morris Jobke2016-05-041-1/+1
|\ \ \ | | | | | | | | | | | | | | | | owncloud/issue-24270-never-save-app-language-into-request-lang Do not save the language as request lang for apps when we didn't find…
| * | | Do not save the language as request lang for apps when we didn't find anyJoas Schilling2016-05-041-1/+1
| |/ /
* | | Merge pull request #24410 from owncloud/fix_24182Björn Schießle2016-05-041-2/+5
|\ \ \ | | | | | | | | first call the post_login hooks, before we call getUserFolder.
| * | | first call the post_login hooks, before we call getUserFolder.Björn Schießle2016-05-031-2/+5
| |/ / | | | | | | | | | | | | | | | | | | The login process needs to be completed before we can safely create the users home folder. For example we need to give encryption a chance to initialize the users encryption keys in order to copy the skeleton files correctly
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-04114-3086/+3088
| | |
* | | Merge pull request #24411 from owncloud/share_psr4Roeland Douma2016-05-045-0/+0
|\ \ \ | | | | | | | | Move \OC\Share to PSR-4
| * | | Move \OC\Share to PSR-4Roeland Jago Douma2016-05-035-0/+0
| | | |
* | | | Merge pull request #23844 from owncloud/disable-userThomas Müller2016-05-035-31/+37
|\ \ \ \ | | | | | | | | | | Add occ commands to enable and disable a user + a disabled user can n…
| * | | | OCS API should catch LoginExceptionsRoeland Jago Douma2016-05-021-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Catching the login exception and returning false (login failed). Makes the OCS API properly return data instead of printing the exception page.
| * | | | Add occ commands to enable and disable a user + a disabled user can no ↵Thomas Müller2016-05-024-30/+32
| | | | | | | | | | | | | | | | | | | | longer login - fixes #23838
* | | | | Merge pull request #24389 from owncloud/login-by-emailLukas Reschke2016-05-033-3/+32
|\ \ \ \ \ | |_|/ / / |/| | | | Allow login by email address
| * | | | Allow login by email addressThomas Müller2016-05-021-3/+11
| | | | |
| * | | | Fixing local event delivery for calendar events based on the email addressThomas Müller2016-05-022-0/+21
| | | | |
* | | | | Merge pull request #24387 from owncloud/locking-mark-reload-freeThomas Müller2016-05-031-0/+3
|\ \ \ \ \ | | | | | | | | | | | | free up memory when releasing the last shared lock
| * | | | | 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-033-4/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | Declare cron jobs in info.xml
| * | | | | | Allow declaration of background jobs in info.xmlThomas Müller2016-05-033-4/+18
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #24408 from owncloud/improve-server-containerThomas Müller2016-05-032-3/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | Improve server container
| * | | | | | 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 backend
| * | | | | | Use a CappedCache in the user database backendRoeland Jago Douma2016-05-031-1/+11
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running with a user database backend on large installations the cache can grow to significant sizes. This can be especially problematic when running big cron/repair jobs.
* | | | | | Move \OC\Log to PSR-4Roeland Jago Douma2016-05-035-0/+0
| | | | | |
* | | | | | Move OC_Log_xx to \OC\Log namespaceRoeland Jago Douma2016-05-035-11/+17
|/ / / / /