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

12456 commits

Author SHA1 Message Date
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
Thomas Pulzer
ba3f4f118e Changed logtype to file instead of owncloud. 
- Updated the config sample to point to log_type='file'
- Renamed the Class for logfile logging to File in namespace 'OC\Log\'.
  Changed the occurrences of 'OC\Log\Owncloud' to 'OC\Log\File'.
- Renamed the Class for log:file command to File in namespace 'OC\Core\Command\Log\File'.
  Changed registration of the command to use 'OC\Core\Command\Log\File'.
- Changed default Syslog tag to Nextcloud
- Retained backwards compatibility for configs with 'logtype' => 'owncloud'

- Adjusted tests for the new file log.

Closes #490.
 2016-07-22 11:44:19 +02:00
root
02ec8b1726 New LDAPProvider for user_ldap 2016-07-22 16:46:29 +08:00
Roeland Jago Douma
1b73a63041
Inject parameters 2016-07-22 10:12:26 +02:00
Nextcloud bot
4b4990c48f
[tx-robot] updated from transifex 2016-07-22 00:10:05 +00:00
Morris Jobke
8c7d7d7746 Merge pull request #507 from nextcloud/run-le-script 
Update emails and license headers with latest changes
 2016-07-21 23:27:15 +02:00
Lukas Reschke
562e63cf69 Merge pull request #480 from nextcloud/fix_ocs_response_format 
AppFramework default response for OCS is xml
 2016-07-21 19:52:17 +02:00
Joas Schilling
0215b004da
Update with robin 2016-07-21 18:13:58 +02:00
Joas Schilling
ba87db3fcc
Fix others 2016-07-21 18:13:57 +02:00
Lukas Reschke
4f42c3d725
Revert "Remove "Help" link from personal sidebar" 
This reverts commit deef15a3c7.
 2016-07-21 02:25:00 +02:00
Lukas Reschke
01ab40f557
Merge branch 'master' of https://github.com/nextcloud/server 2016-07-21 02:24:06 +02:00
Lukas Reschke
a9f2789df5
Fix typo 2016-07-21 02:23:42 +02:00
Nextcloud bot
b7c5a59adf
[tx-robot] updated from transifex 2016-07-21 00:09:07 +00:00
Lukas Reschke
7c6896f091
Link to proper clients 2016-07-21 01:56:47 +02:00
Lukas Reschke
19f770d0db
Port 2d373416d8 to master 2016-07-21 01:43:32 +02:00
Lukas Reschke
977db0a162
Use proper certificates 
Ports bcf693539b
 2016-07-21 01:34:11 +02:00
Lukas Reschke
9a1ff29351
Use proper documentation links 
Since it is just faking the 10 we need to hardcode this here...
 2016-07-21 00:36:52 +02:00
Lukas Reschke
c385423d10 Merge pull request #479 from nextcloud/add-bruteforce-throttler 
Implement brute force protection
 2016-07-21 00:31:02 +02:00
Lukas Reschke
c1589f163c
Mitigate race condition 2016-07-20 23:09:27 +02:00
Lukas Reschke
adf67fac96
JSON encode the values 2016-07-20 22:47:33 +02:00
Lukas Reschke
ba4f12baa0
Implement brute force protection 
Class Throttler implements the bruteforce protection for security actions in
Nextcloud.

It is working by logging invalid login attempts to the database and slowing
down all login attempts from the same subnet. The max delay is 30 seconds and
the starting delay are 200 milliseconds. (after the first failed login)
 2016-07-20 22:08:56 +02:00
Roeland Jago Douma
e42f2f2650
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-20 22:05:43 +02:00
Lukas Reschke
020a2a6958 Merge pull request #476 from nextcloud/port-same-site-cookies 
[master] Port Same-Site Cookies to master
 2016-07-20 21:35:02 +02:00
