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

12574 commits

Author SHA1 Message Date
Morris Jobke
4afe4bda26 Merge pull request #891 from nextcloud/us_25810 
[OC] Fix unmerged shares repair targetdecision
 2016-08-30 08:22:34 +02:00
Roeland Jago Douma
7c7f862712 Merge pull request #1142 from nextcloud/fix-case-sensitive-settings 
Fix issues where some user settings cannot be loaded when the user id…
 2016-08-29 19:56:35 +02:00
Roeland Jago Douma
39749c0cd4 Merge pull request #1139 from nextcloud/clean-code-image 
Some cleanup within OC_Image (#25875)
 2016-08-29 19:56:16 +02:00
Joas Schilling
490c219893 Merge pull request #1134 from nextcloud/fix_redirection 
Fix redirection taking care of protocol and port
 2016-08-29 15:49:25 +02:00
Thomas Müller
82e8762c84
Fix issues where some user settings cannot be loaded when the user id differs in case sensitivity - fixes #25684 (#25686) 2016-08-29 14:33:16 +02:00
Thomas Müller
df1cc94c23
Some cleanup within OC_Image (#25875) 2016-08-29 14:31:59 +02:00
Juan Pablo Villafáñez
b50a03141b
Fix redirection taking care of protocol and port 2016-08-29 14:24:23 +02:00
Jörn Friedrich Dreyer
d5518735c9
always return numeric storage id as int, also check type equality in test asserts 2016-08-29 14:20:51 +02:00
Robin Appelman
6c93fe08f5 dont get bruteforce delay twice 2016-08-29 13:36:49 +02:00
Joas Schilling
f41c8c0089
Check if the file isReadable() before sending a (cached) preview 2016-08-29 10:58:57 +02:00
Lukas Reschke
25f1fdb275 Merge pull request #847 from nextcloud/quota-mount-in-homefolder 
fix quota calculation when a filesystem is mounted in a user home
 2016-08-28 15:05:46 +02:00
Raghu Nayyar
9dc23592c3 Merge pull request #1105 from nextcloud/usermenu-ordering 
fix ordering of user menu entries
 2016-08-28 10:30:16 +02:00
Lukas Reschke
4d85ffc27c Merge pull request #1054 from nextcloud/less-cache-hits 
Reduce the number of cache operations for dav operations
 2016-08-27 22:44:29 +02:00
Jan-Christoph Borchardt
0517f41b3f fix ordering of user menu entries 2016-08-27 22:42:08 +02:00
Lukas Reschke
56367d19ac Merge pull request #1088 from nextcloud/core_tags_cleanup 
Tag cleanup
 2016-08-26 17:55:30 +02:00
Joas Schilling
89c78bbce4 Merge pull request #1031 from nextcloud/2fa-infinite-redirect-loop 
prevent infinite redirect loops if the there is no 2fa provider to pass
 2016-08-26 16:03:05 +02:00
Roeland Jago Douma
d3b2e4090e
Autoloader update 2016-08-26 15:46:58 +02:00
Roeland Jago Douma
53725d4d15 Merge pull request #771 from nextcloud/theming-fixes 
Theming: Fix missing color usage
 2016-08-26 15:02:21 +02:00
Lukas Reschke
de6ab82766 Merge pull request #1080 from nextcloud/always_lazyroot 
Always use the LazyRoot
 2016-08-26 13:18:01 +02:00
Roeland Jago Douma
f805aff67c
Always use the LazyRoot 2016-08-26 12:13:34 +02:00
Julius Haertl
fdab008231
Remove internal from getThemingDefaults 2016-08-26 12:07:52 +02:00
Roeland Jago Douma
044d7c3bb7 Merge pull request #1026 from nextcloud/theming-extend-defaults 
Theming: Add logo and background to ThemingDefaults
 2016-08-26 11:53:24 +02:00
Robin Appelman
fb88d66857 optimize getUserFolder for the common case 2016-08-25 17:22:25 +02:00
Robin Appelman
2693ae870e cache user folders 2016-08-25 17:22:25 +02:00
Robin Appelman
b2d365734a cache root id in mountpoint 2016-08-25 17:22:25 +02:00
Joas Schilling
680d7f22bb Merge pull request #1036 from nextcloud/query-logger-stack 
add stacktrace to query logger
 2016-08-25 16:43:08 +02:00
Robin Appelman
1c3b1e5797 add stacktrace to query logger 2016-08-24 14:37:15 +02:00
Roeland Jago Douma
4e1d501696
Dark autoloader magic for ThemingDefaults 2016-08-24 13:22:21 +02:00
Christoph Wurst
6af2efb679
prevent infinite redirect loops if the there is no 2fa provider to pass 
This fixes infinite loops that are caused whenever a user is about to solve a 2FA
challenge, but the provider app is disabled at the same time. Since the session
value usually indicates that the challenge needs to be solved before we grant access
we have to remove that value instead in this special case.
 2016-08-24 10:49:23 +02:00
Joas Schilling
c7c53aefb2
Use the lazy root to make tests pass 🙈 2016-08-24 09:52:05 +02:00
Julius Haertl
80fe499707
Theming: Add logo and background to ThemingDefaults 2016-08-24 00:40:22 +02:00
Lukas Reschke
2f1b17d44a Merge pull request #1007 from nextcloud/shared-storage-non-recursive 
Fix shared storage recursive setup
 2016-08-23 22:15:38 +02:00
Robin Appelman
a0c2342c20 prevent infinite recursion while getting storage from mount 2016-08-23 14:52:18 +02:00
Lukas Reschke
3ed102497e Merge pull request #995 from nextcloud/workflow-section 
Workflow section + hidden empty sections
 2016-08-23 11:20:43 +02:00
Lukas Reschke
0747e96b9c
Cache registered autoloaders 
This saves more than 20ms (!) on every request, the previous problem was that `\OC_App::registerAutoloading` calls `\OC\AppFramework\App::buildAppNamespace` which parses the appinfo.xml. Since that was also called multiple times (e.g. on cloud.nextcloud.com over 200 times) that had a significant performance impact. Also on simple PROPFIND requests.

https://blackfire.io/profiles/compare/65a53e6e-7f35-4974-b559-4c81abd01c3b/graph shows the difference nicely.
 2016-08-22 23:49:46 +02:00
Arthur Schiwon
b13092065a
hide parameters of tryLogin when logging 2016-08-22 16:45:07 +02:00
Joas Schilling
94432c089f
Save the container with the app's namespace so we can resolve it 2016-08-22 14:25:43 +02:00
Robin Appelman
e316a7ade7 Allow jail wrappers to lazily initialize the source storage 2016-08-22 12:26:27 +02:00
Robin Appelman
5e44a2d868 Allow storage wrappers to lazily initialize the source storage 2016-08-22 12:23:55 +02:00
Arthur Schiwon
056c1ab035
fix wrong var name 2016-08-22 11:24:48 +02:00
Arthur Schiwon
7972fa5527
enlist only registered sections that also have settings registered to 2016-08-22 08:29:49 +02:00
Lukas Reschke
ede32a558a Merge pull request #969 from nextcloud/allow-to-validate-operations 
Allow to validate operations
 2016-08-21 20:45:40 +02:00
Lukas Reschke
d50e7ee36c
Remove reading PATH_INFO from server variable 
Having two code paths for this is unreliable and can lead to bugs. Also, in some cases Apache isn't setting the PATH_INFO variable when mod_rewrite is used.

Fixes https://github.com/nextcloud/server/issues/983
 2016-08-19 14:48:13 +02:00
Joas Schilling
75e058e3f2
update composer list 2016-08-19 14:37:31 +02:00
Joas Schilling
a111181eb3
Validate the operation 2016-08-19 12:23:05 +02:00
Julius Haertl
162b153f22
Fix loading of ThemingDefaults 2016-08-19 11:26:22 +02:00
Morris Jobke
3ccd69707e Merge pull request #865 from nextcloud/ocs_config 
Move OCS route /config to proper controller
 2016-08-19 09:39:05 +02:00
blizzz
3b6bbf8159 Merge pull request #934 from nextcloud/add-cachebusters 
Add cachebusters
 2016-08-18 15:45:22 +02:00
blizzz
53d3c8b635 Merge pull request #931 from nextcloud/replace-hardcoded-classname 
let the containers resolving capabilities find and instantiate the ri…
 2016-08-18 14:03:14 +02:00
Lukas Reschke
3c7d2544b9
Add cache buster to left menu bar 2016-08-18 12:34:55 +02:00
Arthur Schiwon
f86b20776a
let the containers resolving capabilities find and instantiate the right service 2016-08-18 11:56:19 +02:00
Joas Schilling
3dba40db7b
Fix "Undefined index" when the values do not exist 2016-08-18 11:53:26 +02:00
Roeland Jago Douma
c7b4142fee
Update autoloader 2016-08-18 09:38:03 +02:00
Roeland Jago Douma
3a17fabd04
Remove unused private classes 2016-08-18 09:37:11 +02:00
Roeland Jago Douma
c40fa47944 Merge pull request #916 from nextcloud/password_controller_composer 
Add ChangePasswordController to autoloader
 2016-08-17 20:31:20 +02:00
Lukas Reschke
5aaa065d6d Merge pull request #848 from nextcloud/public-link-quota 
fix getting quota for public links with quota_include_external_storage
 2016-08-17 20:13:56 +02:00
Roeland Jago Douma
fe80bb1aff Merge pull request #867 from nextcloud/notification-primary-action-always-first 
Make sure the primary action is always the first one
 2016-08-17 19:31:14 +02:00
Roeland Jago Douma
b57f8747ce
Add ChangePasswordController to autoloader 2016-08-17 19:28:36 +02:00
Lukas Reschke
7cd4874112 Merge pull request #895 from nextcloud/autoloader_checker 
Autoloader checker
 2016-08-17 16:27:14 +02:00
Vincent Petry
df9b509ed3
Improve regexp to detect duplicate folders when repairing unmerged shares 2016-08-17 15:31:47 +02:00
Vincent Petry
7a2d25fab4
Fix unmerged shares repair with mixed group and direct shares 
Whenever a group share is created after a direct share, the stime order
needs to be properly considered in the repair routine, considering that
the direct user share is appended to the $subShares array and breaking
its order.
 2016-08-17 15:31:36 +02:00
Vincent Petry
56b94b220d
Improve file_target finding logic when repairing unmerged shares 
Pick the most recent subshare that has no parenthesis from duplication
which should match whichever name the user picked last. If all
subshares have duplicate parenthesis names, use the least recent group
share's target instead.
 2016-08-17 15:31:35 +02:00
Nextcloud bot
39c180117e
[tx-robot] updated from transifex 2016-08-17 13:30:52 +00:00
Robin Appelman
5a599d5c4e Merge pull request #899 from nextcloud/nfd-default 
[us] Disable NFD encoding wrapper by default
 2016-08-17 14:46:52 +02:00
Vincent Petry
9f523518f3 Disable NFD encoding wrapper by default 
Seems I forgot to set it back to false after testing.
Will give a performance boost for all storages.
 2016-08-17 11:54:33 +02:00
Joas Schilling
a9f36067fd
Fix constant name, copy-pasterino 2016-08-17 10:41:13 +02:00
Roeland Jago Douma
ce0604bd06 Merge pull request #892 from nextcloud/fix_phpdoc 
Some scrutinizer phpdoc fixes
 2016-08-17 10:38:21 +02:00
Joas Schilling
027069cbae Merge pull request #846 from nextcloud/provisioning_api_ocs 
Move Provisioning API to the AppFramework
 2016-08-17 10:23:13 +02:00
Marius Blüm
c1632c3abd Merge pull request #893 from nextcloud/ie8_be_gone 
IE8 be gone!
 2016-08-17 09:02:58 +02:00
Roeland Jago Douma
b263c86430
Update autoloader 2016-08-17 08:50:44 +02:00
Nextcloud bot
0cc8b8b244
[tx-robot] updated from transifex 2016-08-17 00:09:19 +00:00
Roeland Jago Douma
8f3dc0ba43
Remove IE_8 user agent string 2016-08-16 21:01:32 +02:00
Roeland Jago Douma
64ff8ac6fa
Fix phpdoc in Comments 2016-08-16 20:33:09 +02:00
Roeland Jago Douma
035f55c913
Fix phpdoc 2016-08-16 20:26:28 +02:00
Roeland Jago Douma
0dc22d13a9
Fix IL10N phpdoc 2016-08-16 20:24:50 +02:00
Arthur Schiwon
717e22267a
Merge branch 'master' into implement_712 2016-08-16 18:31:59 +02:00
Arthur Schiwon
f76b64d3d7
add missing encryption modules to settings 2016-08-16 18:11:59 +02:00
Arthur Schiwon
58530ab42f
fix missing parameters in sharing settings page 2016-08-16 17:59:21 +02:00
Joas Schilling
f7bc5ad43b Merge pull request #864 from nextcloud/us_25652 
[us] Ensure the user exists before calling a method on it
 2016-08-16 12:57:34 +02:00
Björn Schießle
6dc956b192 Merge pull request #886 from nextcloud/capabilities_error_proof 
Make the capabilities manager more error proof
 2016-08-16 11:40:42 +02:00
Nextcloud bot
8c424c7971
[tx-robot] updated from transifex 2016-08-16 00:10:47 +00:00
Arthur Schiwon
208e551216
check registered sections and settings after an app got updated to garbage collect orphaned classes 2016-08-16 00:56:17 +02:00
Arthur Schiwon
9edca39b49
attempt to remove section and settings entries when an app got disabled 2016-08-16 00:56:17 +02:00
Lukas Reschke
6c6338b810
Merge branch 'master' into implement_712 2016-08-15 21:55:09 +02:00
Roeland Jago Douma
c044aa34fa
Make the capabilities manager more error proof 
If an app registers an invalid capabilty we should not crash hard.
Instead we should catch the exception. Log it (error) and carry on.

* Added tests
 2016-08-15 20:37:19 +02:00
Lukas Reschke
8a7a0f3287
Add unit tests 2016-08-15 16:25:34 +02:00
Arthur Schiwon
75a73a5a73
satisfy dependencies for files_external 2016-08-15 13:38:02 +02:00
Roeland Jago Douma
6c360ad79f
Add PHPdoc 2016-08-15 11:14:28 +02:00
Joas Schilling
3ed05f8769
Make sure the primary action is always the first one 2016-08-15 11:13:54 +02:00
Jörn Friedrich Dreyer
264aaf9ffa
use $userId instead of $user 2016-08-14 19:50:19 +02:00
Thomas Müller
26342061b9
Ensure the user exists before calling a method on it - fixes #24751 2016-08-14 19:50:03 +02:00
Jörn Friedrich Dreyer
291b3fd8b4
missing PHPDoc 2016-08-14 19:37:52 +02:00
Jörn Friedrich Dreyer
da5633c31a
Type compatability 2016-08-14 19:37:37 +02:00
Jörn Friedrich Dreyer
3593668413
Method is deprecated 2016-08-14 19:37:11 +02:00
Jörn Friedrich Dreyer
5aef60d2ca
Unreachable statement 2016-08-14 19:36:42 +02:00
Jörn Friedrich Dreyer
d2a16c4dc8
Unnecessary fully qualified names 2016-08-14 19:36:06 +02:00
Roeland Jago Douma
e3b0e50dda
Extend OCSMiddleware 
* Always set 401 (v1.php and v2.php)
* Set proper error codes for v2.php
* Proper OCS output on unhandled exceptions
 2016-08-14 18:34:01 +02:00
Roeland Jago Douma
deba0f9922
Move OCS Middleware before security middleware 
This is required to be able to catch the NotLoggedIn exceptions etc in
the OCSMiddleware and convert them to proper OCS Responses.
 2016-08-14 18:34:01 +02:00
Nextcloud bot
4da01eeef6
[tx-robot] updated from transifex 2016-08-13 00:13:29 +00:00
Arthur Schiwon
8188bb4509
simplify encryption manager fetching in DIContainer 2016-08-13 01:26:11 +02:00
Arthur Schiwon
158d78e1ab
move mail settings and file handling to additional ones, thus files_external gets its own section 2016-08-13 01:02:25 +02:00
Arthur Schiwon
b99ecb3c23
move systemstags to sharign section, drop collaboration section 2016-08-13 00:33:09 +02:00
Arthur Schiwon
7a2b96c7e6
change casing in section display names 2016-08-13 00:06:10 +02:00
Arthur Schiwon
9aa6b99a56
added some missed diagnosis output 2016-08-12 16:52:20 +02:00
Robin Appelman
85d3fb76d7 fix getting quota for public links with quota_include_external_storage 2016-08-12 15:59:19 +02:00
Robin Appelman
ef2116a17a fix quota calculation when a filesystem is mounted in a user home 2016-08-12 15:41:37 +02:00
Bjoern Schiessle
18fd8ff70c
rename "Tenmplate" to "ThemingDefaults" to make the auto loader happy" 2016-08-12 15:32:28 +02:00
Arthur Schiwon
ac04ba6784
register app autoload instead of loading apps 2016-08-12 13:23:14 +02:00
Nextcloud bot
35358bdde0
[tx-robot] updated from transifex 2016-08-12 00:10:18 +00:00
Lukas Reschke
8261ccce1b
Merge branch 'master' into implement_712 2016-08-11 19:37:17 +02:00
Lukas Reschke
225eb27bca
Add since tags to class 2016-08-11 19:33:37 +02:00
Lukas Reschke
8f12f5df15
Add missing since annotations 2016-08-11 19:28:24 +02:00
Arthur Schiwon
3dfdc8e311
adjust systemtags app 2016-08-11 19:05:06 +02:00
Arthur Schiwon
36c1b7eb31
adjust Theming app 2016-08-11 17:29:58 +02:00
Arthur Schiwon
ce6ad5de25
make sure shipped apps also setup their admin settings on a fresh install 2016-08-11 16:37:11 +02:00
Arthur Schiwon
a2f752bcf3
adjust files_external 2016-08-11 15:50:31 +02:00
Arthur Schiwon
14ddf9d923
rename IAdmin to ISettings, the interface is not bound to a specific settings scope 2016-08-11 14:48:21 +02:00
Nextcloud bot
56bf0a8399
[tx-robot] updated from transifex 2016-08-11 00:14:12 +00:00
Arthur Schiwon
f3b15a9ab9
fixes, improvements, and another app: 
* setupSettings now also triggered on enable
* fixes detection of present admin section or settings in the DB
* add update routine in such cases
* encryption app migrated
 2016-08-11 01:41:18 +02:00
Arthur Schiwon
0fc34c99f4
fix registration of admin settings and section on app install 2016-08-11 00:45:15 +02:00
Roeland Jago Douma
ba922c9f73 Merge pull request #807 from nextcloud/ocs_dataresponse 
OCSController requires DataResponse
 2016-08-10 22:36:25 +02:00
Lukas Reschke
67d016833d Merge pull request #810 from nextcloud/shared-cachethepropagatorinstance 
Store the shared propagator instance
 2016-08-10 17:24:57 +02:00
Arthur Schiwon
1eb8b951c2
more admin page splitup improvements 
* bump version to ensure tables are created
* make updatenotification app use settings api
* change IAdmin::render() to getForm() and change return type from Template to TemplateResponse
* adjust User_LDAP accordingly, as well as built-in forms
* add IDateTimeFormatter to AppFramework/DependencyInjection/DIContainer.php. This is important so that \OC::$server->query() is able to resolve the
constructor parameters. We should ensure that all OCP/* stuff that is available from \OC::$server is available here. Kudos to @LukasReschke
* make sure apps that have settings info in their info.xml are loaded before triggering adding the settings setup method
 2016-08-10 15:21:25 +02:00
Björn Schießle
219f36d261 Merge pull request #820 from nextcloud/shared-storage-lazy-numeric-id 
get shared storage storage id without setting up the storage
 2016-08-10 14:56:41 +02:00
Roeland Jago Douma
1f370c97ed
OCSController requires DataResponse 
The OCS Controller requires a DataResponse object to be returned.
This means that all error handling will have to be done via exceptions
thrown and handling in the middleware.
 2016-08-10 12:40:26 +02:00
Vincent Petry
412b5c5407
Store the shared propagator instance 
This instead of recreating it for every call.
 2016-08-10 10:57:49 +02:00
Morris Jobke
93047f5e4d Merge pull request #777 from nextcloud/ocs_capabilities 
Move /cloud/capabilities and /cloud/user to Core
 2016-08-10 00:43:13 +02:00
Lukas Reschke
9fbdb0efe8 Merge pull request #529 from nextcloud/vendor-maintenance-downgrade 
Allow downgrades of maintenance accross vendors
 2016-08-10 00:25:53 +02:00
Roeland Jago Douma
e2f54559d6
Remove OC_OCS_Cloud and OC\OCS\Cloud 2016-08-09 20:56:31 +02:00
Roeland Jago Douma
02449c8336
Move getCapabilities over to Core 2016-08-09 20:56:31 +02:00
Roeland Jago Douma
575875e8d0
Allow OCS routes in Core and Settings 2016-08-09 20:56:31 +02:00
Lukas Reschke
5214b62d55 Merge pull request #691 from nextcloud/ocs_allow_all_old_routes 
Allow ocs/v2.php/cloud/... routes
 2016-08-09 20:52:49 +02:00
Lukas Reschke
b53ea18ea5
Match only for actual session cookie 
OVH has implemented load balancing in a very questionable way where the reverse proxy actually internally adds some cookies which would trigger a security exception. To work around this, this change only checks for the session cookie.
 2016-08-09 19:23:08 +02:00
Arthur Schiwon
ceeb44bd04
Initial work on Apps page split: 
* interfaces for the Admin settings (IAdmin) and section (ISection)
* SettingsManager service
* example setup with LDAP app
 2016-08-09 18:05:09 +02:00
Robin Appelman
a999420c75 get shared storage storage id without setting up the storage 2016-08-09 15:52:13 +02:00
Lukas Reschke
b4ed4e152e Merge pull request #746 from nextcloud/jail-root 
getJailedPath expects $path to have a trailing /
 2016-08-09 11:04:11 +02:00
Morris Jobke
4277051442 Merge pull request #660 from gdamjan/custom-config-dir 
introduce NEXTCLOUD_CONFIG_DIR env variable (see #300)
 2016-08-09 10:58:23 +02:00
Roeland Jago Douma
0032a5c2d1
Hanlde Core and Settings app in AppFramework 
'core' and 'settings' are just apps but we treat them slightly
different. Make sure that we construct the correct namespace so we can
actually do automatic AppFramework stuff.
 2016-08-08 20:48:16 +02:00
Roeland Jago Douma
63f6d2d558
Allow ocs/v2.php/cloud/... routes 
One of the possibilities of the old OCS API is that you can define the
url yourself.

This PR makes this possible again by adding an optional root elemenet to
the route. Routes are thus:

.../ocs/v2.php/<root>/<url>

By default <root> = apps/<app>

This will allow for example the provisioning API etc to be in
../ovs/v2/php/cloud/users
 2016-08-08 15:01:26 +02:00
Lukas Reschke
fa352a81a5 Merge pull request #728 from nextcloud/update-styling 
Design fixes for updates
 2016-08-08 11:23:31 +02:00
Björn Schießle
727cd6aad0 Merge pull request #711 from nextcloud/password-policy-on-createUser 
Apply password policy on user creation
 2016-08-08 11:17:07 +02:00
Joas Schilling
f37fa6e45c
Move Share backends to PSR-4 instead of using class path (#24941) 2016-08-05 14:13:41 +02:00
Thomas Müller
f1cd68d713 Adding test case for getPathById including a jailed cache where root is just empty 2016-08-05 14:06:05 +02:00
Thomas Müller
d252d79059 getJailedPath expects $path to have a trailing / - fixes #25464 2016-08-05 14:06:05 +02:00
Joas Schilling
84e6b8d9d0 Merge pull request #737 from nextcloud/blizzz-fix-name-console 
Correct name in Console Application.php
 2016-08-05 09:17:34 +02:00
Nextcloud bot
c44c9a55f4
[tx-robot] updated from transifex 2016-08-05 00:10:09 +00:00
blizzz
329c714a7e Correct name in Console Application.php 
see changes :)
 2016-08-04 19:17:13 +02:00
Jan-Christoph Borchardt
835dc59d6a reduce info on update screens, introduce button to refresh 2016-08-04 12:48:25 +02:00
michag86
5fb39bd0cb Apply password policy on user creation 2016-08-03 11:52:15 +02:00
Vincent Petry
0c6352e095
Fix RepairUnmergedShares to not skip valid repair cases 
The repair step was a bit overeager to skip repairing so it missed the
case where a group share exists without subshares but with an
additional direct user share.
 2016-08-03 10:16:28 +02:00
Vincent Petry
0c7c9a3b95
Adjust repair version check for unmerged shares 2016-08-03 10:16:28 +02:00
Vincent Petry
67fa6bf9bc
Add repair step for unmerged shares (WIP) 2016-08-03 10:16:28 +02:00
Christoph Wurst
e90f00791d add invalidateOldTokens to IProvider interface 2016-08-02 12:08:13 +02:00
Lukas Reschke
8a7d450fb5 Merge pull request #684 from nextcloud/fix_csrf_ocs 
Fix OCS CSRF
 2016-08-01 11:52:56 +02:00
Nextcloud bot
8ef5fcec1d
[tx-robot] updated from transifex 2016-08-01 08:53:07 +00:00
Roeland Jago Douma
5c718b13b8
We should properly check for 'true' instaed of the bool 2016-08-01 08:52:50 +02:00
Nextcloud bot
50c8367041
[tx-robot] updated from transifex 2016-08-01 00:10:15 +00:00
Nextcloud bot
2a2526e1d1
[tx-robot] updated from transifex 2016-07-31 00:09:54 +00:00
Nextcloud bot
2565a39361
[tx-robot] updated from transifex 2016-07-30 00:11:16 +00:00
Damjan Georgievski
982bdb1823 introduce NEXTCLOUD_CONFIG_DIR env variable (see #300) 
nextcloud by default uses the `/config/` directory in the source/application tree for its config file(s).
with this commit that directory can be overridden by the `NEXTCLOUD_CONFIG_DIR` environment variable.

in uwsgi, you would use the option `--env "NEXTCLOUD_CONFIG_DIR=/tmp/nx-config/"`
in apache `SetENV …`
and the cli command can be run with: `NEXTCLOUD_CONFIG_DIR=/tmp/nx-config ./occ` (or just use `export` once in the
shell).

NEXTCLOUD_CONFIG_DIR can be supplied with or without the trailing slash (`/`), but in all cases `$configDir` will have
it automatically added if needed.

The other changes are several occurrences of `OC::$SERVERROOT . '/config'` to `OC::$configDir`.
 2016-07-29 17:49:14 +02:00
Roeland Jago Douma
f7f5216aa3
Dark hackery to not always disable CSRF for OCS controllers 2016-07-29 15:49:27 +02:00
Morris Jobke
54ae8eede3 Merge pull request #556 from nextcloud/nextcloud-version-check 
Allow apps to check for a given nextcloud version
 2016-07-29 09:26:25 +02:00
Lukas Reschke
d6c680051c Merge pull request #612 from nextcloud/improve-xml-loaded-version-handling 
libxml - compare against loaded version
 2016-07-28 11:26:06 +02:00
blizzz
73311091bf Merge pull request #519 from GitHubUser4234/master 
New LDAPProvider for user_ldap
 2016-07-28 10:14:34 +02:00
root
bd65a17203 Nextcloud license header for new files 2016-07-28 15:13:00 +08:00
Morris Jobke
740349fda3
libxml - compare against loaded version 
* if the compiled in version is older than the loaded version Nextcloud doesn't work
* uses the loaded libxml version to check against

fixes #205
 2016-07-28 08:30:33 +02:00
Bjoern Schiessle
351cab6bce
skip shared files, if files get decrypted only for a specific user we shouldn't touch files owned by a different user. 2016-07-27 15:39:24 +02:00
Roeland Jago Douma
8bdd0adcee
Support subdir in the OCS v2 endpoint 
We should check against the ending substring since people could
run their nextcloud in a subfolder.

* Added test
 2016-07-27 15:28:35 +02:00
Björn Schießle
10726dd00d Merge pull request #596 from nextcloud/adjust-mysql-install-error 
Fix misleading MySQL DB creation error (#25485)
 2016-07-27 14:34:07 +02:00
Joas Schilling
5bdb620af3 Merge pull request #582 from nextcloud/checks-from-js 
Generate the checks list in JS
 2016-07-27 13:59:03 +02:00
Joas Schilling
da97a69148
Allow DI of the workflow manager by the OCP interface 2016-07-27 11:46:09 +02:00
Vincent Petry
aeb4011279
Fix misleading MySQL DB creation error (#25485) 
Whenever the GRANT ALL failed, it used to display "Database creation
failed" which is incorrect. It's only the privleges setting that failed.

This moves the privilege setting message to DEBUG and makes it more
precise.
 2016-07-27 11:45:13 +02:00
Joas Schilling
681eebcfe6
Remove php side of check registration 2016-07-27 10:21:26 +02:00
Joas Schilling
318d68a9a9 Merge pull request #565 from nextcloud/workflowengine 
Add workflowengine
 2016-07-27 10:07:20 +02:00
Morris Jobke
72ae7520d7 Merge pull request #566 from nextcloud/setup-port 
revert to old setup connection logic
 2016-07-27 10:02:39 +02:00
root
2719dcabed Merge branch 'master' of https://github.com/nextcloud/server 2016-07-27 15:17:29 +08:00
root
32fb6beac3 final changes 2016-07-27 15:10:35 +08:00
Nextcloud bot
95a0714973
[tx-robot] updated from transifex 2016-07-27 00:09:48 +00:00
Joas Schilling
0fcc39cd8e
Translate the server version for nextcloud 2016-07-26 14:40:18 +02:00
Robin Appelman
0e83f5dbd7 revert to old setup connection logic 2016-07-26 11:44:15 +02:00
Morris Jobke
2f42a3fc31
Add workflowengine 2016-07-26 11:16:34 +02:00
William Bargent
352e24e703 Merge pull request #292 from nextcloud/recent-files 
Add "Recent" file listing
 2016-07-25 15:25:02 +01:00
Morris Jobke
e51afa1684 Merge pull request #509 from nextcloud/appframework_magic_allow_default_vars 
AppFramework add default values (ApiController) as parameters
 2016-07-25 13:18:53 +02:00
Morris Jobke
88cbde6a66 Merge pull request #550 from nextcloud/ldap-integration-test-autoloader 
fix autoloading in LPAP integration tests, resolves #544
 2016-07-25 12:54:50 +02:00
Joas Schilling
4ad0c383ad Merge pull request #523 from Faldon/master 
Renamed file logging
 2016-07-25 11:41:24 +02:00
Arthur Schiwon
686cb599b6
fix autoloading in LPAP integration tests, resolves #544 2016-07-25 11:05:59 +02:00
root
1fb080df2b Merge branch 'master' of https://github.com/nextcloud/server 2016-07-25 16:56:14 +08:00
Morris Jobke
de4236bc4a Merge pull request #530 from nextcloud/fix-theme-loading 
Make sure we try to autoload the class
 2016-07-25 08:37:13 +02:00
Nextcloud bot
7d969962db
[tx-robot] updated from transifex 2016-07-25 00:09:09 +00:00
Nextcloud bot
a20f4c432b
[tx-robot] updated from transifex 2016-07-24 00:09:10 +00:00
Robin Appelman
681ac9f19f Check if an app provide two-factor-auth providers before we try to use them 2016-07-23 13:26:57 +02:00
Nextcloud bot
e36decc12b
[tx-robot] updated from transifex 2016-07-23 00:09:06 +00:00
Joas Schilling
8cea95390d
Make sure we try to autoload the class 2016-07-22 16:49:33 +02:00
Robin Appelman
81e103074e use limit instead of since when listing recent files 2016-07-22 15:20:55 +02:00
Joas Schilling
5c34346479
Allow downgrades of maintenance accross vendors 2016-07-22 14:51:43 +02:00
Thomas Pulzer
b058639a8a Changed code style and made use of '===' comparison. 2016-07-22 14:45:33 +02:00
Robin Appelman
e321ecd592 add recent files to node api 2016-07-22 14:39:32 +02:00
Thomas Pulzer
32f5073f9f Reverted the default syslog tag to avoid breaking existing systems. 2016-07-22 14:38:44 +02:00
Robin Appelman
d499f68fd7 Fix storage id with storage jail 2016-07-22 14:34:59 +02:00
Roeland Jago Douma
b543fd8d30
Set proper status code in OCS AppFramework Middleware 2016-07-22 12:53:47 +02:00