summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Allow to register activity filters via info.xmlJoas Schilling2016-11-167-76/+378
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #2145 from nextcloud/docs_to_comMorris Jobke2016-11-161-1/+1
|\ | | | | docs are on nc.com
| * docs are on nc.comRoeland Jago Douma2016-11-151-1/+1
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #2144 from nextcloud/fix_1303Morris Jobke2016-11-152-33/+29
|\ \ | | | | | | Do not cache version info in the session
| * | Fix testsRoeland Jago Douma2016-11-152-16/+9
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Do not cache version info in the sessionsRoeland Jago Douma2016-11-151-29/+32
| |/ | | | | | | | | | | | | | | | | If the session is cleared and closed for whatever reason the loadVersion will write to the session anyways. This will lead to an exception. This should fix #1303 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #2137 from nextcloud/make-sure-tests-run-on-phpunit-4-againRoeland Jago Douma2016-11-151-0/+7
|\ \ | | | | | | Add a magic wrapper to allow phpunit4 to run the code again
| * | Add a magic wrapper from hell to allow phpunit4 to run the code againJoas Schilling2016-11-151-0/+7
| |/ | | | | | | | | | | | | Remove this once phpunit 5 is the lowest supported version, by reverting: https://github.com/nextcloud/server/pull/2137 Signed-off-by: Joas Schilling <coding@schilljs.com>
* | @since 9.2.0 to @since 11.0.0Roeland Jago Douma2016-11-1533-91/+91
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Adjust previous fallbacksLukas Reschke2016-11-151-4/+0
|/ | | | | | 11.0 is 11 and not 9.2 anymore Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Merge pull request #2117 from ↵Roeland Jago Douma2016-11-141-0/+3
|\ | | | | | | | | nextcloud/master-add-bruteforce-check-to-person-endpoint Add bruteforce checker to Person.php
| * Add bruteforce checker to Person.phpLukas Reschke2016-11-141-0/+3
| | | | | | | | | | | | Also check for attempts on this endpoint Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #2114 from nextcloud/downstream-26498Roeland Jago Douma2016-11-141-1/+6
|\ \ | | | | | | make object prefix configurable
| * | make object prefix configurableJörn Friedrich Dreyer2016-11-141-1/+6
| |/
* | Merge pull request #2113 from nextcloud/downstream-26299Roeland Jago Douma2016-11-141-0/+5
|\ \ | | | | | | We need to ensure that the app holding the objectstore implementation…
| * | We need to ensure that the app holding the objectstore implementation is ↵Thomas Müller2016-11-141-0/+5
| |/ | | | | | | loaded - fixes owncloud/objectstore#38
* / Introduce an event for first time login based on the last login time stampThomas Müller2016-11-145-25/+32
|/ | | | | | | | | | | | Use firstLogin event to trigger creation of default calendar and default address book Delay login of admin user after setup so that firstLogin event can properly be processed for the admin Fixing tests ... Skeleton files are not copied over -> only 3 cache entries are remaining Use updateLastLoginTimestamp to properly setup lastLogin value for a test user
* Merge pull request #2068 from ↵Morris Jobke2016-11-141-1/+1
|\ | | | | | | | | nextcloud/sharetypesinfolder-no-getdirectorycontent remove unneeded getDirectoryContent when getting share types for a folder
| * fix phpdocRobin Appelman2016-11-091-1/+1
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #2067 from nextcloud/fileinfo-lazy-substoragesMorris Jobke2016-11-142-12/+43
|\ \ | | | | | | only query substorages to calculate the final mtime/size/etag when we need it
| * | only query substorages to calculate the final mtime/size/etag lazilyRobin Appelman2016-11-102-12/+43
| |/ | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | [tx-robot] updated from transifexNextcloud bot2016-11-142-0/+92
| |
* | Prevent downgrade attacks for appsLukas Reschke2016-11-111-0/+14
| | | | | | | | | | | | | | | | We should verify the app versions when installing a new update, otherwise this could result in downgrade attacks when an attacker just copies the old signature. Plus it prevents the case that in case of a bug in the appstore actually an older version gets installed. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Get correct L10N for Settings ManagerRoeland Jago Douma2016-11-101-1/+1
| | | | | | | | | | | | Fixes #2022 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2016-11-104-0/+4
|/
* Merge pull request #2058 from ↵Morris Jobke2016-11-092-4/+20
|\ | | | | | | | | nextcloud/better-error-message-for-installation-error Use a better error message and point the users to the support channels
| * Correctly catch the "soft errors" nowJoas Schilling2016-11-091-4/+8
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Use a better error message and point the users to the support channelsJoas Schilling2016-11-092-1/+13
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Add test and adjust PHP function argumentsLukas Reschke2016-11-091-1/+1
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Use a php class for the definitions to avoid loading problemsJoas Schilling2016-11-095-263/+327
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #2037 from nextcloud/fix-preview-urlsRoeland Jago Douma2016-11-081-2/+2
|\ | | | | Fix preview URLs
| * Fix preview URLsJoas Schilling2016-11-081-2/+2
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #1998 from nextcloud/share-by-mail-notificationBjörn Schießle2016-11-083-1/+22
|\ \ | |/ |/| add share by mail activity
| * add activity if a file was shared by mailBjoern Schiessle2016-11-081-1/+2
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * add new definitionBjoern Schiessle2016-11-081-0/+19
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * add activity for share by mailBjoern Schiessle2016-11-081-0/+1
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | refactoring code to reduce cyclomatic complexitDonquixote2016-11-072-10/+5
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2016-11-076-2/+6
| |
* | [tx-robot] updated from transifexNextcloud bot2016-11-062-0/+2
| |
* | [tx-robot] updated from transifexNextcloud bot2016-11-052-0/+90
| |
* | Merge pull request #2015 from nextcloud/swift-bucketLukas Reschke2016-11-041-0/+4
|\ \ | | | | | | allow using 'bucket' to set the swift container
| * | allow using 'bucket' to set the swift containerRobin Appelman2016-11-041-0/+4
| |/ | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #2007 from nextcloud/downstream-26411Morris Jobke2016-11-041-8/+18
|\ \ | |/ |/| [oc] Fix initMountPoints to set usersSetup earlier
| * Fix initMountPoints to set usersSetup earlierVincent Petry2016-11-031-8/+18
| | | | | | | | | | | | | | | | This is needed because in some cases like LDAP, the user manager itself might trigger avatar updates which would internally also call initMountPoints with the same user. This could cause the same user to be setup twice, and in some sharing situations could cause recursive deduplication of shares by adding "(2)" every time.
* | Remove adding sharedialogmailviewRoeland Jago Douma2016-11-041-1/+0
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2016-11-046-0/+12
| |
* | Merge pull request #1741 from nextcloud/new_previewLukas Reschke2016-11-0310-4/+705
|\ \ | | | | | | Improve previews
| * | Added genertor helper & testsRoeland Jago Douma2016-11-035-37/+107
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Moved over files_versionsRoeland Jago Douma2016-11-033-8/+15
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Update autoloaderRoeland Jago Douma2016-11-032-0/+8
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>