Lukas Reschke
a17ba2f488 Merge pull request #466 from nextcloud/escape-special-characters 
Escape special characters (#25429)
 2016-07-20 21:24:19 +02:00
Roeland Jago Douma
cff5be3d63
Deprecate \OCP\API 2016-07-20 20:03:53 +02:00
Roeland Jago Douma
ea47974a08
Add OCSMiddleware to catch OCS exceptions 
* OCSException
* OCSBadRequestException
* OCSForbiddenException
* OCSNotFoundException
 2016-07-20 20:03:49 +02:00
Lukas Reschke
a299fa38a9
[master] Port Same-Site Cookies to master 
Fixes https://github.com/nextcloud/server/issues/50
 2016-07-20 18:37:57 +02:00
Morris Jobke
e9c85e02ac Merge pull request #462 from nextcloud/master-explode 
[master] Use explode() instead of split()
 2016-07-20 18:31:11 +02:00
Björn Schießle
7cdf6402ff Merge pull request #472 from nextcloud/show-app-name-in-errormsg 
Show app name in error message if app could not be loaded. (#25441)
 2016-07-20 18:20:49 +02:00
Morris Jobke
1264e9644f Merge pull request #402 from nextcloud/smb-notifications 
smb update notifications
 2016-07-20 16:19:21 +02:00
Klaas Freitag
99316ec02c
Show app name in error message if app could not be loaded. (#25441) 2016-07-20 15:16:16 +02:00
Aaron Wood
7c0de08cc4
Escape special characters (#25429) 
* Escape LIKE parameter

* Escape LIKE parameter

* Escape LIKE parameter

* Escape LIKE parameter

* Escape LIKE parameter

* Use correct method in the AbstractMapping class

* Change the getNamesBySearch method so that input can be properly escaped while still supporting matches

* Don't escape hardcoded wildcard
 2016-07-20 14:46:47 +02:00
Lukas Reschke
4f90447150
[master] Use explode() instead of split() 
Sync from https://github.com/owncloud/core/pull/25488
 2016-07-20 14:36:39 +02:00
Björn Schießle
8735a05d93 Merge pull request #441 from nextcloud/fix-maintenance-mode 
Fix maintenance mode
 2016-07-19 16:59:24 +02:00
Roeland Douma
13a25535d2 Merge pull request #400 from nextcloud/ocs_appframework 
OCS routes use AppFramework
 2016-07-19 12:21:14 +02:00
Morris Jobke
544c3c1565 Merge pull request #436 from nextcloud/public-regex-to-match-our-clients 
Copy the regexes to the public interface
 2016-07-19 11:35:10 +02:00
Morris Jobke
0a6d95b126 Merge pull request #394 from nextcloud/tags-for-everything 
SystemTags for everything not just files
 2016-07-19 10:47:12 +02:00
Joas Schilling
80168613be
Fix maintenance mode 
When the server is in maintenance mode, apps are not loaded.
That means apps/theming/ is not in the allowed paths. So we
need to check without autoloading, whether the class exists.
 2016-07-19 09:54:42 +02:00
Roeland Douma
35f48d6f35 Merge pull request #435 from nextcloud/classmap 
Use classmap to load core files
 2016-07-18 22:12:03 +02:00
Nextcloud bot
b23d3c6418
[tx-robot] updated from transifex 2016-07-18 14:08:51 +00:00
Björn Schießle
ea470f8777 Merge pull request #405 from nextcloud/theming-fixes 
Theming fixes
 2016-07-18 15:59:47 +02:00
Joas Schilling
b1d652e8b0
Copy the regexes to the public interface 2016-07-18 15:11:44 +02:00
Roeland Jago Douma
14be81c5b0
Use classmap to load core files 
We can't use an authoritive classmap in the current state as it would
kill app loading. However we can use a proper classmap for the normal
core stuff.
 2016-07-18 14:46:54 +02:00
Joas Schilling
9781312648
Prevent syntax error when creating user or changing password 2016-07-18 11:44:10 +02:00
Roeland Jago Douma
0bda09236e
Add route tests 2016-07-18 11:09:49 +02:00
Roeland Jago Douma
1caceea6c0
Make the OCS endpoint handle the new OCS AppFramework routes 2016-07-18 11:09:45 +02:00
Roeland Jago Douma
94cd83ca00
Make the router handle OCS AppFramework Routes 2016-07-18 11:09:04 +02:00
Roeland Jago Douma
1ff4b7f63d
Allow registering of OCS routes with the appframework 2016-07-18 11:09:04 +02:00
Joas Schilling
9795a732ff
Update since version 2016-07-18 10:26:43 +02:00
Joas Schilling
7c039bcbf6
Allow apps to register SystemTags plugins 2016-07-18 10:26:42 +02:00
Morris Jobke
5157c5a9c4 Merge pull request #418 from nextcloud/remove_asset_pipeline 
Remove asset pipelin
 2016-07-18 09:44:35 +02:00
Nextcloud bot
91c281c4b4
[tx-robot] updated from transifex 2016-07-17 00:09:26 +00:00
Nextcloud bot
d6907fe84d
[tx-robot] updated from transifex 2016-07-16 00:09:18 +00:00
Roeland Jago Douma
72464f1ce4
Remove asset pipelin 
Fixes #215

The asset pipeline has shown to do more harm than good. Some apps fail
hard with it. Also it makes sure that you download a huge file on each
unvisited page.
 2016-07-15 20:14:11 +02:00
Robin Appelman
d485cfd40d fix since 2016-07-15 13:58:44 +02:00
Joas Schilling
2c988ecbf4
Use the themed Defaults everywhere 2016-07-15 09:17:30 +02:00
Robin Appelman
e1fa314b18 add notify support to smb storage 2016-07-14 14:46:01 +02:00
Robin Appelman
29eeeb2273 Save the files external mount id in the mount cache table 2016-07-13 16:34:08 +02:00
Robin Appelman
e5d7612a19 dont check for pgsql extension during setup 2016-07-12 14:38:24 +02:00
Robin Appelman
7ffda5d10f use pdo for postgres setup 2016-07-12 14:38:24 +02:00
Robin Appelman
8a79d314cf Remove duplicate database connect logic in mysql setup 2016-07-12 14:38:24 +02:00
Nextcloud bot
e29835a702
[tx-robot] updated from transifex 2016-07-12 00:09:34 +00:00
Bjoern Schiessle
7c64e1973f
add test for needsRebundling() check 2016-07-11 15:51:48 +02:00
Lukas Reschke
0c1cf5f7eb Merge pull request #347 from nextcloud/drop-windows-foo 
Remove unneeded checks if it runs on a Windows machine
 2016-07-11 13:16:03 +02:00
Joas Schilling
103417fd9c Merge pull request #350 from nextcloud/fix-check-certificate-bundles 
fix check if the certificate bundle needs to be updated
 2016-07-11 11:04:49 +02:00
Bjoern Schiessle
49cad153af
always check the mtime of the system bundle and additionally the user specific certificate bundle if a user is given 2016-07-08 18:24:37 +02:00
Morris Jobke
c2d88a08b7
Remove unneeded checks if it runs on a Windows machine 
* the setup check is still there
 2016-07-08 15:55:17 +02:00
Morris Jobke
390a996297
Sanitize more config options and stack traces 2016-07-08 14:13:16 +02:00
Nextcloud bot
a84250e0af [tx-robot] updated from transifex 2016-07-08 00:09:25 +00:00
Lukas Reschke
c8ba8f637e Merge pull request #314 from jernst/master 
Allow wildcard * to be used in trusted domains
 2016-07-07 19:34:11 +02:00
Lukas Reschke
2a1a3957b6 Merge pull request #333 from nextcloud/sync-master 
Sync master
 2016-07-07 19:29:43 +02:00
Morris Jobke
2791b8f00d Revert "occ web executor (#24957)" 
This reverts commit 854352d9a0.
 2016-07-07 12:14:45 +02:00
Morris Jobke
e3b509220b Revert "Bypass upgrade page when occ controller is requested" 
This reverts commit 89e581acf8.
 2016-07-07 12:14:39 +02:00
Morris Jobke
ba16fd0d33 Merge branch 'master' into sync-master 2016-07-07 11:29:46 +02:00
Morris Jobke
5ace43f438 Revert "[tx-robot] updated from transifex" 
This reverts commit 3731b2a006eca1e96d4087212a5e779c85a002e4.

Revert "[tx-robot] updated from transifex"

This reverts commit 94d91113f1206161b00bbc28da00aaf80bcd0a3e.

Revert "[tx-robot] updated from transifex"

This reverts commit e7cc8bac1e.

Revert "[tx-robot] updated from transifex"

This reverts commit 59fc3ff45a.

Revert "[tx-robot] updated from transifex"

This reverts commit 6a89a63d2e.

Revert "[tx-robot] updated from transifex"

This reverts commit b0bad03234.
 2016-07-07 11:04:08 +02:00
Nextcloud bot
4a0efa38c0 [tx-robot] updated from transifex 2016-07-07 08:58:00 +00:00
Morris Jobke
ed28885d73 Merge pull request #323 from Faldon/database_port 
Added occ install option for database-port
 2016-07-07 10:20:08 +02:00
Jenkins for ownCloud
38718bf89e [tx-robot] updated from transifex 2016-07-07 01:56:27 -04:00
Johannes Ernst
66a134e69e Disallow certain malformed domain names even if they match the trusted domain expression 
Stricter checking for valid domain names
 2016-07-06 23:51:04 +00:00
Johannes Ernst
2b4ceae620 Trusted domain wildcard checking made shorter, supporting multiple * 
Added test cases
 2016-07-06 23:38:30 +00:00
Vincent Petry
dc21a38a85 Use named parameter instead of direct value for system tags search param (#25380) 2016-07-06 22:39:34 +02:00
Nextcloud bot
da2363a1dd [tx-robot] updated from transifex 2016-07-06 13:28:06 +00:00
Thomas Pulzer
0638937ada Changed the input option for database-port to required when parameter was provided. 
Added casting database port to int for input sanitation in pgsql and oci connections.
 2016-07-06 11:31:28 +02:00
Thomas Pulzer
d367318088 Added occ install option for database-port. 
Extended the database setup to store the database port.
Changed the PostgreSQL connection error message for clarification.
 2016-07-06 09:58:38 +02:00
Jenkins for ownCloud
6103df97cc [tx-robot] updated from transifex 2016-07-06 01:56:27 -04:00
Johannes Ernst
3516b58be6 Duh, no 'next' in PHP. 
Use === instead of == for extra paranoia.
 2016-07-06 04:51:49 +00:00
Johannes Ernst
b1867dc8d1 Allow wildcard * to be used in trusted domains, to support setups where no reliable DNS entry is available (e.g. mDNS) or for simple-to-setup aliasing (e.g. *.example.com) 2016-07-05 18:49:18 +00:00
Vincent Petry
563c895a46 Merge pull request #25356 from owncloud/checkupgrade-bypass 
Bypass upgrade page when occ controller is requested
 2016-07-05 12:04:19 +02:00
Thomas Müller
d2d99a91a0 fix swift primary object store test (#25281) 
* Wait for socket to be open

* Fix call on null

* Allow DB access for MountProviderTest

Makes unit tests pass when using object store, since their FS access is
actually oc_filecache DB access. It is currently not possible to mock
or bypass the logic from "SharedMount::verifyMountPoint()" triggered by
this test.
 2016-07-05 08:54:51 +02:00
Jenkins for ownCloud
34eec57262 [tx-robot] updated from transifex 2016-07-05 02:31:32 -04:00
Victor Dubiniuk
e38bbdc9fe Bypass upgrade page when occ controller is requested 2016-07-05 09:20:37 +03:00
Morris Jobke
387ac9e048 Merge pull request #25240 from owncloud/remove-svg 
Remove SVG fallback
 2016-07-04 17:49:00 +02:00
Thomas Pulzer
bca4f42e14 Merge branch 'master' of https://github.com/nextcloud/server 2016-07-04 12:06:52 +02:00
Thomas Pulzer
90b7f74da7 Changed name of default logfile from owncloud.log to nextcloud.log. 2016-07-04 11:50:32 +02:00
Jenkins for ownCloud
9e0d8fcf41 [tx-robot] updated from transifex 2016-07-04 01:56:34 -04:00
Lukas Reschke
dc5fea504b [master] Use paramterized parameter for \OC\SystemTag\SystemTagManager 
$nameSearchPattern was passed in and directly appended to the SQL query. Luckily the code path isn't reached anywhere in Nextcloud or the included apps.
 2016-07-03 16:54:41 +02:00
Jenkins for ownCloud
cea84cf7a8 [tx-robot] updated from transifex 2016-07-03 01:54:52 -04:00
Jenkins for ownCloud
dea7b5be35 [tx-robot] updated from transifex 2016-07-02 01:54:53 -04:00
Hendrik Leppelsack
11be3d6276 remove png references in core 2016-07-01 16:36:37 +02:00
Lukas Reschke
179a355b2c Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-07-01 11:36:35 +02:00
Thomas Müller
b55ab6d22a Various database migration fixes (#25209) 
* String columns with a length higher then 4000 are converted into a CLOB columns automagically - we have to respect this when migrating

* Adding schema migration tests to prevent unnecessary and non-sense migration steps
Fix Oracle autoincrement and unsigned handling

* Fix sqlite integer type for autoincrement

* Use lower case table names - fixes pg

* Fix postgres with default -1 - this only affect pg 9.4 servers - 9.5 seems to work fine
 2016-06-29 14:54:41 +02:00
Jenkins for ownCloud
2b0f053126 [tx-robot] updated from transifex 2016-06-29 05:52:18 -04:00
Morris Jobke
b6397ef73a Merge pull request #236 from nextcloud/master-sync-upstream 
[Master] sync upstream
 2016-06-28 09:02:03 +02:00
Jenkins for ownCloud
894b7d93f6 [tx-robot] updated from transifex 2016-06-28 01:57:10 -04:00
Robin Appelman
2a72eff9ee Fix getting the certificate bundle for dav external storage (#25274) 
* Fix getting the certificate bundle for dav external storages

* Log the original exception in dav external storage
 2016-06-27 22:26:43 +02:00
Christoph Wurst
1710de8afb Login hooks (#25260) 
* fix login hooks

* adjust user session tests

* fix login return value of successful token logins

* trigger preLogin hook earlier; extract method 'loginWithPassword'

* call postLogin hook earlier; add PHPDoc
 2016-06-27 22:16:22 +02:00
Robin Appelman
88ef163276 handle unavailable fed shares while testing for availability (#25277) 
* More explicit http status codes

* handle unavailable fed shares while testing for availability
 2016-06-27 21:34:28 +02:00
Lukas Reschke
e0445856b9 Merge pull request #59 from nextcloud/theming-app 
Theming app
 2016-06-27 21:14:40 +02:00
Lukas Reschke
6670d37658 Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-06-27 18:23:00 +02:00
Bjoern Schiessle
2a990a0db5
verify user password on change 2016-06-27 14:08:11 +02:00
Bjoern Schiessle
d4989c8037
remove old hook, no longer needed 2016-06-27 14:05:27 +02:00
Bjoern Schiessle
630e4b1b46
check password for link shares 2016-06-27 14:05:27 +02:00
Vincent Petry
199c8e304c Merge pull request #25250 from owncloud/linkshare-includedeletewithuploadperms 
Add explicit delete permission to link shares
 2016-06-27 12:14:05 +02:00
Vincent Petry
7269611722 Merge pull request #25258 from owncloud/integritycheck-whennotinstalled 
Make code integrity check work when OC is not installed yet
 2016-06-27 11:58:35 +02:00
Lukas Reschke
89e889c832 Check if server is installed 
AppManager has a dependency on Nc being installed
 2016-06-27 10:26:23 +02:00
Lukas Reschke
27b699bdbc Migrate logic to dynamic controller 
Also adds support for having custom login backgrounds
 2016-06-27 10:26:23 +02:00
Bjoern Schiessle
10f6ca20bc write theme settings to database 2016-06-27 10:26:22 +02:00
Lukas Reschke
7a9d60d87e
Merge remote-tracking branch 'upstream/master' into master-upstream-sync 2016-06-26 12:55:05 +02:00
Christoph Wurst
89198e62e8 check login name when authenticating with client token 2016-06-24 13:57:09 +02:00