summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-08-1560-114/+132
* Merge pull request #6098 from nextcloud/fix-federation-scopeRoeland Jago Douma2017-08-141-1/+1
|\
| * Fix federation scope dropdownMorris Jobke2017-08-141-1/+1
* | Merge pull request #6080 from nextcloud/header-bottom-borderMorris Jobke2017-08-142-0/+25
|\ \
| * | Add buttom border for headerMorris Jobke2017-08-142-0/+25
| |/
* | Merge pull request #5872 from nextcloud/swift-filter-dotRobin Appelman2017-08-141-1/+1
|\ \
| * | Filter magic dot object when swift directoryRobin Appelman2017-08-011-1/+1
* | | Merge pull request #6091 from nextcloud/authpage-designMorris Jobke2017-08-141-1/+5
|\ \ \
| * | | Remove quotes around device nameMorris Jobke2017-08-141-1/+1
| * | | Highlight client identifier in auth grant pageMorris Jobke2017-08-141-1/+4
| * | | Add heading to account access pageJan-Christoph Borchardt2017-08-121-0/+1
* | | | Merge pull request #6097 from nextcloud/issue-6078-accounts-table-missingMorris Jobke2017-08-144-3/+102
|\ \ \ \
| * | | | Update autoloaderMorris Jobke2017-08-142-0/+2
| * | | | Fix headersJoas Schilling2017-08-142-6/+44
| * | | | Make sure the accounts table existsJoas Schilling2017-08-142-1/+60
* | | | | Merge pull request #6090 from nextcloud/federationscope-title-boldMorris Jobke2017-08-141-0/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Bold federation scope title in dropdown menu, as intendedJan-Christoph Borchardt2017-08-121-0/+4
| | |/ / | |/| |
* | | | [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 :see_no_evil:Lukas Reschke2017-08-111-3/+3
* | | | [tx-robot] updated from transifexNextcloud bot2017-08-1222-14/+150
|/ / /
* | | Merge pull request #5861 from nextcloud/shareinfoLukas Reschke2017-08-117-118/+646
|\ \ \
| * | | Add unit testsRoeland Jago Douma2017-08-104-16/+437
| * | | Remove old code + add MiddlewareRoeland Jago Douma2017-08-105-125/+96
| * | | Move shareinfo over to proper controllerRoeland Jago Douma2017-08-102-1/+137
| |/ /
* | | [tx-robot] updated from transifexNextcloud bot2017-08-116-18/+580
* | | Merge pull request #6004 from nextcloud/forward-5902-repair-drop-account-term...Roeland Jago Douma2017-08-106-4/+66
|\ \ \
| * | | Use the existing array of OC versionsJoas Schilling2017-08-071-3/+1
| * | | Add a repair step to drop the account_terms table on oc migrationJoas Schilling2017-08-075-1/+65
* | | | Merge pull request #5616 from nextcloud/ldap-wizard-remove-LDAPTLS_REQCERT-at...Morris Jobke2017-08-103-20/+7
|\ \ \ \
| * | | | fix phpdoc return types (no code change)Arthur Schiwon2017-07-212-4/+4
| * | | | do not attempt to recognise cert issue by using LDAPTLS_REQCERTArthur Schiwon2017-07-211-16/+3
* | | | | Merge pull request #6065 from nextcloud/mysql5.5Morris Jobke2017-08-101-1/+44
|\ \ \ \ \
| * | | | | Add CI job for mysql 5.5Morris Jobke2017-08-101-1/+44
* | | | | | Merge pull request #5981 from nextcloud/fix-preview-of-themingRoeland Jago Douma2017-08-108-33/+314
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix preview of themingDaniel Calviño Sánchez2017-08-101-5/+9
| * | | | | Refactor reloadStylesheets to receive absolute URLsDaniel Calviño Sánchez2017-08-101-3/+3
| * | | | | Provide "server.css" URL in ThemingController responseDaniel Calviño Sánchez2017-08-102-4/+48
| * | | | | Split updateStylesheet tests for success and errorDaniel Calviño Sánchez2017-08-101-17/+51
| * | | | | Unify DataResponse format with its uses in the rest of the fileDaniel Calviño Sánchez2017-08-101-6/+9
| * | | | | Add acceptance tests for setting the color in the Theming appDaniel Calviño Sánchez2017-08-104-0/+187
| * | | | | Add getter for the timeout multiplierDaniel Calviño Sánchez2017-08-101-0/+9
* | | | | | Merge pull request #6056 from nextcloud/mysql5.6Roeland Jago Douma2017-08-101-1/+44
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add CI job for mysql 5.6Morris Jobke2017-08-091-1/+44
* | | | | | Merge pull request #6052 from nextcloud/fix_jail_copyMorris Jobke2017-08-101-0/+6
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix copy from jailed storageRoeland Jago Douma2017-08-091-0/+6
* | | | | | Merge pull request #6057 from nextcloud/fix-require-onceRoeland Jago Douma2017-08-101-1/+1
|\ \ \ \ \ \
| * | | | | | Fix require once for actionIncludeMorris Jobke2017-08-091-1/+1
| | |/ / / / | |/| | | |
* / | | | | [tx-robot] updated from transifexNextcloud bot2017-08-106-0/+22
|/ / / / /