Nextcloud bot
2e683d3502
[tx-robot] updated from transifex
2018-01-06 01:11:09 +00:00
Morris Jobke
68e205e827
Merge pull request #7712 from nextcloud/jsconfig_l10n
...
Use correct L10N files for jsconfig
2018-01-05 15:22:10 +01:00
Roeland Jago Douma
30ac28f950
Use correct L10N files for jsconfig
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-05 14:33:03 +01:00
Nextcloud bot
1f8896d8c9
[tx-robot] updated from transifex
2018-01-05 01:11:18 +00:00
Morris Jobke
f87977ef2d
Merge pull request #7702 from nextcloud/composer_upd
...
Composer updated
2018-01-04 17:24:09 +01:00
Morris Jobke
e7aebcfd6b
Merge pull request #7699 from nextcloud/bugfix/7528/drop-owncloud-migrations-table-and-recreate-it
...
Drop the ownCloud migration table instead of reusing it
2018-01-04 16:52:52 +01:00
Roeland Jago Douma
0280cff66f
Composer updated
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-04 16:31:16 +01:00
Joas Schilling
7154050201
Drop the ownCloud migration table instead of reusing it
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-04 14:58:01 +01:00
Morris Jobke
e655732458
Merge pull request #7570 from nextcloud/s3-legacy-auth
...
add option to use legacy v2 auth with s3
2018-01-04 13:17:58 +01:00
Nextcloud bot
298b79410d
[tx-robot] updated from transifex
2018-01-04 09:48:31 +00:00
Morris Jobke
19280adc0d
Merge pull request #7611 from nextcloud/fix-7445
...
Don't attempt to translate login names to uids when uids are provided
2018-01-03 23:45:31 +01:00
Julius Härtl
8a226811dc
Invert app icons on IE11 as well
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-03 14:42:07 +01:00
Arthur Schiwon
4f3d52a364
never translate login names when requiring with a user id
...
where appropriate, the preLoginNameUsedAsUserName hook should be thrown.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-03 13:25:00 +01:00
Roeland Jago Douma
57050146f6
Move passwordconfirmation to its own midleware
...
Add tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-02 21:58:14 +01:00
Bjoern Schiessle
1bcbeb24bc
disable password confirmation with SSO
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-01-02 20:30:37 +01:00
Morris Jobke
d97341d986
Merge pull request #7660 from nextcloud/fix-7646
...
Also log exception for failed appstore request
2018-01-02 15:05:33 +01:00
Morris Jobke
aac9a1c41a
Merge pull request #7631 from nextcloud/fix-scss-webroot-and-url-rewrite
...
Fix scss webroot and url rewrite
2018-01-02 15:03:07 +01:00
Morris Jobke
c5f852d90c
Also log exception for failed appstore request
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-02 09:40:03 +01:00
John Molakvoæ (skjnldsv)
c0c4443ffc
Fixed tests
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-30 05:55:45 +01:00
John Molakvoæ (skjnldsv)
02bfc867ef
Added tests for various installations types
...
- With root installation
- Core css
- App inside server root
- Secondary apps directory outside server root
- With an installation in a sub directory
- Core css
- App inside server root
- Secondary apps directory outside server root
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-30 05:55:45 +01:00
John Molakvoæ (skjnldsv)
88b72fd027
Fixup! getWebdir return
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-30 05:55:45 +01:00
John Molakvoæ (skjnldsv)
dc938628f7
Use OC_Util function for app web path
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-30 05:55:44 +01:00
John Molakvoæ (skjnldsv)
ad20af619f
getWebDir function
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-30 05:55:44 +01:00
John Molakvoæ (skjnldsv)
89ca9cb35c
Fixed webroot for scss files
...
Fixed tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-30 05:55:44 +01:00
John Molakvoæ (skjnldsv)
fb6c5cc416
Fixed scss url rewriting
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-30 05:55:43 +01:00
Roeland Jago Douma
752055220f
Don't spam the log when we could not properly connect to the appstore
...
If we can't connect to the appstore for some reason we don't have to log
the exception just an info entry is enough.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-29 15:55:05 +01:00
Roeland Jago Douma
735b9fb81a
Fixup code
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-22 13:08:00 +01:00
Julius Härtl
4c3eb80a91
Hide delete button if the avatar is a generated one
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-12-19 18:49:26 +01:00
Roeland Jago Douma
a4ca92f29a
Remove generated avatar on displayname change
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-19 18:49:26 +01:00
Robin Appelman
34ced4dd97
add option to use legacy v2 auth with s3
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-19 11:54:55 +01:00
Roeland Jago Douma
e550a3ddd8
Merge pull request #7562 from nextcloud/fix-wrongly-cached-result
...
Cache final result of update check
2017-12-19 10:12:33 +01:00
Roeland Jago Douma
e294323df2
Merge pull request #7517 from nextcloud/add-index-to-share-table
...
Add index to share_with column in the share table
2017-12-18 22:23:53 +01:00
Roeland Jago Douma
a84d11de7b
Merge pull request #7531 from nextcloud/ldap/createdistributed
...
don't use deprecated method for requesting memcache
2017-12-18 22:08:32 +01:00
Morris Jobke
1beffa058a
Cache final result of update check
...
If the parsed data is not a valid response we should not cache it and only cache the preprocessed result set.
Fixes #7442
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-18 21:48:58 +01:00
Bjoern Schiessle
21489d5f24
update autoloader
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-18 21:16:08 +01:00
Morris Jobke
d2d73f1ce8
Also replace all other occurences
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-18 20:57:11 +01:00
Roeland Jago Douma
0b7136940e
Let DI handle the background job
...
Fixes #7548
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-18 20:42:06 +01:00
Morris Jobke
913cb2b9c6
Merge pull request #7554 from nextcloud/fix-7546
...
Fix default parameter of OC_DB::executeAudited()
2017-12-18 15:24:11 +01:00
Robin Appelman
bdf4111013
Merge pull request #7555 from nextcloud/smb-copy-rename-log
...
additional debug logging on smb copy/rename failures
2017-12-18 15:02:18 +01:00
Morris Jobke
3da92a9a78
Merge pull request #7490 from nextcloud/fix_7428
...
Respect sharing options when searching using MailPlugin #7428
2017-12-18 14:08:52 +01:00
Robin Appelman
4f0d03e172
additional debug logging on smb copy/rename failures
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-18 13:59:58 +01:00
Morris Jobke
d19dcfd0eb
Fix default parameter of OC_DB::executeAudited()
...
* fixes #7546
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-18 13:58:54 +01:00
Morris Jobke
97f80f5581
Merge pull request #7505 from nextcloud/do-not-update-if-app-comes-from-git
...
Do not update apps if it comes from git
2017-12-18 13:43:58 +01:00
Tobia De Koninck
9d60f7fc64
Don't show users which e-mail address match if they belong to a group we may share with
...
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-12-15 19:09:46 +01:00
Roeland Jago Douma
ca70694502
Also check for empty content lenth
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-14 21:48:59 +01:00
John Molakvoæ (skjnldsv)
f2d5927ea3
Reduce length of md5 in scss caching
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-14 11:11:54 +01:00
John Molakvoæ (skjnldsv)
2dbd5052ff
Up check
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-14 10:00:34 +01:00
Morris Jobke
54c227b6c4
Use cached app list
...
Followup to #7264
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-14 09:56:53 +01:00
John Molakvoæ (skjnldsv)
cca8744350
Do not update apps if it comes from git
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-14 09:50:31 +01:00
Roeland Jago Douma
ce12763ab7
Merge pull request #7485 from nextcloud/fix_7001
...
Also cache invalid DiscoveryService response
2017-12-14 07:47:13 +01:00