Commit Graph

12359 Commits

Author SHA1 Message Date
Nextcloud bot c5f2917e1a
[tx-robot] updated from transifex 2016-09-04 00:09:28 +00:00
Nextcloud bot e6c8c33b03
[tx-robot] updated from transifex 2016-09-01 00:09:31 +00:00
Roeland Jago Douma 782c3138c9 Merge pull request #1200 from nextcloud/stable9.1-usermountcache-orphanedshare
[stable10] Prevent error with orphaned shares when updating user mount cache
2016-08-31 15:07:40 +02:00
Lukas Reschke c4bfdb3cab Merge pull request #1183 from nextcloud/backport-529-cross-vendor-up-and-downgrades
[stable10] Allow downgrades of maintenance accross vendors
2016-08-30 19:54:20 +02:00
Vincent Petry c4f303d19c
Prevent error with orphaned shares when updating user mount cache 2016-08-30 19:45:22 +02:00
Joas Schilling 061aad5fe3
Check if the file isReadable() before sending a (cached) preview 2016-08-30 10:24:01 +02:00
Joas Schilling 7d54d03e40
Allow downgrades of maintenance accross vendors 2016-08-30 10:19:40 +02:00
Thomas Müller f6ee9340c2
[stable9.1] Fix issues where some user settings cannot be loaded when the user id differs in case sensitivity - fixes #25684 (#25686) 2016-08-29 15:19:00 +02:00
Lukas Reschke 4fb2810add
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-27 22:16:30 +02:00
Damjan Georgievski cc8b508987
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-08-26 12:31:43 +02:00
Roeland Jago Douma a046725321
Dark autoloader magic for ThemingDefaults 2016-08-24 13:25:16 +02:00
Lukas Reschke 805fc22276 Merge pull request #1008 from nextcloud/shared-storage-non-recursive-10
[10] Fix shared storage recursive setup
2016-08-23 22:15:21 +02:00
Robin Appelman fa980af53c prevent infinite recursion while getting storage from mount 2016-08-23 13:59:01 +02:00
Lukas Reschke 1c01728514
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-23 11:21:42 +02:00
Lukas Reschke f4bb803564 Merge pull request #1009 from nextcloud/backport-995
[stable10] Backport Workflow section + hidden empty sections #995 to stabble10
2016-08-23 11:20:13 +02:00
Arthur Schiwon ff2f5ecbf7
Backport Workflow section + hidden empty sections #995 to stabble10
add section to worklfowengine

enlist only registered sections that also have settings registered to

adjust test

Move admin settings to workflow section

fix wrong var name

