wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
35682 commits 157 branches 562 tags 714 MiB
Commit graph

35682 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Robin Appelman
bd10c960ee
set logreader as shipped 2016-11-16 17:08:30 +01:00
Robin Appelman
0e88b519d1
fix warning with token login 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-16 16:33:56 +01:00
Roeland Jago Douma
61453f5fd5 Merge pull request #719 from nextcloud/lockdown 
Allow restricting of app password permissions
 2016-11-16 16:17:28 +01:00
Morris Jobke
b7e6e9f83c
Fix tooltips - they now properly change on click 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-11-16 15:43:26 +01:00
Roeland Jago Douma
5f789fdebc Merge pull request #2150 from nextcloud/move_buttons_to_bottom 
Move social buttons to bottom on admin page
 2016-11-16 15:37:11 +01:00
Roeland Jago Douma
00729bcbc5 Merge pull request #2156 from nextcloud/fix-autoloader-for-new-apps 
Add autoloader path for newly installed apps too
 2016-11-16 15:36:37 +01:00
Robin Appelman
e633f2f8df
add test 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-16 15:24:33 +01:00
Robin Appelman
e77432783b
Add test for setting up fake fs 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-16 15:24:32 +01:00
Robin Appelman
9157f807cc
dropdown ui 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-16 15:24:32 +01:00
Roeland Jago Douma
311531ecce
Adds tests for the AuthSettingsController 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-16 15:24:31 +01:00
Roeland Jago Douma
59d6003f89
Adds NullCache ans NullStorage tests for Lockdown 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-16 15:24:31 +01:00
Roeland Jago Douma
e5bc80b31d
Adds TokenProvider and Mapper tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-16 15:24:31 +01:00
Robin Appelman
91851c37be
add tests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-16 15:24:30 +01:00
Robin Appelman
4837904ad6
update autoloader 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-16 15:24:30 +01:00
Robin Appelman
4c3d18a9fc
explicit types 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-16 15:24:29 +01:00
Robin Appelman
a4ea20a259
cast to int 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-16 15:24:29 +01:00
Robin Appelman
bb65d3b03d
update tests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-16 15:24:29 +01:00
Robin Appelman
c5df58ec69
phpdoc 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-16 15:24:28 +01:00
Robin Appelman
7e9e5db496
fix setscope 
Signed-off-by: Robin Appelman <icewind@owncloud.com>
 2016-11-16 15:24:28 +01:00
Robin Appelman
da63af8b02
enable deleting/configuring new tokens 
Signed-off-by: Robin Appelman <icewind@owncloud.com>
 2016-11-16 15:24:28 +01:00
Robin Appelman
1afccde16a
allow configuring filesystem access 
Signed-off-by: Robin Appelman <icewind@owncloud.com>
 2016-11-16 15:24:27 +01:00
Robin Appelman
b4e27d35f5
app password scope wip 
Signed-off-by: Robin Appelman <icewind@owncloud.com>
 2016-11-16 15:24:27 +01:00
Robin Appelman
2389e0f250
read lockdown scope from token 
Signed-off-by: Robin Appelman <icewind@owncloud.com>
 2016-11-16 15:24:27 +01:00