Morris Jobke
c5dbe1c772
Merge pull request #6483 from nextcloud/fix_quota_new_endpoint
...
Fix quota calculation on new dav upload endpoint
2017-09-14 00:37:55 +02:00
Morris Jobke
883574974d
Merge pull request #6458 from nextcloud/rethrow-correct-exception
...
Rethrow the correct exception when there was an error in an app conta…
2017-09-14 00:32:13 +02:00
Morris Jobke
ba2e1c5db9
Merge pull request #5689 from nextcloud/fix-4117
...
LDAP: simplify returning the homePath and fixing #4117
2017-09-14 00:23:01 +02:00
Lukas Reschke
8ef4fcb4b7
Merge pull request #6452 from lukanetconsult/hotfix/issue-6415-undefined-variable
...
Fix undefined variable $tmpRoot
2017-09-13 22:42:42 +02:00
Roeland Jago Douma
ab63c89ab3
Fix quota calculation on new dav upload endpoint
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-13 19:28:38 +02:00
Morris Jobke
d659199ff5
Merge pull request #5398 from nextcloud/theming-page-title
...
Fallback to "getTitle" / "getEntity" of filesystem theme in theming app
2017-09-13 13:08:37 +02:00
Joachim Bauch
91598cbfb5
Use theme methods "getTitle" and "getEntity" as fallback if name is not themed.
...
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>
2017-09-13 11:02:45 +02:00
Morris Jobke
241579587a
Merge pull request #6457 from nextcloud/theming-favicon-invert-apps
...
Invert themed favicons on bright colors
2017-09-13 10:48:33 +02:00
Nextcloud bot
5ce3c7003b
[tx-robot] updated from transifex
2017-09-13 00:08:12 +00:00
Lukas Reschke
7052aaf271
Merge pull request #6473 from nextcloud/2fa_apppasword_auth
...
Fix AppPassword 2FA auth
2017-09-12 23:02:14 +02:00
Roeland Jago Douma
9163cf9241
Fix AppPassword 2FA auth
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-12 22:28:43 +02:00
Morris Jobke
83508d7be3
Merge pull request #6451 from nextcloud/theming-manifest-json
...
Theming app support for chrome manifest.json file
2017-09-12 15:10:08 +02:00
Axel Helmert
01d4967130
Fix undefined variable $tmpRoot
...
Refactoring of webroot detection left an unused variable.
Fixes : #6415
Signed-off-by: Axel Helmert <info@luka.de>
2017-09-12 12:14:27 +02:00
Joas Schilling
c4b3198ac2
Rethrow the correct exception when there was an error in an app container
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-12 11:54:13 +02:00
Julius Härtl
9a47b25f19
Theming: Invert app icon in favicon for bright backgrounds
...
fixes #5650
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-12 11:37:25 +02:00
Julius Härtl
1f8a3e05c1
Theming: Use png32 for generated icons
...
fixes #4796
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-09-12 11:34:21 +02:00
Julius Härtl
81ef116bfb
Fix tests
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-12 09:47:38 +02:00
Julius Härtl
8391ca8792
Use IAppManager instead of private API
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-12 09:28:22 +02:00
Julius Härtl
699c64c750
Add manifest.json to the login page
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-12 09:23:13 +02:00
Julius Härtl
770aae42f6
Add themed manifest.json to theming app
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-09-12 09:23:12 +02:00
Julius Härtl
b49ab065b7
Move theming related imagePath logic to ThemingDefaults
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-09-12 09:22:57 +02:00
John Molakvoæ
ff27308b88
Merge pull request #6448 from weizenspreu/master
...
print generated encryption key passwords directly after generating th…
2017-09-12 05:16:30 +02:00
Nextcloud bot
c124a43d74
[tx-robot] updated from transifex
2017-09-12 00:08:25 +00:00
Lukas Reschke
038ae39f13
Merge pull request #6439 from nextcloud/fix-5960-sort-apps-ignore-level
...
Sort apps by enabled/disabled but not by official/in-appstore in App Management
2017-09-11 22:17:21 +02:00
Lukas Reschke
88731848c6
Merge pull request #6435 from nextcloud/add-exception-to-phpdoc
...
Add exceptions to PHPDoc of interface
2017-09-11 13:01:41 +02:00
Kenneth Newwood
7092c50e7c
print generated encryption key passwords directly after generating the keys so that errors during the encryption do not lead to a potentially massive data loss
...
Signed-off-by: Kenneth Newwood <kenneth@newwood.name>
2017-09-11 12:52:25 +02:00
Roeland Jago Douma
316c7e18bc
Merge pull request #6430 from nextcloud/php72-rc1
...
Bump 7.2 container to RC1
2017-09-11 12:36:33 +02:00
Lukas Reschke
0186d8405c
Merge pull request #6433 from william-p/Fix_uninitialized_params
...
Fix uninitialized variable $this->params
2017-09-11 11:54:15 +02:00
Joas Schilling
f5617d78eb
Merge pull request #6369 from nextcloud/fix-6211-missing-translation-of-comment-activity-in-email
...
Allow translations of the comments activity in the emails too
2017-09-11 10:52:45 +02:00
William Pain
9a63ded43b
Fix uninitialized variable $this->params
...
Signed-off-by: William Pain <pain.william@gmail.com>
2017-09-11 10:01:12 +02:00
Chon Kou
d5cfb38449
Sort apps by enabled/disabled but not by official/in-appstore in App Management
...
Signed-off-by: Chon Kou <k.kou@alumni.ubc.ca>
2017-09-10 20:50:22 -07:00
Nextcloud bot
4b38dac1b8
[tx-robot] updated from transifex
2017-09-11 00:08:19 +00:00
Lukas Reschke
b97f48f1af
Add exceptions to PHPDoc of interface
...
Improves static code analysis here and also keeps expectations proper.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-09-10 20:01:36 +02:00
Nextcloud bot
3f6692ee24
[tx-robot] updated from transifex
2017-09-10 00:08:23 +00:00
Roeland Jago Douma
e481971155
Bump 7.2 container to RC1
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-09 20:45:11 +02:00
Nextcloud bot
25f2546a7b
[tx-robot] updated from transifex
2017-09-09 00:08:19 +00:00
Morris Jobke
3536aff780
Merge pull request #6407 from nextcloud/fix-popover-hovering
...
Fix hovering on all popover types
2017-09-08 20:35:43 +02:00
Morris Jobke
8a79d0cc70
Merge pull request #6414 from nextcloud/share-notification-wrong-language
...
Use the language of the recipient for the share notification
2017-09-08 19:15:05 +02:00
Morris Jobke
75c38d5d98
Merge pull request #6416 from nextcloud/make-sure-sqlite-works-without-content
...
Ask the schema whether the table and column exist
2017-09-08 19:09:38 +02:00
Morris Jobke
c27b2f8dcf
Merge pull request #6413 from nextcloud/translate-settings-headers
...
Translate settings headers
2017-09-08 18:49:43 +02:00
Morris Jobke
e9c713902e
Merge pull request #6417 from nextcloud/proper-english-nowhave
...
Improve text: 'you have now' -> 'you now have'
2017-09-08 18:29:22 +02:00
John Molakvoæ (skjnldsv)
d50934fa54
Fix hovering on all popover types
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-08 16:33:39 +02:00
Morris Jobke
b6e759b028
Merge pull request #6419 from nextcloud/speed-up-mysql
...
Use tmpfs for mysql CI containers
2017-09-08 15:45:24 +02:00
Morris Jobke
cea1511397
Use tmpfs for mysql CI containers
...
Should improve performance
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-08 15:23:37 +02:00
Leon Klingele
8e46e6b827
Improve text: 'you have now' -> 'you now have'
...
Signed-off-by: Leon Klingele <leon@struktur.de>
2017-09-08 13:47:11 +02:00
Joas Schilling
29e1aa57e1
Ask the schema whether the table and column exist
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-08 11:45:16 +02:00
Joas Schilling
7e625a8d22
Use the language of the recipient for the share notification
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-08 10:48:16 +02:00
Joas Schilling
758b2baa43
Translate settings headers
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-08 10:22:14 +02:00
Nextcloud bot
194f880073
[tx-robot] updated from transifex
2017-09-08 00:08:16 +00:00
Lukas Reschke
bab313da5d
Merge pull request #6360 from nextcloud/fix/session-timeout-refresh-csrf-token
...
Fix failing csp/nonce check due to timed out session
2017-09-07 19:51:59 +02:00