Save the container with the app's namespace so we can resolve it
2016-08-22 16:37:48 +02:00
Arthur Schiwon fa29ba1fce
hide parameters of tryLogin when logging 2016-08-22 14:33:23 +02:00
Lukas Reschke cc80df9e8e Merge pull request #1001 from nextcloud/backport-969-allow-to-validate-operations
[stable10] Allow to validate operations
2016-08-22 13:43:17 +02:00
Robin Appelman a1fd9d275f Allow jail wrappers to lazily initialize the source storage 2016-08-22 12:41:04 +02:00
Robin Appelman 2a2f1b9a00 Allow storage wrappers to lazily initialize the source storage 2016-08-22 12:40:16 +02:00
blizzz 379260732c Merge pull request #918 from nextcloud/stable10_891
[Stable10] [OC] Fix unmerged shares repair targetdecision
2016-08-22 12:09:27 +02:00
Joas Schilling 4377d99662
Validate the operation 2016-08-22 09:03:47 +02:00
Julius Haertl fe15940233
Fix loading of ThemingDefaults 2016-08-19 11:29:58 +02:00
Roeland Jago Douma a2b6d4d923
Nextcloud is being updated. Not ownCloud
Fixes #948
2016-08-19 08:36:17 +02:00
Morris Jobke f68d5d1071 Merge pull request #935 from nextcloud/stable10-add-cachebusters
[Stable10] add cachebusters
2016-08-18 15:49:44 +02:00
Lukas Reschke 95fca9abad
Add cache buster to left menu bar 2016-08-18 12:45:52 +02:00
Joas Schilling 91fbf815f9
Fix "Undefined index" when the values do not exist 2016-08-18 12:03:10 +02:00
Roeland Jago Douma 5b6b9ad1ff Merge pull request #921 from nextcloud/backport-867-notification-primary-action-always-first
[stable10] Make sure the primary action is always the first one
2016-08-18 10:39:27 +02:00
Joas Schilling 1927c28b9f Merge pull request #910 from nextcloud/stable10_864
[Stable10] Ensure the user exists before calling a method on it
2016-08-18 09:30:47 +02:00
Joas Schilling e1ec3964c8
Make sure the primary action is always the first one 2016-08-18 09:27:14 +02:00
Vincent Petry 11e9ce669a
Improve regexp to detect duplicate folders when repairing unmerged shares 2016-08-17 19:39:08 +02:00
Vincent Petry c1ad88a777
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 19:38:33 +02:00
Vincent Petry 837dc0b336
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 19:38:19 +02:00
Lukas Reschke f3336e93b8 Merge pull request #907 from nextcloud/nfd-default-10
[uc][10] Disable NFD encoding wrapper by default
2016-08-17 16:24:12 +02:00
Jörn Friedrich Dreyer 29565ec423
use $userId instead of $user 2016-08-17 15:51:36 +02:00
Thomas Müller 63fc5b601d
Ensure the user exists before calling a method on it - fixes #24751 2016-08-17 15:51:19 +02:00
Nextcloud bot 4470ab36bb
[tx-robot] updated from transifex 2016-08-17 13:32:21 +00:00
Vincent Petry 3c2de97ab1 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 14:45:18 +02:00
Joas Schilling 7d700fa806
Fix constant name, copy-pasterino 2016-08-17 09:42:13 +02:00
Lukas Reschke 6ed721dde3
Rename class reference
File has been renamed only on master
2016-08-16 21:28:26 +02:00
Arthur Schiwon 8ef08e46e8
add missing encryption modules to settings 2016-08-16 21:11:17 +02:00
Arthur Schiwon 4d505b72de
fix missing parameters in sharing settings page 2016-08-16 21:11:10 +02:00
Arthur Schiwon 6e37a007b9
check registered sections and settings after an app got updated to garbage collect orphaned classes 2016-08-16 21:10:57 +02:00
Arthur Schiwon 1e62bd3d92
attempt to remove section and settings entries when an app got disabled 2016-08-16 21:10:54 +02:00
Lukas Reschke 687f5bee94
Add unit tests 2016-08-16 21:10:41 +02:00
Arthur Schiwon 1ebbcdcc96
satisfy dependencies for files_external 2016-08-16 21:10:37 +02:00
Arthur Schiwon 57295ee35f
simplify encryption manager fetching in DIContainer 2016-08-16 21:10:27 +02:00
Arthur Schiwon 9111b52fef
move mail settings and file handling to additional ones, thus files_external gets its own section 2016-08-16 21:10:21 +02:00
Arthur Schiwon 0c904c8de7
move systemstags to sharign section, drop collaboration section 2016-08-16 21:10:13 +02:00
Arthur Schiwon d056f575c9
change casing in section display names 2016-08-16 21:10:04 +02:00
Arthur Schiwon 6fa34e334f
added some missed diagnosis output 2016-08-16 21:09:50 +02:00
Bjoern Schiessle 4132319bae
rename "Tenmplate" to "ThemingDefaults" to make the auto loader happy" 2016-08-16 21:09:41 +02:00
Arthur Schiwon a5ba5bb19f
register app autoload instead of loading apps 2016-08-16 21:09:36 +02:00
Lukas Reschke df3b708cec
Add since tags to class 2016-08-16 21:09:26 +02:00
Lukas Reschke c4b35dceb0
Add missing since annotations 2016-08-16 21:09:22 +02:00
Arthur Schiwon 40778560be
adjust systemtags app 2016-08-16 21:09:08 +02:00
Arthur Schiwon 3ae0a380ae
adjust Theming app 2016-08-16 21:07:09 +02:00
Arthur Schiwon 10249f48f1
make sure shipped apps also setup their admin settings on a fresh install 2016-08-16 21:06:45 +02:00
Arthur Schiwon 09573dbbba
adjust files_external 2016-08-16 21:06:38 +02:00
Arthur Schiwon e37db63e47
rename IAdmin to ISettings, the interface is not bound to a specific settings scope 2016-08-16 21:05:54 +02:00
Arthur Schiwon c956901949
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-16 21:05:38 +02:00
Arthur Schiwon d7bbebb8f5
fix registration of admin settings and section on app install 2016-08-16 21:05:19 +02:00
Arthur Schiwon 2e9794f53e
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-16 21:05:11 +02:00
Arthur Schiwon d01689037d
Initial work on Apps page split:
* interfaces for the Admin settings (IAdmin) and section (ISection)
* SettingsManager service
* example setup with LDAP app
2016-08-16 21:04:22 +02:00
Roeland Jago Douma 17d0988a83
Recreate the composer autoloader files
* Adds missing files (so they are statically loaded)
2016-08-15 13:38:22 +02:00
Lukas Reschke 550c5ee7c4 Merge pull request #811 from nextcloud/shared-cachethepropagatorinstance-stable10
Store the shared propagator instance
2016-08-10 17:24:44 +02:00
Lukas Reschke 93677b2ca3 Merge pull request #817 from nextcloud/jail-root-stable10
[stable10] getJailedPath expects $path to have a trailing /
2016-08-10 16:04:13 +02:00
Lukas Reschke 5e7973b869 Merge pull request #822 from nextcloud/shared-storage-lazy-numeric-id-10
[10] get shared storage storage id without setting up the storage
2016-08-10 16:03:21 +02:00
Roeland Jago Douma a54f9c6aef
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 13:09:01 +02:00
Robin Appelman 5321a8728e get shared storage storage id without setting up the storage 2016-08-10 13:05:32 +02:00
Thomas Müller 2e0e2064e8
Adding test case for getPathById including a jailed cache where root is just empty 2016-08-10 11:29:11 +02:00
Thomas Müller 0253300e2a
getJailedPath expects $path to have a trailing / - fixes #25464 2016-08-10 11:29:02 +02:00
Vincent Petry 5edd5100fe
Store the shared propagator instance
This instead of recreating it for every call.
2016-08-10 10:59:56 +02:00
Björn Schießle 7321baa108 Merge pull request #713 from nextcloud/stable10_474
[Stable 10] Group shares with same source and target
2016-08-08 10:55:26 +02:00
Morris Jobke 65dd174655 Merge pull request #756 from nextcloud/twofactor-isset-10
[10] Check if an app provide two-factor-auth providers before we try to use them
2016-08-08 09:15:13 +02:00
Marius Blüm eb9d0b4664 Merge pull request #757 from nextcloud/nextcloud-version-check-10
[10] Translate the server version for nextcloud
2016-08-07 09:08:49 +02:00
Joas Schilling 9bc13eb7eb Translate the server version for nextcloud 2016-08-06 10:42:26 +02:00
Robin Appelman e9310f750c Check if an app provide two-factor-auth providers before we try to use them 2016-08-06 10:30:36 +02:00
blizzz 6bbcbb22e9
Correct name in Console Application.php
see changes :)
2016-08-05 14:37:32 +02:00
Vincent Petry 21907c4f3e
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-04 19:50:16 +02:00
Vincent Petry 3a86dd1d1a
Adjust repair version check for unmerged shares 2016-08-04 19:50:16 +02:00
Vincent Petry 6638e1857a
Add repair step for unmerged shares (WIP) 2016-08-04 19:50:16 +02:00
Joas Schilling 713e201074 Merge pull request #602 from nextcloud/backport-workflow-engine
🚧 [WIP] Backport workflow engine 🚧
2016-08-04 14:20:14 +02:00
Robin Appelman de8bb68325
revert to old setup connection logic 2016-07-29 00:41:12 +02:00
Morris Jobke 51be4bf2f0 Merge pull request #618 from nextcloud/backport-519-stable10
Backport LDAPProvider to Nextcloud 10
2016-07-28 23:13:21 +02:00
Morris Jobke 0a14cd4d60 Merge pull request #628 from nextcloud/stable10-backport-612
[stable10] libxml - compare against loaded version
2016-07-28 16:56:55 +02:00
Morris Jobke 1913419520
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 14:11:32 +02:00
Roeland Jago Douma 6990a4e550
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-28 13:12:01 +02:00
root aa02f518ad
Backport LDAPProvider to Nextcloud 10
New LDAPProvider for user_ldap

