Morris Jobke
19e4ac33a9
Merge pull request #2178 from nextcloud/federation_sharing_changes
...
don't add server automatically to trusted server
2016-11-18 00:49:48 +01:00
Jan-Christoph Borchardt
6fa5c18a79
Merge pull request #2136 from nextcloud/sharing-layout
...
Sharing layout fixes
2016-11-18 00:40:46 +01:00
Morris Jobke
d3900fc0d5
Merge pull request #2177 from nextcloud/appmanager-getapppath
...
Expose getAppPath to public API
2016-11-17 22:39:34 +01:00
Jan-Christoph Borchardt
a32c781326
use copy icon for local link rather than link icon to prevent confusion with sharing
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 21:46:07 +01:00
Jan-Christoph Borchardt
9f5d019df9
resize and pixel-perfectly align copy icon
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 21:39:31 +01:00
Morris Jobke
82141faea1
Merge pull request #2188 from nextcloud/remove-settings-pane-in-apps-management
...
Remove settings pane in app management
2016-11-17 21:39:30 +01:00
Morris Jobke
6c07b9e147
Merge pull request #2187 from nextcloud/select2-adjustments
...
Select2 adjustments: ellipsize, and adjust height
2016-11-17 21:39:20 +01:00
Jan-Christoph Borchardt
cf78942253
fix spacing in sidebar tabs
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 21:39:11 +01:00
Julius Haertl
caacb6c261
Expose getAppPath to public API
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-17 19:24:24 +01:00
Jan-Christoph Borchardt
88865e9728
properly align input box items in share tab view
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 19:11:49 +01:00
Jan-Christoph Borchardt
5eab1cdece
fix layout of sharing list
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 19:02:33 +01:00
Morris Jobke
02bfd91553
Merge pull request #2176 from nextcloud/share-cache-root-info
...
reuse the known rootinfo in the shared cache when possible
2016-11-17 18:47:39 +01:00
Jan-Christoph Borchardt
978c02e7a8
select2: show cursor pointer on hovering entries
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 18:18:38 +01:00
Morris Jobke
6d5cc6edc0
Remove settings pane in app management
...
* experimental apps where removed with 32cf661215
(#1940 )
* fixes #2183
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 18:09:40 +01:00
Bjoern Schiessle
7df5c5db2d
don't add server automatically to trusted server
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-17 18:08:45 +01:00
Robin Appelman
e36293195f
Merge pull request #2173 from nextcloud/bugfix/2171/birthday-12-31-too-young
...
BirthdayCalendar: fix issue with birthyear to high when birthday on Dec 31st
2016-11-17 18:00:22 +01:00
Morris Jobke
bba32cf4b7
Merge pull request #2163 from nextcloud/app-password-scope-warngings
...
fix warnings when updating app password
2016-11-17 17:52:23 +01:00
Jan-Christoph Borchardt
da4f68b80a
select2: make sure dropdown always shows a last half entry to hint at more
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 17:21:20 +01:00
Jan-Christoph Borchardt
ff9d05e3f9
select2: ellipsize long names
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 17:20:29 +01:00
Morris Jobke
54ca411ff0
Merge pull request #2167 from nextcloud/mountmanager-lockdown
...
ensure we setup the mount manager when in lockdown
2016-11-17 16:56:55 +01:00
Jan-Christoph Borchardt
64be76008a
remove Unshare icon in list
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 16:39:01 +01:00
Morris Jobke
9cec82d084
Merge pull request #2153 from nextcloud/version-hint
...
add explanatory text of what to do on app version error
2016-11-17 15:43:50 +01:00
Georg Ehrke
44f55fe415
BirthdayCalendar: fix issue with birthyear to high when birthday on Dec 31st
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2016-11-17 15:28:15 +01:00
Robin Appelman
30e7c27d86
reuse the known rootinfo in the shared cache when possible
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-17 14:59:31 +01:00
Lukas Reschke
a0059dfee1
Merge pull request #2124 from nextcloud/oc_26591
...
Cache js, css and woff files for a week
2016-11-17 14:23:31 +01:00
Christoph Wurst
5080054263
Merge pull request #2175 from nextcloud/token-invalidate-debug
...
use lower loglevel for token cleanup messages
2016-11-17 13:05:04 +01:00
Robin Appelman
73dfe1835a
use lower loglevel for token cleanup messages
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-17 10:42:12 +01:00
Joas Schilling
de983e61e3
Merge pull request #2170 from nextcloud/ocs_person_to_controller
...
OCS person to controller
2016-11-17 09:40:16 +01:00
Joas Schilling
f264715b3e
Merge pull request #2174 from nextcloud/icons-audio-video-off
...
add icons for audio mute and video off
2016-11-17 09:27:21 +01:00
Jan-Christoph Borchardt
549e76425c
add icons for audio mute and video off
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 05:53:01 +01:00
Lukas Reschke
13610ad2d0
Merge pull request #2164 from nextcloud/token-login-wanring
...
fix warning with token login
2016-11-17 03:28:39 +01:00
Nextcloud bot
ab18d2f55e
[tx-robot] updated from transifex
2016-11-17 01:07:02 +00:00
Morris Jobke
8a02647e65
Merge pull request #2122 from nextcloud/downstream-26520
...
Hack to prevent warning for read-only wrapper in public links
2016-11-17 00:54:08 +01:00
Roeland Jago Douma
204a0849b4
Merge pull request #2141 from nextcloud/icon-background
...
add dark background fade to icons to make them visible on light backgrounds
2016-11-17 00:00:17 +01:00
Morris Jobke
a728766bf4
Merge pull request #2151 from nextcloud/theming-fixes
...
theming: move reset button into field and only show when focused
2016-11-16 23:44:39 +01:00
Roeland Jago Douma
ff44adbcb4
Merge pull request #2131 from nextcloud/fix-tabs-in-translation
...
convert text to single line so tabs in translation issue is fixed
2016-11-16 23:25:07 +01:00
Roeland Jago Douma
50929751b0
Merge pull request #2147 from nextcloud/dont-update-same-value
...
Don't update value if it is already set to the same value
2016-11-16 19:54:25 +01:00
Roeland Jago Douma
74c68d8761
Add OCSControllerTests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-16 19:49:51 +01:00
Joas Schilling
4035d60847
Merge pull request #2157 from nextcloud/fix-checkboxes
...
Fix checkboxes when theming color is enabled
2016-11-16 19:25:25 +01:00
Roeland Jago Douma
1baa2b8deb
Move OC\OCS\Person to OCSController
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-16 19:21:00 +01:00
Robin Appelman
d2dee32756
fix warnings when updating app password
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-16 19:14:36 +01:00
Joas Schilling
8f38adaab1
Merge pull request #2123 from nextcloud/downstream-26522
...
Skip hidden files when counting visible files in list
2016-11-16 19:10:35 +01:00
Morris Jobke
b373f52fa8
only use one kind of hack for the storage wrappers of the sharing code
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-16 19:04:47 +01:00
Vincent Petry
e7b1196dd6
Hack to prevent warning for read-only wrapper in public links
...
Storage wrappers should normally always be registered inside a presetup
hook. However in the public link scenario this is not possible and
there is currently no good alternative with the current architecture.
Instead of logging a warning every time, this fix prevents the warning
to be shown but also adds a FIXME in the code for the future. This is
ok because this app is already using private/internal APIs at the
moment and should be reworked properly in the future.
2016-11-16 19:04:42 +01:00
Roeland Jago Douma
577a8a730f
Use getvalue to fetch the value
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-16 18:52:49 +01:00
Morris Jobke
2960b97fc7
Don't update value if it is already set to the same value
...
* this PR makes sure to warm up the cache for that user
* then the logic within the "if is in cache" code can be used to reduce needed queries
* inspired by @andreas-p - https://github.com/nextcloud/server/pull/2128
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-16 18:52:49 +01:00
Roeland Jago Douma
cc8750ca30
Merge pull request #2160 from nextcloud/its-nextcloud
...
It's Nextcloud
2016-11-16 18:01:39 +01:00
Roeland Jago Douma
319c7ee1c0
Merge pull request #2166 from nextcloud/logreader-shipped
...
set logreader as shipped
2016-11-16 18:00:49 +01:00
Roeland Jago Douma
7100a1b347
Merge pull request #2146 from nextcloud/add_copy_tooltip_to_clipboard
...
Adds copy tooltip to clipboards
2016-11-16 17:57:35 +01:00
Robin Appelman
a7c0d99705
ensure we setup the mount manager when in lockdown
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-16 17:24:37 +01:00