Morris Jobke
8eb955d5c6
Merge pull request #4993 from michaelletzgus/emit_css-tags
...
Emit css tags
2017-06-14 11:29:25 -05:00
Joas Schilling
07bfedb062
Merge pull request #5409 from nextcloud/1param2much
...
a parameter too much
2017-06-14 14:47:56 +02:00
Joas Schilling
da95d4bcf1
Merge pull request #5400 from nextcloud/fix/contactsmenu-l10n-search-placeholder
...
Localize contacts menu search input placeholder
2017-06-14 14:44:54 +02:00
Arthur Schiwon
ed49d9b9ed
a parameter too much
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-14 14:41:30 +02:00
Lukas Reschke
3cacd4156f
Merge pull request #5013 from nextcloud/update-integration-tests-composer-cache
...
Update integration tests composer cache
2017-06-14 14:22:24 +02:00
Lukas Reschke
a7abac5897
Merge pull request #5392 from nextcloud/maintenance-mode-style
...
Use the guest.css for the maintenance page as well
2017-06-14 14:11:28 +02:00
blizzz
f3f3d077ae
Merge pull request #5207 from nextcloud/ldap-remove-userwebdavauth-check
...
remove check, user_webdavauth is not an app anymore for long
2017-06-14 10:32:14 +02:00
Christoph Wurst
64d39aad25
Localize contacts menu search input placeholder
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-06-14 10:29:36 +02:00
Lukas Reschke
b76e43e0a3
Merge pull request #5361 from nextcloud/exclude-files-external-dir-from-encryption
...
don't try to encrypt/decrypt the certificate bundle
2017-06-14 09:50:45 +02:00
Morris Jobke
57fb36b6ae
Update integration tests composer cache
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-14 09:37:47 +02:00
Nextcloud bot
dc61fb999d
[tx-robot] updated from transifex
2017-06-14 00:08:39 +00:00
Morris Jobke
f38f2baa5a
Merge pull request #5295 from nextcloud/bugfix/5077/allow_proppatches_to_birthday_calendar
...
allow PropPatch requests to contact_birthdays
2017-06-13 18:11:13 -05:00
Morris Jobke
0b92700b52
Merge pull request #5072 from mjmunger/master
...
Fixed a crash caused by Local::copyFromStorage() not conforming to Co…
2017-06-13 17:51:16 -05:00
Morris Jobke
262e6fc1b0
Merge pull request #5061 from nextcloud/example-theme-guest
...
Fix example theme
2017-06-13 17:48:05 -05:00
Morris Jobke
0f83cdc78e
Use the guest.css for the maintenance page as well
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-13 16:43:25 -05:00
Morris Jobke
101d1c0f81
Merge pull request #5367 from nextcloud/better-share-error
...
Better error message on invalid sharing link
2017-06-13 14:59:38 -05:00
Morris Jobke
69fd3a3c7b
Merge pull request #5380 from nextcloud/global-scale-settings
...
fix "add to your nextcloud" input field
2017-06-13 14:41:32 -05:00
Morris Jobke
c4bb37b4ee
Merge pull request #5383 from nextcloud/revert-5259
...
Revert "allow admin to disable groups on personal page"
2017-06-13 14:39:02 -05:00
Morris Jobke
e7b5c5c268
Merge pull request #5372 from nextcloud/we-shall-monkey-patch-auth-headers-for-clients-that-dont-follow-specs
...
Prevent sending second WWW-Authenticate header
2017-06-13 12:36:31 -05:00
Morris Jobke
eafaa2f238
Merge pull request #5378 from patschi/fix-5349
...
Fix #5349 , no themed icon when dragging folder
2017-06-13 12:21:17 -05:00
Morris Jobke
666e4de55f
Merge pull request #5305 from nextcloud/add-quota-to-files-view
...
Add quota to the files view
2017-06-13 12:19:27 -05:00
Joas Schilling
0f8c1b13a3
Fix unknown share token
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 18:44:50 +02:00
Bjoern Schiessle
2b3549610b
fix 'add to your nextcloud' input field, this is not an email address
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-13 17:46:46 +02:00
Morris Jobke
8760abae63
Revert "allow admin to disable groups on personal page"
...
This reverts commit 28e1a9da6c#5259
2017-06-13 10:43:21 -05:00
Morris Jobke
906b2402b4
Merge pull request #5369 from nextcloud/fix-user-group-name-escaping
...
Fix escaping of user and group names in "shared by" message
2017-06-13 10:34:31 -05:00
Morris Jobke
4a256aa6e4
Do not show icon for quota bar
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-13 10:30:26 -05:00
Lukas Reschke
2f7f6e28a2
Merge pull request #5373 from nextcloud/i-like-you-all-but-would-like-you-more-if-you-dont-ignore-red-ci-states
...
Remove duplicate dependencies entry
2017-06-13 17:22:11 +02:00
Morris Jobke
40802f3acd
Merge pull request #5364 from nextcloud/fix-strings
...
fix config switch description
2017-06-13 10:21:42 -05:00
Patrik Kernstock
144fc1b5de
Fix #5349 , no themed icon when dragging folder
...
Signed-off-by: Patrik Kernstock <info@pkern.at>
2017-06-13 17:11:05 +02:00
Lukas Reschke
72ccab0ab6
Merge pull request #5370 from nextcloud/update-third-party-ref
...
Update third-party ref
2017-06-13 15:10:13 +02:00
Lukas Reschke
64c1cee027
Remove duplicate dependencies entry
...
🙈
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-06-13 14:02:34 +02:00
Lukas Reschke
633396001f
Prevent sending second WWW-Authenticate header
...
Overrides \Sabre\DAV\Auth\Backend\AbstractBearer::challenge to prevent sending a second WWW-Authenticate header which is standard-compliant but most DAV clients simply fail hard.
Fixes https://github.com/nextcloud/server/issues/5088
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-06-13 13:54:52 +02:00
Lukas Reschke
a0d753bc4b
Update third-party ref
...
Ref https://github.com/nextcloud/3rdparty/pull/52
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-06-13 13:28:29 +02:00
Joas Schilling
b7761be4d9
Merge pull request #5302 from nextcloud/fix_5047
...
use the email address configured in Nextcloud as sender instead of the users email address
2017-06-13 12:19:41 +02:00
Joas Schilling
376fe0e246
Fix escaping of user and group names in "shared by" message
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 12:14:21 +02:00
Joas Schilling
27690e0fb4
Remove unused element
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 11:17:45 +02:00
Morris Jobke
2fe2b5a1d0
Put the quota bar to the bottom
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-13 11:17:45 +02:00
Joas Schilling
b481fa40ef
Adjust the unit test
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 11:17:44 +02:00
Joas Schilling
3a17131995
Remove the colored corners
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 11:17:44 +02:00
Joas Schilling
fcdcd3f283
Add an event so apps can add hidden fields to the files page
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 11:17:44 +02:00
Joas Schilling
b0171a7584
Only set the active item when there is one (not the case for quota)
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 11:17:44 +02:00
Joas Schilling
d8f10e96a2
Content will come from the external app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 11:17:43 +02:00
Joas Schilling
06a925d888
Remove useless translation and make it better on unlimited
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 11:17:43 +02:00
Jan-Christoph Borchardt
3f549609b9
Style quota entry in files view
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-06-13 11:17:43 +02:00
Joas Schilling
0554dba69e
Add quota to the files view
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 11:17:42 +02:00
Lukas Reschke
c46422b780
Merge pull request #5343 from nextcloud/share-filter-missing-groups
...
filter missing groups in share provider
2017-06-13 10:53:26 +02:00
Bjoern Schiessle
ceab119c29
fix config switch description, this is only about searching for users, to enable/disable the possibility to publish users data we have a seperate config switch below
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-13 10:35:06 +02:00
Bjoern Schiessle
86eb23b91e
don't try to encrypt/decrypt the certificate bundle
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-13 09:50:45 +02:00
Morris Jobke
6a06df824e
Merge pull request #5027 from nextcloud/require-nextcloud-version-as-per-docs
...
Version and dependency are now required
2017-06-12 22:33:16 -05:00
Nextcloud bot
ea64cb0028
[tx-robot] updated from transifex
2017-06-13 00:08:22 +00:00
