summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6457 from nextcloud/theming-favicon-invert-appsMorris Jobke2017-09-131-4/+13
|\
| * Theming: Invert app icon in favicon for bright backgroundsJulius Härtl2017-09-121-0/+11
| * Theming: Use png32 for generated iconsJulius Härtl2017-09-121-4/+2
* | [tx-robot] updated from transifexNextcloud bot2017-09-1314-38/+538
* | Merge pull request #6473 from nextcloud/2fa_apppasword_authLukas Reschke2017-09-122-2/+21
|\ \
| * | Fix AppPassword 2FA authRoeland Jago Douma2017-09-122-2/+21
|/ /
* | Merge pull request #6451 from nextcloud/theming-manifest-jsonMorris Jobke2017-09-128-13/+176
|\ \ | |/ |/|
| * Fix testsJulius Härtl2017-09-121-6/+1
| * Use IAppManager instead of private APIJulius Härtl2017-09-123-9/+25
| * Add manifest.json to the login pageJulius Härtl2017-09-121-0/+1
| * Add themed manifest.json to theming appJulius Härtl2017-09-123-0/+90
| * Move theming related imagePath logic to ThemingDefaultsJulius Härtl2017-09-123-8/+69
* | Merge pull request #6448 from weizenspreu/masterJohn Molakvoæ2017-09-122-8/+11
|\ \
| * | print generated encryption key passwords directly after generating the keys s...Kenneth Newwood2017-09-112-8/+11
* | | [tx-robot] updated from transifexNextcloud bot2017-09-1212-30/+154
* | | Merge pull request #6439 from nextcloud/fix-5960-sort-apps-ignore-levelLukas Reschke2017-09-112-7/+3
|\ \ \ | |_|/ |/| |
| * | Sort apps by enabled/disabled but not by official/in-appstore in App ManagementChon Kou2017-09-102-7/+3
* | | Merge pull request #6435 from nextcloud/add-exception-to-phpdocLukas Reschke2017-09-111-0/+3
|\ \ \ | |_|/ |/| |
| * | Add exceptions to PHPDoc of interfaceLukas Reschke2017-09-101-0/+3
* | | Merge pull request #6430 from nextcloud/php72-rc1Roeland Jago Douma2017-09-111-2/+2
|\ \ \
| * | | Bump 7.2 container to RC1Roeland Jago Douma2017-09-091-2/+2
| | |/ | |/|
* | | Merge pull request #6433 from william-p/Fix_uninitialized_paramsLukas Reschke2017-09-111-2/+2
|\ \ \
| * | | Fix uninitialized variable $this->paramsWilliam Pain2017-09-111-2/+2
| | |/ | |/|
* | | Merge pull request #6369 from nextcloud/fix-6211-missing-translation-of-comme...Joas Schilling2017-09-112-13/+35
|\ \ \
| * | | Allow translations of the comments activity in the emails tooJoas Schilling2017-09-052-13/+35
* | | | [tx-robot] updated from transifexNextcloud bot2017-09-1110-4/+558
| |/ / |/| |
* | | [tx-robot] updated from transifexNextcloud bot2017-09-1020-22/+66
| |/ |/|
* | [tx-robot] updated from transifexNextcloud bot2017-09-0958-62/+694
* | Merge pull request #6407 from nextcloud/fix-popover-hoveringMorris Jobke2017-09-081-11/+10
|\ \
| * | Fix hovering on all popover typesJohn Molakvoæ (skjnldsv)2017-09-081-11/+10
* | | Merge pull request #6414 from nextcloud/share-notification-wrong-languageMorris Jobke2017-09-083-12/+31
|\ \ \
| * | | Use the language of the recipient for the share notificationJoas Schilling2017-09-083-12/+31
* | | | Merge pull request #6416 from nextcloud/make-sure-sqlite-works-without-contentMorris Jobke2017-09-081-13/+6
|\ \ \ \
| * | | | Ask the schema whether the table and column existJoas Schilling2017-09-081-13/+6
| |/ / /
* | | | Merge pull request #6413 from nextcloud/translate-settings-headersMorris Jobke2017-09-081-2/+2
|\ \ \ \
| * | | | Translate settings headersJoas Schilling2017-09-081-2/+2
| |/ / /
* | | | Merge pull request #6417 from nextcloud/proper-english-nowhaveMorris Jobke2017-09-0811-17/+17
|\ \ \ \ | |_|/ / |/| | |
| * | | Improve text: 'you have now' -> 'you now have'Leon Klingele2017-09-0811-17/+17
* | | | Merge pull request #6419 from nextcloud/speed-up-mysqlMorris Jobke2017-09-081-0/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | Use tmpfs for mysql CI containersMorris Jobke2017-09-081-0/+10
| |/ /
* | | [tx-robot] updated from transifexNextcloud bot2017-09-0862-224/+316
* | | Merge pull request #6360 from nextcloud/fix/session-timeout-refresh-csrf-tokenLukas Reschke2017-09-071-5/+8
|\ \ \
| * | | Fix failing csp/nonce check due to timed out sessionChristoph Wurst2017-09-041-5/+8
* | | | Merge pull request #6379 from nextcloud/ensure-password-complexityLukas Reschke2017-09-071-1/+3
|\ \ \ \
| * | | | Make sure the password contains special charactersJoas Schilling2017-09-071-1/+3
| | |/ / | |/| |
* | | | Merge pull request #6380 from nextcloud/cleanup-oci-setupLukas Reschke2017-09-071-173/+22
|\ \ \ \ | |/ / / |/| | |
| * | | cleanup oci setup codeRobin Appelman2017-09-061-173/+22
* | | | Merge pull request #6398 from nextcloud/revert-6394-navigation-mail-fixMorris Jobke2017-09-071-2/+1
|\ \ \ \
| * | | | Revert "Fix active entry highlight in certain apps"Morris Jobke2017-09-071-2/+1
|/ / / /
* | | | Merge pull request #6394 from nextcloud/navigation-mail-fixMorris Jobke2017-09-071-1/+2
|\ \ \ \