summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5872 from nextcloud/swift-filter-dotRobin Appelman2017-08-141-1/+1
|\ | | | | Filter magic dot object when swift directory
| * Filter magic dot object when swift directoryRobin Appelman2017-08-011-1/+1
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #6091 from nextcloud/authpage-designMorris Jobke2017-08-141-1/+5
|\ \ | | | | | | Add heading to account access page
| * | Remove quotes around device nameMorris Jobke2017-08-141-1/+1
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Highlight client identifier in auth grant pageMorris Jobke2017-08-141-1/+4
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Add heading to account access pageJan-Christoph Borchardt2017-08-121-0/+1
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Merge pull request #6097 from nextcloud/issue-6078-accounts-table-missingMorris Jobke2017-08-144-3/+102
|\ \ \ | | | | | | | | Make sure the accounts table exists
| * | | Update autoloaderMorris Jobke2017-08-142-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Fix headersJoas Schilling2017-08-142-6/+44
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Make sure the accounts table existsJoas Schilling2017-08-142-1/+60
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #6090 from nextcloud/federationscope-title-boldMorris Jobke2017-08-141-0/+4
|\ \ \ \ | | | | | | | | | | Bold federation scope title in dropdown menu, as intended
| * | | | Bold federation scope title in dropdown menu, as intendedJan-Christoph Borchardt2017-08-121-0/+4
| | |/ / | |/| | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | [tx-robot] updated from transifexNextcloud bot2017-08-1416-4/+98
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-08-1316-24/+82
|/ / /
* | | Merge pull request #6084 from nextcloud/brand-itRoeland Jago Douma2017-08-121-3/+3
|\ \ \ | | | | | | | | Brand it 🙈
| * | | Brand it :see_no_evil:Lukas Reschke2017-08-111-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | [tx-robot] updated from transifexNextcloud bot2017-08-1222-14/+150
|/ / /
* | | Merge pull request #5861 from nextcloud/shareinfoLukas Reschke2017-08-117-118/+646
|\ \ \ | | | | | | | | Move shareinfo over to proper controller
| * | | Add unit testsRoeland Jago Douma2017-08-104-16/+437
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Remove old code + add MiddlewareRoeland Jago Douma2017-08-105-125/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add proper middleware for shareinfo * Remove old shareinfo routes Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Move shareinfo over to proper controllerRoeland Jago Douma2017-08-102-1/+137
| |/ / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2017-08-116-18/+580
| | |
* | | Merge pull request #6004 from ↵Roeland Jago Douma2017-08-106-4/+66
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/forward-5902-repair-drop-account-terms-on-oc-migration [13] Repair step: drop account terms on oc migration
| * | | Use the existing array of OC versionsJoas Schilling2017-08-071-3/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Add a repair step to drop the account_terms table on oc migrationJoas Schilling2017-08-075-1/+65
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #5616 from ↵Morris Jobke2017-08-103-20/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/ldap-wizard-remove-LDAPTLS_REQCERT-attempt LDAP Wizard: do not attempt to recognise cert issue by using LDAPTLS_REQCERT
| * | | | fix phpdoc return types (no code change)Arthur Schiwon2017-07-212-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | do not attempt to recognise cert issue by using LDAPTLS_REQCERTArthur Schiwon2017-07-211-16/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | first, it does not work (at least not everywhere/reliably), second if it did it was not reset properly. Removes a bit of complexity. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | Merge pull request #6065 from nextcloud/mysql5.5Morris Jobke2017-08-101-1/+44
|\ \ \ \ \ | | | | | | | | | | | | Add CI job for mysql 5.5
| * | | | | Add CI job for mysql 5.5Morris Jobke2017-08-101-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #5981 from nextcloud/fix-preview-of-themingRoeland Jago Douma2017-08-108-33/+314
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix preview of theming
| * | | | | Fix preview of themingDaniel Calviño Sánchez2017-08-101-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull request #5429 made cached SCSS files depend on a hash of the base URL, so the "/css/core/server.css" file does no longer exist; as the file can not be loaded the "Loading preview" message is never removed and the "Saved" message is never shown. As it now depends on the hash of the base URL the file to be reloaded can no longer be hardcoded, so the full URL to the "server.css" file that has to be reloaded (if any) is now got from the DataResponse provided by the controller. Fixes #5975 Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Refactor reloadStylesheets to receive absolute URLsDaniel Calviño Sánchez2017-08-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a preparatory step for a following change in which reloadStylesheets will have to be able to receive absolute URLs. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Provide "server.css" URL in ThemingController responseDaniel Calviño Sánchez2017-08-102-4/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull request #5429 made cached SCSS files depend on a hash of the base URL, so the "/css/core/server.css" file does no longer exist. The "server.css" URL must be known by the Theming app in order to update the stylesheets when previewing the changes to the theme, so the DataResponse from the controller now provides the full URL to the "server.css" file that has to be reloaded (if any). The "server.css" URL provided by the response will be taken into account by the JavaScript front-end in a following commit. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Split updateStylesheet tests for success and errorDaniel Calviño Sánchez2017-08-101-17/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a preparatory step for a following commit in which the properties present in the response will change depending on whether the request was successful or not. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Unify DataResponse format with its uses in the rest of the fileDaniel Calviño Sánchez2017-08-101-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Add acceptance tests for setting the color in the Theming appDaniel Calviño Sánchez2017-08-104-0/+187
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Add getter for the timeout multiplierDaniel Calviño Sánchez2017-08-101-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases the acceptance tests have to explicitly wait for something to happen without using the "find" method from the actor; in those cases the timeout multiplier needs to be taken into account too, so the test cases must be able to retrieve it from the actor. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | | Merge pull request #6056 from nextcloud/mysql5.6Roeland Jago Douma2017-08-101-1/+44
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add CI job for mysql 5.6
| * | | | | Add CI job for mysql 5.6Morris Jobke2017-08-091-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #6052 from nextcloud/fix_jail_copyMorris Jobke2017-08-101-0/+6
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Fix copy from jailed storage
| * | | | | Fix copy from jailed storageRoeland Jago Douma2017-08-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we have a jailed storage we must also fix the internal path on copy. Else we pass in the wrong path. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #6057 from nextcloud/fix-require-onceRoeland Jago Douma2017-08-101-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix require once for actionInclude
| * | | | | | Fix require once for actionIncludeMorris Jobke2017-08-091-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * regression from #5791 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / | | | | [tx-robot] updated from transifexNextcloud bot2017-08-106-0/+22
|/ / / / /
* | | | | Merge pull request #6051 from nextcloud/redis-clusterMorris Jobke2017-08-091-4/+3
|\ \ \ \ \ | | | | | | | | | | | | Enable redis cluster CI step
| * | | | | Fix redis-cluster support on droneMorris Jobke2017-08-091-4/+3
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #5791 from nextcloud/add-php7.2-testsMorris Jobke2017-08-0916-21/+81
|\ \ \ \ \ | | | | | | | | | | | | [CI] Add PHP 7.2 testing container
| * | | | | Fix ldap testsRoeland Jago Douma2017-08-092-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Fix files_sharing CacheTestsRoeland Jago Douma2017-08-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-09 07:32:03 +0000