final changes

comments amended

Nextcloud license header for new files
2016-07-28 10:20:38 +02:00
Joas Schilling 2a4a1278fa
Allow DI of the workflow manager by the OCP interface 2016-07-27 14:13:08 +02:00
Joas Schilling 6a21289378
Remove php side of check registration 2016-07-27 14:12:19 +02:00
Morris Jobke bc6c05afb6
Add workflowengine 2016-07-27 14:10:43 +02:00
Arthur Schiwon 1013fac447
fix autoloading in LPAP integration tests, resolves #544 2016-07-26 21:06:29 +02:00
Morris Jobke d181301699 Merge pull request #508 from nextcloud/stable10_ocs_appframework_xml
[Stable10] AppFramework do not get default response
2016-07-25 12:52:13 +02:00
Joas Schilling 28dffaa32f
Make sure we try to autoload the class 2016-07-25 09:42:28 +02:00
Joas Schilling 23b205ed48
Run the license script 2016-07-22 11:40:41 +02:00
Roeland Jago Douma 2abd83212e
AppFramework do not get default response
The OCSResponse differs from other responses in that it defaults to
XML. However we fell back to json by default.

This makes sure that if nothing is set we don't pass anything.
Which defaults then to the controllers default (which is often 'json')
but in the case of the OCSResponse 'xml'.
2016-07-21 20:32:48 +02:00
Lukas Reschke 305534225e
Revert "Remove "Help" link from personal sidebar"
This reverts commit deef15a3c7.
2016-07-21 02:11:30 +02:00
Lukas Reschke decfd1ab59
Link to proper clients 2016-07-21 01:57:03 +02:00
Lukas Reschke d4f9a69a72
Port 2d37341 to stable10 2016-07-21 01:46:11 +02:00