Commit graph

38072 commits

Author SHA1 Message Date
Joas Schilling
4bae7ef96d
Allow to reset the password with the email as an input
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-28 21:17:37 +02:00
Robin Appelman
205d5586e8
cache swift tokens in memcache
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-28 12:37:41 -06:00
Robin Appelman
de83bda777
update rackspace/opencloud to 1.16.0
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-28 12:37:36 -06:00
Robin Appelman
e26f138fc5 Merge pull request #4112 from nextcloud/swift-config
Better error messages for objectsack swift configuration
2017-03-28 17:51:18 +02:00
Joas Schilling
644b37c7e4
Change the order on merging activities so the newest item is first
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-28 17:19:34 +02:00
Robin Appelman
8dbca71a77
better error messages for invalid regions, urltypes and service names
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-28 17:00:11 +02:00
Morris Jobke
401a5d896d Merge pull request #4101 from nextcloud/header-detail
show active indicator on current app even when hovering other icons
2017-03-28 08:57:09 -06:00
Robin Appelman
5062d0ac50
better error messages when swift authentication fails
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-28 11:02:18 +02:00
John Molakvoæ
f88a578f8e Merge pull request #4082 from nextcloud/fix-menu
Fix pop over menu opacity
2017-03-28 09:47:48 +02:00
Nextcloud bot
6309b9ec1d
[tx-robot] updated from transifex 2017-03-28 00:07:53 +00:00
Morris Jobke
b673d1d8c4 Merge pull request #4107 from nextcloud/users-settings-label
add Settings label to users settings for consistency
2017-03-27 17:45:40 -06:00
Jan-Christoph Borchardt
f47cb96753 add Settings label to users settings for consistency
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-28 01:18:16 +02:00
Morris Jobke
da11931815 Merge pull request #4084 from nextcloud/fix-log-spam-with-too-few-navigation-items
Don't spam the log with "Undefined index showInHeader"
2017-03-27 15:53:08 -06:00
Jan-Christoph Borchardt
7d3b0adf0a adjust opacity of search and gear icons in header
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-27 23:30:09 +02:00
Jan-Christoph Borchardt
ef07f27628 add pointer finger to full clickable app icon area
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-27 20:24:28 +02:00
Jan-Christoph Borchardt
3da45ec375 show active indicator on current app even when hovering other icons
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-27 20:18:37 +02:00
Jan-Christoph Borchardt
1c4603a376 show triangle below user menu too when an entry inside there is active
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-27 20:17:03 +02:00
Georg Ehrke
242bb746b9
OCA\DAV\Files\CustomPropertiesBackend -> OCA\DAV\DAV\CustomPropertiesBackend
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-03-27 19:15:51 +02:00
Morris Jobke
56243e07cb Merge pull request #4083 from nextcloud/update-strengthify
Update strengthify and fix password strength
2017-03-27 10:06:54 -06:00
Morris Jobke
afcb41886e
Update strengthify and fix password strength
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-27 10:06:30 -06:00
Morris Jobke
0037d18aee Merge pull request #4094 from nextcloud/ldap-description
Fix LDAP description
2017-03-27 09:52:02 -06:00
Morris Jobke
27527adfd7 Merge pull request #4092 from nextcloud/theme-favicon-mask-color
use theming colors for favicon on macOS
2017-03-27 09:50:21 -06:00
Morris Jobke
f76a3b532d Merge pull request #4096 from nextcloud/touch-floor
round the mtime in touch
2017-03-27 09:46:10 -06:00
Georg Ehrke
b887adf386
allow sharees to edit certain calendar properties for themselves
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-03-27 17:21:57 +02:00
Robin Appelman
8de4209c3e
round the mtime in touch
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-27 17:07:48 +02:00
Marius Blüm
690aec26bb Merge branch 'master' of https://github.com/nextcloud/server 2017-03-27 16:32:45 +02:00
Marius Blüm
0e058a9a94
Fix LDAP description
Signed-off-by: Marius Blüm <marius@lineone.io>
2017-03-27 16:30:29 +02:00
Robin Appelman
dc5ba95469 Merge pull request #4027 from nextcloud/better-spreed-call-urls
Better spreed call urls
2017-03-27 16:21:24 +02:00
Jan-Christoph Borchardt
ea517b489f use theming colors for favicon on macOS
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-27 15:45:56 +02:00
Georg Ehrke
fc044caab1 Merge pull request #4072 from nextcloud/move-x-frame-options-into-php
Move X-Frame-Options into PHP
2017-03-27 15:05:22 +02:00
Roeland Jago Douma
f4c9e44403 Merge pull request #4073 from nextcloud/secure-drop
Rename File drop to Secure drop
2017-03-27 14:39:32 +02:00
Roeland Jago Douma
16b02a0fa9 Merge pull request #4064 from nextcloud/update-moment
Update momentjs
2017-03-27 14:10:54 +02:00
Robin Appelman
ae3016959e
fix shared storage numeric id
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-27 14:05:18 +02:00
Jan-Christoph Borchardt
0322e7a29e highlight active entry in personal info menu again
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-27 11:23:33 +02:00
Joas Schilling
81d87b01fe
Don't spam the log with "Undefined index showInHeader"
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-27 10:24:10 +02:00
Nextcloud bot
d9ebc2626f
[tx-robot] updated from transifex 2017-03-27 00:07:55 +00:00
Olivier Paroz
5a6c7877f6
Rename File drop to Secure drop
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-26 16:13:35 -06:00
Morris Jobke
12c5c336ad Merge pull request #4077 from nextcloud/better-navigation-management
Register the app management in the normal way
2017-03-26 15:48:19 -06:00
Morris Jobke
96d4e1cab5 Merge pull request #4068 from nextcloud/use-eval-instead-of-get-script
Use eval instead of $.script
2017-03-26 15:13:03 -06:00
Joas Schilling
8d3c461151
Allow to specify the id
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 23:07:54 +02:00
Morris Jobke
3ba114dbbc Merge pull request #4065 from nextcloud/bump_scss
[3rdparty] Bump SCSSphp
2017-03-26 15:03:19 -06:00
Roeland Jago Douma
272d6a1f44
[3rdparty] Bump SCSSphp
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-26 15:02:53 -06:00
Joas Schilling
75eee315a3
Use false because null crashes the cache
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 22:43:19 +02:00
Joas Schilling
918f6fd10b
Make sure help is always after users
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 22:32:12 +02:00
Lukas Reschke
0d6e5dfbb9 Merge pull request #4075 from nextcloud/search-hover-feedback
add hover feedback for search, and opacity on use
2017-03-26 22:31:57 +02:00
Morris Jobke
900f11fd91
Fix order as @jancborchardt requested
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-26 14:30:21 -06:00
Morris Jobke
e1ad305e0b
Fix pop over menu opacity
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-26 14:09:22 -06:00
Joas Schilling
0564392cb9
Fix the tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 21:26:45 +02:00
Joas Schilling
0229c16e5f
Don't use the dropdown for one item only
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 21:23:18 +02:00
Joas Schilling
e0b040d623
Allow multiple navigation links from info.xml
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 21:15:25 +02:00