summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-09-1420-160/+902
|
* Merge pull request #6483 from nextcloud/fix_quota_new_endpointMorris Jobke2017-09-144-21/+88
|\ | | | | Fix quota calculation on new dav upload endpoint
| * Fix quota calculation on new dav upload endpointRoeland Jago Douma2017-09-134-21/+88
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #6458 from nextcloud/rethrow-correct-exceptionMorris Jobke2017-09-141-3/+10
|\ \ | | | | | | Rethrow the correct exception when there was an error in an app conta…
| * | Rethrow the correct exception when there was an error in an app containerJoas Schilling2017-09-121-3/+10
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #5689 from nextcloud/fix-4117Morris Jobke2017-09-146-48/+189
|\ \ \ | | | | | | | | LDAP: simplify returning the homePath and fixing #4117
| * | | listen to deletion hooks for proper handling, adjust and add testsArthur Schiwon2017-08-315-26/+178
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | simplify returning the homePath and fixing #4117Arthur Schiwon2017-08-312-23/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | homesToKill was not set in runtime since some changes some place else. It required deleteUser() to be called first. The method acts independent of it now. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #6452 from ↵Lukas Reschke2017-09-131-5/+5
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | lukanetconsult/hotfix/issue-6415-undefined-variable Fix undefined variable $tmpRoot
| * | | Fix undefined variable $tmpRootAxel Helmert2017-09-121-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Refactoring of webroot detection left an unused variable. Fixes: #6415 Signed-off-by: Axel Helmert <info@luka.de>
* | | | Merge pull request #5398 from nextcloud/theming-page-titleMorris Jobke2017-09-131-2/+8
|\ \ \ \ | | | | | | | | | | Fallback to "getTitle" / "getEntity" of filesystem theme in theming app
| * | | | Use theme methods "getTitle" and "getEntity" as fallback if name is not themed.Joachim Bauch2017-09-131-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes an issue with custom filesystem themes that can define title, name and entity differently, but the theming app was only using the name as fallback (see #5374). Signed-off-by: Joachim Bauch <bauch@struktur.de>
* | | | | Merge pull request #6457 from nextcloud/theming-favicon-invert-appsMorris Jobke2017-09-131-4/+13
|\ \ \ \ \ | |/ / / / |/| | | | Invert themed favicons on bright colors
| * | | | Theming: Invert app icon in favicon for bright backgroundsJulius Härtl2017-09-121-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #5650 Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Theming: Use png32 for generated iconsJulius Härtl2017-09-121-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #4796 Signed-off-by: Julius Haertl <jus@bitgrid.net>
* | | | | [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 auth
| * | | | | Fix AppPassword 2FA authRoeland Jago Douma2017-09-122-2/+21
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #6451 from nextcloud/theming-manifest-jsonMorris Jobke2017-09-128-13/+176
|\ \ \ \ \ | |/ / / / |/| | | | Theming app support for chrome manifest.json file
| * | | | Fix testsJulius Härtl2017-09-121-6/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Use IAppManager instead of private APIJulius Härtl2017-09-123-9/+25
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Add manifest.json to the login pageJulius Härtl2017-09-121-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Add themed manifest.json to theming appJulius Härtl2017-09-123-0/+90
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | | | Move theming related imagePath logic to ThemingDefaultsJulius Härtl2017-09-123-8/+69
| |/ / / | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* | | | Merge pull request #6448 from weizenspreu/masterJohn Molakvoæ2017-09-122-8/+11
|\ \ \ \ | | | | | | | | | | print generated encryption key passwords directly after generating th…
| * | | | print generated encryption key passwords directly after generating the keys ↵Kenneth Newwood2017-09-112-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so that errors during the encryption do not lead to a potentially massive data loss Signed-off-by: Kenneth Newwood <kenneth@newwood.name>
* | | | | [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 Management
| * | | | Sort apps by enabled/disabled but not by official/in-appstore in App ManagementChon Kou2017-09-102-7/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Chon Kou <k.kou@alumni.ubc.ca>
* | | | | Merge pull request #6435 from nextcloud/add-exception-to-phpdocLukas Reschke2017-09-111-0/+3
|\ \ \ \ \ | |_|/ / / |/| | | | Add exceptions to PHPDoc of interface
| * | | | Add exceptions to PHPDoc of interfaceLukas Reschke2017-09-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves static code analysis here and also keeps expectations proper. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | Merge pull request #6430 from nextcloud/php72-rc1Roeland Jago Douma2017-09-111-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Bump 7.2 container to RC1
| * | | | | Bump 7.2 container to RC1Roeland Jago Douma2017-09-091-2/+2
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #6433 from william-p/Fix_uninitialized_paramsLukas Reschke2017-09-111-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fix uninitialized variable $this->params
| * | | | Fix uninitialized variable $this->paramsWilliam Pain2017-09-111-2/+2
| | |/ / | |/| | | | | | | | | | Signed-off-by: William Pain <pain.william@gmail.com>
* | | | Merge pull request #6369 from ↵Joas Schilling2017-09-112-13/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/fix-6211-missing-translation-of-comment-activity-in-email Allow translations of the comments activity in the emails too
| * | | | Allow translations of the comments activity in the emails tooJoas Schilling2017-09-052-13/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Message and object data is not available on emails atm, so we can not use them either... Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | [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 types
| * | | Fix hovering on all popover typesJohn Molakvoæ (skjnldsv)2017-09-081-11/+10
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #6414 from nextcloud/share-notification-wrong-languageMorris Jobke2017-09-083-12/+31
|\ \ \ \ | | | | | | | | | | Use the language of the recipient for the share notification
| * | | | Use the language of the recipient for the share notificationJoas Schilling2017-09-083-12/+31
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | 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 exist
| * | | | | Ask the schema whether the table and column existJoas Schilling2017-09-081-13/+6
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #6413 from nextcloud/translate-settings-headersMorris Jobke2017-09-081-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Translate settings headers
| * | | | | Translate settings headersJoas Schilling2017-09-081-2/+2
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #6417 from nextcloud/proper-english-nowhaveMorris Jobke2017-09-0811-17/+17
|\ \ \ \ \ | |_|/ / / |/| | | | Improve text: 'you have now' -> 'you now have'
| * | | | Improve text: 'you have now' -> 'you now have'Leon Klingele2017-09-0811-17/+17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Leon Klingele <leon@struktur.de>