mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
41,202 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

7848 Commits

Author SHA1 Message Date
Joas Schilling 66b61eb67d
Use indexed column path_hash to find the parent 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-09 10:56:16 +02:00
Roeland Jago Douma ed3b391e47
Use symfony/translation for L10N plurals 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-07 19:53:36 +02:00
Joas Schilling 43a6ba899e
Use the existing array of OC versions 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-07 12:09:05 +02:00
Joas Schilling 40b47f13df
Add a repair step to drop the account_terms table on oc migration 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-07 12:08:36 +02:00
Roeland Jago Douma 4633717f04
Move pre_shared and post_shared events to EventDispatcher 
* Now listeners for those events get proper share objects.
* Legacy hooks still fired
* Updated tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-03 15:14:29 +02:00
Morris Jobke 585e5c6ea5
Logo claim is not used anymore 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-02 23:08:45 +02:00
Morris Jobke c40352c030 Merge pull request #5816 from nextcloud/fix-oracle 
Fix oracle
 2017-08-02 20:54:58 +02:00
Morris Jobke d7d2d7c803 Merge pull request #5952 from nextcloud/appmanager-isshipped 
Use public methods for OC_App::isShipped
 2017-08-02 16:15:02 +02:00
Lukas Reschke bc9eb59384
Use IUser 
This is broken and will never work as the phan CI step pointed out.

Pro-tip of the day: Check why CI fails before merging 🙈

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-02 13:25:22 +02:00
Joas Schilling 78412fda9c
Add a method to compare empty strings with an expression 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-02 09:50:41 +02:00
Joas Schilling 100fe07f5d
Fix repair step for oracle... 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-02 09:48:16 +02:00
Joas Schilling 2f8756754f
Fix last failures with oracle 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-02 09:48:16 +02:00
Joas Schilling bb58667511
Fix ILIKE regex for oracle 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-02 09:48:16 +02:00
Joas Schilling fc22a2cb07
Fix auth provider 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-02 09:48:16 +02:00
Joas Schilling a5b0308713
Use selectAlias() 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-02 09:48:16 +02:00
Joas Schilling 20f8d1094a
Can not insert auto increment on oracle 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-02 09:48:16 +02:00
Joas Schilling a76d4ef04e
Fix clob comparison 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-02 09:48:15 +02:00
Joas Schilling 8ec6c1f259
Quote aliases as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-02 09:48:15 +02:00
Joas Schilling b29baababd
Oracle does not support PDO::FETCH_KEY_PAIR 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-02 09:48:12 +02:00
Morris Jobke cd02b2205e Use public methods for OC_App::isShipped 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-01 18:57:00 +02:00
Lukas Reschke f93a82b8b0
Remove explicit type hints for Controller 
This is public API and breaks the middlewares of existing apps. Since this also requires maintaining two different code paths for 12 and 13 I'm at the moment voting for reverting this change.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 17:32:03 +02:00
Morris Jobke 84c22fdeef Merge pull request #5907 from nextcloud/add-metadata-to-throttle-call 
Add metadata to \OCP\AppFramework\Http\Response::throttle
 2017-08-01 14:43:47 +02:00
Morris Jobke 6010c4f267 Merge pull request #5877 from nextcloud/typehint_middleware 
Prop argument type for Middleware
 2017-08-01 14:28:16 +02:00
Morris Jobke 050fa63380 Merge pull request #5939 from nextcloud/dont-have-set-uid-as-displayname 
Remove setUidAsDisplayName
 2017-08-01 13:28:27 +02:00
Roeland Jago Douma c8452803ef Merge pull request #5897 from nextcloud/add-share-mail-for-user-share 
Send an email once a file/folder is shared with a user
 2017-08-01 13:27:15 +02:00
Roeland Jago Douma a5feb51a6a
Fix OCS Exception 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:17 +02:00
Roeland Jago Douma ede15f0988
Fix L10N::t 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:17 +02:00
Lukas Reschke 0fa49db770
Some more invalid PHPDocs in legacy classes 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:16 +02:00
Lukas Reschke 66b8208791
Function also accepts ints 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:16 +02:00
Lukas Reschke fd059a25d3
Properly name variable 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:16 +02:00
Lukas Reschke 6fb84ebb71
null is a valid parameter 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:16 +02:00
Lukas Reschke dfd8125aeb
Replace wrong PHPDocs 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:16 +02:00
Lukas Reschke 4166d61ce6
Fix MigrationSchemaChecker and CryptoWrapper 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:16 +02:00
Lukas Reschke b53c4c0db9
Fix template functions 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:16 +02:00
Lukas Reschke d321e9792e
Add |null to PHPDoc 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:15 +02:00
Lukas Reschke 28098a7602
Fix \OCP\Util 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:15 +02:00
Lukas Reschke 5424d6a40d
Add proper PHPDoc 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:15 +02:00
Lukas Reschke b4d4db0e39
Take IUser instead of User 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:15 +02:00
Lukas Reschke e1f52fc901
Stricter phan config fixes 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:13 +02:00
Roeland Jago Douma fa2f122e09 Merge pull request #5890 from nextcloud/fix-403-and-404-redirect 
Fix 403 and 404 redirect
 2017-07-31 22:14:52 +02:00
Roeland Jago Douma 3548603a88
Fix middleware implementations signatures 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-31 16:54:19 +02:00
Lukas Reschke bef4f015ee
Remove setUidAsDisplayName 
This code is a leftover from the old Shibboleth implementation from ownCloud days, nowadays it causes more issues than it does good (such as https://github.com/nextcloud/user_saml/pull/137). Let's remove it for the future thus.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-31 15:52:53 +02:00
Morris Jobke 7b2c08a31a Merge pull request #5905 from nextcloud/ocp-config 
Use IConfig instead of static OCP\Config
 2017-07-31 10:54:40 +02:00
Joas Schilling 50912fb94f
Add brackets around concat statements so comparing the result works as intended 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-28 15:36:26 +02:00
Morris Jobke c43abe43b0 Send an email once a file/folder is shared with a user 
* only if user has set an email address
* only for user shares (no group shares for now)

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-28 08:36:11 +02:00
Lukas Reschke f22ab3e665
Add metadata to \OCP\AppFramework\Http\Response::throttle 
Fixes https://github.com/nextcloud/server/issues/5891

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-27 14:17:45 +02:00
Morris Jobke c27498db71 Use IConfig instead of static OCP\Config 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-27 13:43:18 +02:00
Morris Jobke 0de90cfc67 Fix 403 and 404 redirect 
* Nextcloud is not properly loaded in the standalone version (especially the theming)
* it is already not listed anymore in the Nginx config (see nextcloud/documentation#392)
* the index.php-free version doesn't support this

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-26 16:30:09 +02:00
Lukas Reschke 013d7483bf Add new bundle 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-26 11:49:03 +02:00
Lukas Reschke 3faef644a1 Merge pull request #5864 from nextcloud/legacy_user 
Remove legacy OC_User_Backend and OC_User_Interface
 2017-07-25 17:15:11 +02:00
Lukas Reschke 63676d3b24 Merge pull request #5836 from nextcloud/preview_update 
Empty search no longer works
 2017-07-25 17:08:31 +02:00
Joas Schilling 41fca6c852
"Only variables must be passed by reference" 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-25 12:49:16 +02:00
Joas Schilling 10d7cbb71f
Use order by to avoid problems when chunking finds a same item again... 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-25 12:49:12 +02:00
Joas Schilling 5e04254d40
Install from migrations 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-25 12:47:37 +02:00
Roeland Jago Douma b930f32e89
Remove legacy OC_User_Backend and OC_User_Interface 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-24 20:42:55 +02:00
Roeland Jago Douma a907720817
Move \OC_L10N_String to proper \OC\L10N\L10NString 
* Proper namespacing
* Fixed phpdocs

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-24 20:17:20 +02:00
Morris Jobke 5dc480a38c Merge pull request #5857 from nextcloud/database-exception-cleanup 
Remove unneeded parameter in DatabaseException
 2017-07-24 16:14:53 +02:00
Morris Jobke e785b849c7 Merge pull request #5835 from nextcloud/cleanup_testing_app 
Cleanup testing app
 2017-07-24 15:03:15 +02:00
Morris Jobke c43d479372 Merge pull request #5855 from nextcloud/cleanup-legacy-user-class 
Cleanup legacy user class from unused methods
 2017-07-24 14:39:18 +02:00
Morris Jobke 184f25c0d6 Merge pull request #5854 from nextcloud/improve-personal-page-code 
Cleanup code of personal page to use public interfaces
 2017-07-24 14:38:05 +02:00
Morris Jobke 5bc0edbd29 Merge pull request #5844 from nextcloud/phpstorm_inspect2 
More phpstorm inspection fixes
 2017-07-24 13:54:30 +02:00
Morris Jobke b8ed028870 Remove unneeded parameter in DatabaseException 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-24 13:44:12 +02:00
Roeland Jago Douma 25c36be901
Proper DI for ILockingProvider 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-24 13:44:09 +02:00
Morris Jobke 188b87e03b Cleanup legacy user class from unused methods 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-24 12:17:53 +02:00
Morris Jobke 7790017a14 Cleanup code of personal page to use public interfaces 
* public interfaces instead of static code calls
* drop static private namespace methods

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-24 12:11:24 +02:00
Roeland Jago Douma 5f227bd93b
More phpstorm inspection fixes 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-24 11:39:29 +02:00
Morris Jobke ae13d011d1 Remove unneeded styles 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-24 11:09:14 +02:00
Roeland Jago Douma 8bee9cf8d3
Empty search no longer works 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-24 10:56:21 +02:00
Lukas Reschke bb6fe6afba
Adjust to height=120 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-24 10:18:16 +02:00
Lukas Reschke ba1e16ea2e Revert "Set max-width of image to 100px in Outlook as well" 2017-07-24 10:14:47 +02:00
Roeland Jago Douma 989614f9d5 Merge pull request #5783 from nextcloud/outlook-max-width 
Set max-width of image to 100px in Outlook as well
 2017-07-24 07:15:41 +02:00
Morris Jobke a98f57ebd0 Set max-width of image to 100px in Outlook as well 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-23 23:15:21 +02:00
Marin Treselj 586eb3ed0a
Redesign jQuery UI datepicker 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-07-23 14:06:04 +02:00
Morris Jobke 9a151056d0 Merge pull request #5812 from MrJeos/master 
Fix for mb strlen
 2017-07-22 11:04:24 +02:00
Morris Jobke 655c26224b Merge pull request #5596 from nextcloud/mount-rename 
Fix renaming of non-renamble mounts
 2017-07-21 23:10:50 +02:00
Morris Jobke 13dd0b0ebe Merge pull request #5785 from nextcloud/path-repair-steps-storage 
Also repair storage id's when repairing invalid entries
 2017-07-21 16:58:31 +02:00
Lukas Reschke 4c637a428e Merge pull request #5821 from nextcloud/fix-theming-on-untrusted-domain 
Fix error message on untrusted domain error page
 2017-07-21 14:50:31 +02:00
Robin Appelman 06a4d6b5b9 Also repair storage id's when repairing invalid entries 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-21 14:06:13 +02:00
Roeland Jago Douma a33b6cdd21 Merge pull request #5820 from MarcelWaldvogel/minor-documentation-fixes 
Minor documentation fixes
 2017-07-21 13:32:10 +02:00
Morris Jobke 1a4a68dbc6 Fix error message on untrusted domain error page 
Fixes #5347

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-21 11:46:37 +02:00
Marcel Waldvogel 4e42f059ed Minor typos 
Signed-off-by: Marcel Waldvogel <marcel.waldvogel@uni-konstanz.de>
 2017-07-21 09:50:44 +02:00
Roeland Jago Douma e5bedd8947 Merge pull request #5818 from nextcloud/ocs_privatedata 
PrivateData to app
 2017-07-21 09:47:49 +02:00
Morris Jobke b1954bed97 Merge pull request #5797 from paulijar/share20-postUnshareFromSelf 
Dispatch event postUnshareFromSelf when the recipient of a share unshares it
 2017-07-21 09:32:49 +02:00
Roeland Jago Douma 7753b93aa6
PrivateData to app 
* PrivateData is an app now: https://github.com/nextcloud/privatedata
* No need to load the OCS routes.php (as there is none!)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-21 08:51:14 +02:00
Lukas Reschke 3d2600b039
Add Phan plugin to check for SQL injections 
This adds a phan plugin which checks for SQL injections on code using our QueryBuilder, while it isn't perfect it should already catch most potential issues.

As always, static analysis will sometimes have false positives and this is also here the case. So in some cases the analyzer just doesn't know if something is potential user input or not, thus I had to add some `@suppress SqlInjectionChecker` in front of those potential injections.

The Phan plugin hasn't the most awesome code but it works and I also added a file with test cases.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-20 22:48:13 +02:00
Artem Kochnev 5abeb9519e Fix for mb strlen 
Error with moving files with long names in UTF-8
 2017-07-20 17:29:50 +03:00
Pauli Järvinen 7c4a15f215 Emit hook postUnshareFromSelf when the recipient of a share unshares it 
- This kind of hook signal used to be emitted in the old Share library but it was missing from Share 2.0

Signed-off-by: Pauli Järvinen <pauli.jarvinen@gmail.com>
 2017-07-20 14:45:46 +03:00
Joas Schilling 3ff3c338c9 Merge pull request #5734 from nextcloud/only-readable-chars-in-share-tokens 
Only use readable chars in Share Tokens
 2017-07-19 16:40:18 +02:00
Morris Jobke 49c622fcba Merge pull request #5719 from nextcloud/improve-jscombiner 
Properly handle if the deps file if for some reason empty
 2017-07-19 16:31:29 +02:00
Lukas Reschke 591aaa4154
Add workaround for https://github.com/etsy/phan/issues/1033 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-19 11:08:43 +02:00
Lukas Reschke 030d85bc9c
Remove unused functions 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-19 10:28:12 +02:00
Lukas Reschke d8ec399454
Run phan over code base 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-19 10:28:11 +02:00
Morris Jobke 2ebafb06fd Properly handle if the deps file if for some reason empty 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-19 00:10:46 +02:00
Morris Jobke 5accbf5568 Merge pull request #5744 from 1manprojects/patch-1 
Removed cast to integer in getSize
 2017-07-18 23:43:09 +02:00
Roeland Jago Douma f0f1e2c501 Merge pull request #5770 from nextcloud/path-repair-steps-loop 
Fix invalid path repair step not getting all invalid entries
 2017-07-18 22:22:51 +02:00
Joas Schilling e71b9fb3d6 Merge pull request #5709 from nextcloud/null-user-exist 
null users dont exist
 2017-07-18 18:24:42 +02:00
Joas Schilling 984933e586
Only use readable chars in Share Tokens 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-18 15:44:34 +02:00
Robin Appelman 8b58b4c2a7
Fix invalid path repair step not getting all invalid entries 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-18 14:01:49 +02:00
1 Man Projects 3e5d590f1e changed direct cast to integer to numerical value 2017-07-17 15:19:04 +02:00
Robin Appelman 0e107bc63c
non movable mounts can not be moved 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-17 15:09:08 +02:00
Pauli Järvinen 8dce97a3e1 Fix emitting of legacy hook post_unshare 
- When a file was unshared, the legacy hook pre_unshare fired twice and the hook post_unshare did not fire at all. This was obviously a copy-paste error.

Signed-off-by: Pauli Järvinen <pauli.jarvinen@gmail.com>
 2017-07-16 13:13:15 +03:00
1 Man Projects 56c0384044 Removed cast to integer in getSize 
Fixes - Wrong or no sizes of files/folders #5031
 2017-07-15 20:18:45 +02:00
Lukas Reschke a79447c6fd Merge pull request #5699 from nextcloud/bruteforce_capability 
Add bruteforce capabilities
 2017-07-14 15:20:31 +02:00
Morris Jobke 1f1504e071 Merge pull request #5708 from nextcloud/nested-permissions-mask 
Fix scan permissions with nested permissions masks
 2017-07-13 23:27:01 +02:00
Morris Jobke 01466ab840 Merge pull request #5715 from nextcloud/master-5655 
Fixed repair step
 2017-07-13 19:30:05 +02:00
Robin Appelman 350e036c56 chunk getting invalid paths and reuse queries 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-13 16:37:38 +02:00
Robin Appelman 4a727a578c use a generator instead of fetching all rows at once 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-13 16:37:34 +02:00
Robin Appelman 5185a3c0c9
null users dont exist 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-13 15:53:14 +02:00
Robin Appelman 03f27b4c2c
Fix scan permissions with nested permissions masks 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-13 14:29:04 +02:00
Joas Schilling e335121d5e Merge pull request #5070 from nextcloud/theming-vs-themes 
Prefer custom theme over the theming app
 2017-07-13 13:41:31 +02:00
Roeland Jago Douma f71457782b Merge pull request #5695 from nextcloud/dont-error-when-the-table-doesnt-exist 
Don't throw an error when the table doesn't exist
 2017-07-13 13:28:52 +02:00
Roeland Jago Douma 6a1f2ac076
Add bruteforce capabilities 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-13 11:23:08 +02:00
Roeland Jago Douma 04f2090698
Write cert bundle to tmp file first 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-12 19:24:20 +02:00
Joas Schilling c6b7204fcb
Don't throw an error when the table doesn't exist 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-12 15:35:24 +02:00
Roeland Jago Douma 86a496d94a Merge pull request #5567 from nextcloud/public-capabilities 
Public capabilities API
 2017-07-12 13:04:54 +02:00
Roeland Jago Douma 08d3cb9107 Merge pull request #5685 from nextcloud/jail-propagator 
Fix propagating changes within jail wrapper
 2017-07-12 12:14:51 +02:00
Julius Härtl ce5ad7e7f4
Prefer custom theme over theming app 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-07-12 11:42:15 +02:00
Robin Appelman dfe662ad42
Fix propagating changes within jail wrapper 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-11 17:55:04 +02:00
Maxence Lange 6e7be6acfd upstream 
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
 2017-07-11 13:21:24 +02:00
Lukas Reschke a1c14a747c Merge pull request #5645 from nextcloud/try-to-prevent-spam-collecting-of-emails 
Don't show mail domain and from in config report
 2017-07-07 18:38:50 +02:00
Morris Jobke e76b867c2c Merge pull request #5628 from nextcloud/only-create-the-migration-dir-when-necessary 
Only create the migration directory when necessary
 2017-07-07 14:10:32 +02:00
Joas Schilling 79d7c26b8a
Register autoloading before running migrations 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-07 12:01:11 +02:00
Morris Jobke c2ba5e2884 Merge pull request #5529 from michaelletzgus/optimize_js_order 
Optimize performance / Load CSS and JS in parallel on firefox
 2017-07-07 11:16:31 +02:00
Morris Jobke b4deba2078 Merge pull request #5483 from nextcloud/issue-5075-png-files-for-activity-emails 
Use PNGs for icons in activity emails
 2017-07-07 11:05:00 +02:00
Morris Jobke 172b4bb6d2 Merge pull request #5615 from nextcloud/issue-5286-fix-navigation-entries-for-group-restricted-apps 
Don't load navigation entries of restricted apps
 2017-07-07 10:46:45 +02:00
Joas Schilling e6e79c34b1
Don't show mail domain and from in config report 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-07 09:53:55 +02:00
Morris Jobke b4a221f9be Merge pull request #5424 from nextcloud/moveFromCache-from-shared 
fix moving folders out of a cache jail
 2017-07-06 18:31:18 +02:00
Bjoern Schiessle da51ec38f4
only collect detailed access list if it is really needed 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-06 11:33:08 +02:00
Joas Schilling 0f275b1550
Only create the migration directory when necessary 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-06 09:58:39 +02:00
Morris Jobke 60398b919b Merge pull request #5231 from nextcloud/migrations 
Migrations
 2017-07-05 17:32:40 +02:00
Morris Jobke 7d58bb7db5 Merge pull request #5342 from nextcloud/userlist-used-space 
show used space in user list
 2017-07-05 15:15:25 +02:00
Joas Schilling bbfc044ac5
Add migration for personal settings stuff 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 14:58:20 +02:00
Joas Schilling 6abbe4e962
Don't load navigation entries of restricted apps 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:52:51 +02:00
Joas Schilling 0bff4f3f07 Fix the installer tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:02:16 +02:00
Joas Schilling 4e5cd1efea Fix tests of CodeChecker and MigrationService 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:02:16 +02:00
Joas Schilling 7a3d83d630 Register autoloading before running migrations 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:02:16 +02:00
Joas Schilling 3b267b165f Check the migration files for table, column and index length errors 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:02:16 +02:00
Joas Schilling fe6e8c2710 Fix dropping tables and handle the prefix automatically 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:02:16 +02:00
Joas Schilling 5d9d1b1cb5 Allow to check the schema in pre and post as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:01:19 +02:00
Joas Schilling 817783e4c7 Add a version to migrations, so parallel legacy branches can also have migrations 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:01:19 +02:00
Joas Schilling df6b839b23 Add author and copyright 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:01:19 +02:00
Joas Schilling 2875b79c61 Fix code issues 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:01:19 +02:00
Joas Schilling 3969a6b1eb Use autoloading instead of require_once from a different dir 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:01:19 +02:00
Joas Schilling 194ef1a171 Adjust the code to use our interface and abstract 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:01:19 +02:00
Joas Schilling 183b1dbde3 Use migrations when there is no database.xml 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:01:19 +02:00
Joas Schilling 15eec7b83c Start migrations 
Fixme:
- Install and update of apps
- No revert on live systems (debug only)
- Service adjustment to our interface
- Loading via autoloader

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:01:19 +02:00
blizzz d8af9d4c9b Merge pull request #5557 from nextcloud/dont-log-passwords-on-dav-exceptions-either 
Don't log passwords on dav exceptions
 2017-07-05 11:58:32 +02:00
Joas Schilling da6dd4898a Move sync client to the firstrunwizard app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-04 10:54:13 +02:00
Knut Ahlers 92d2fb8771
Allow group backend to declare users as admins 
Signed-off-by: Knut Ahlers <knut@ahlers.me>
 2017-06-30 14:28:16 +02:00
Julius Härtl b82164e602
Simplify if condition for public capabilities 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-06-30 14:18:16 +02:00
Julius Härtl 51a0741005
Add public capabilities API 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-06-30 11:08:04 +02:00
blizzz 72d3bfcf56 Merge pull request #4890 from nextcloud/unify-settings 
Unify settings
 2017-06-29 20:02:09 +02:00
Joas Schilling b27819785e
Don't log passwords on dav exceptions 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-29 17:20:10 +02:00
Robin Appelman 601362e164
adjust to moved repair step 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-06-29 14:45:08 +02:00
Roeland Jago Douma 4a9277d8da Merge pull request #5460 from nextcloud/objectstore-error-logging 
improved logging of objectore errors
 2017-06-29 11:22:17 +02:00
Arthur Schiwon 005ef115fb
move admin templates to the right place 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-27 12:25:37 +02:00
Michael Letzgus c77fe1ab86 Optimize performance / Load CSS and JS in parallel on firefox 
Move the inline <script> after the external <script> because the internal JS between CSS <link> and external JS makes firefox loading CSS and JS not in parallel.
The internal js is now parsed last but will still be executed first since everything else is deferred js.

Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
 2017-06-24 11:35:40 +02:00
Morris Jobke 86efe9569a Merge pull request #5518 from nextcloud/deprecate-old-log 
Deprecate static writeLog() method
 2017-06-23 16:03:13 -05:00
Morris Jobke d6adc0eba1 Deprecate static writeLog() method 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-06-23 11:21:46 -05:00
Arthur Schiwon d881a3c37b
adapt to force language changes 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 13:15:08 +02:00
Arthur Schiwon 7817811d13
do not offer additional settings when there is no content 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:38:05 +02:00
Arthur Schiwon 07cf046216
take over changes from #5166 and follow #5267 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:37:42 +02:00
Arthur Schiwon d7a2290ce1
take over changes from #5084 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:37:42 +02:00
Robin Appelman 6e314ddabe
fix getting sections 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-06-23 12:37:42 +02:00
Arthur Schiwon 28fd18de43
add missing pieces to Settings Manager and fix and extend its unit tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:37:41 +02:00
Arthur Schiwon 3dca4de8b3
add Additional (+ Fallback) section for Personal settings 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:38 +02:00
Arthur Schiwon 7f48b6f14f
Adopt DB and Manager to personal settings structure 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:38 +02:00
Arthur Schiwon d56e86cfde
sync clients have their own place 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:38 +02:00
Arthur Schiwon 8c076e0bda
take over app passwords 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:38 +02:00
Arthur Schiwon 489ac4391b
convert Sessions section 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:38 +02:00
Arthur Schiwon 8bd887b2c6
add storage info, fix URL generation 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:38 +02:00
Arthur Schiwon 9e924d74c9
fix displaying groups in personal info 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:38 +02:00
Arthur Schiwon 045f652ef2
completing PersonalInfo 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:37 +02:00
Arthur Schiwon 039ee7e3aa
brief, incomplete personal info settings implementation 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:37 +02:00
Arthur Schiwon b68fdb473d
Extend interfaces 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:37 +02:00
Arthur Schiwon 560ab2e911
one settings link, common template, styling 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:37 +02:00
Morris Jobke 846e62c225 Run repair step only once 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-06-22 15:43:59 -05:00
Morris Jobke d611d9c126 Merge pull request #5498 from nextcloud/allow-to-force-a-language 
Allow to force a language and set it via the ocs api
 2017-06-22 12:47:00 -05:00
blizzz 65b4e2a1db Merge pull request #5491 from nextcloud/issue-5457-create-users-in-non-default-backends 
Create users in non default backends first
 2017-06-22 13:01:36 +02:00
Robin Appelman 0a12b5d38d improved logging of objectore errors 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-06-21 17:33:26 -05:00
Morris Jobke 18824d476e Merge pull request #5474 from nextcloud/wording-4925 
Improve wording of various error messages
 2017-06-21 17:28:54 -05:00
Morris Jobke 6a1c4990ab Merge pull request #5252 from derkostka/master 
Use realpath to obtain the webroot.
 2017-06-21 17:25:12 -05:00
Jan-Christoph Borchardt fd63577089 Improve wording of various error messages 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-06-21 14:51:59 -05:00
Robin Appelman d3c20eefca
Add repair step for invalid paths 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-06-21 15:52:27 +02:00
Joas Schilling 7816c54625
Allow to force a language and set it via the ocs api 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-21 11:34:52 +02:00
Sebastian Kostka c7ce42e45b Squashed the webroot fix 
Signed-off-by: Sebastian Kostka <sebastian.kostka@gmail.com>
 2017-06-20 22:15:20 +02:00
Joas Schilling b726204f91
Create users in non default backends first 
Most of the time, when people have multiple backends or add a
custom backend, they want to create the users there and not in
the default backend. But since that is registered first, users
were always created there.

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-20 19:59:41 +02:00
Joas Schilling 8b0546e3f9
Add a flag to allow checking if SVGs are okay 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-20 12:40:45 +02:00
Morris Jobke 381850bd07 Merge pull request #5429 from nextcloud/cache-baseurl 
Use base url for cache prefix and SCSS caching
 2017-06-18 22:21:40 -05:00
Jan-Philipp Litza 0b066d9297 Fix 500 Internal Server Error on writing 
In some not yet completely determined configurations, the following error could occur while writing a file:

Error: Call to a member function getUsers() on null
    /var/www/nextcloud/lib/private/Share20/Manager.php - line 1277: OC\Share20\DefaultShareProvider->getAccessList(Array, true)
    /var/www/nextcloud/lib/private/Share20/ShareHelper.php - line 51: OC\Share20\Manager->getAccessList(Object(OC\Files\Node\Folder), true, true)
    /var/www/nextcloud/apps/activity/lib/FilesHooks.php - line 616: OC\Share20\ShareHelper->getPathsForAccessList(Object(OC\Files\Node\File))
    /var/www/nextcloud/apps/activity/lib/FilesHooks.php - line 196: OCA\Activity\FilesHooks->getUserPathsFromPath('/path/to/file', 'user')
    /var/www/nextcloud/apps/activity/lib/FilesHooks.php - line 157: OCA\Activity\FilesHooks->addNotificationsForFileAction('/path/to/file', 'file_changed', 'changed_self', 'changed_by')
    /var/www/nextcloud/apps/activity/lib/FilesHooksStatic.php - line 55: OCA\Activity\FilesHooks->fileUpdate('/path/to/file')
    /var/www/nextcloud/lib/private/legacy/hook.php - line 106: OCA\Activity\FilesHooksStatic fileUpdate(Array)
    /var/www/nextcloud/lib/private/Files/View.php - line 1245: OC_Hook emit('OC_Filesystem', 'post_update', Array)
    /var/www/nextcloud/lib/private/Files/View.php - line 1173: OC\Files\View->runHooks(Array, '/path/to/file', true)
    /var/www/nextcloud/lib/private/Files/View.php - line 679: OC\Files\View->basicOperation('file_put_conten...', '/path/to/file', Array, '<?xml version="...')
    /var/www/nextcloud/lib/private/Files/Node/File.php - line 64: OC\Files\View->file_put_contents('/path/to/file', '<?xml version="...')
    [...]

Signed-off-by: Jan-Philipp Litza <janphilipp@litza.de>
 2017-06-16 11:38:22 +02:00
Julius Härtl 517dfdda0d
Fix theming app to also use the prefix 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-06-16 10:51:37 +02:00
Julius Härtl f039ba7480
Add tests and inject IRequest 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-06-16 10:51:31 +02:00
Morris Jobke 5bf447649d Merge pull request #5421 from nextcloud/5190-master 
[master] Treat PHP Errors on User session regenerate
 2017-06-15 10:11:56 -05:00
Robin Appelman 2e8e6f95b9
show used space in user list 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-06-15 14:06:54 +02:00
Robin Appelman fa81759917
fix moving folders out of a cache jail 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-06-15 13:59:06 +02:00
blizzz 8ccc2e2758 Merge pull request #5396 from nextcloud/gpx-mimetype 
add gpx mimetype
 2017-06-15 13:23:32 +02:00
Julius Härtl 0999ed1778
Do not open version file again 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-06-15 12:46:51 +02:00
Julius Härtl 0789adaf95
Make cache and scss caching depend on the baseUrl 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-06-15 12:46:24 +02:00
Arthur Schiwon d1a8269de3
Forward port of #5190 to master 
Treat PHP Errors on User session regenerate

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

remove unnecessary lines…

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

change PHP errors to ErrorException in the session (PHP >=7)

Otherwise it might be that authentication apps are being disabled on
during operation while in fact the session handler has hiccup.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-15 11:20:49 +02:00
Morris Jobke 8eb955d5c6 Merge pull request #4993 from michaelletzgus/emit_css-tags 
Emit css tags
 2017-06-14 11:29:25 -05:00
Arthur Schiwon ed49d9b9ed
a parameter too much 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-14 14:41:30 +02:00
Arthur Schiwon c1d9565131
added kml, kmz, tcx types as well while at it 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-14 11:02:05 +02:00
Arthur Schiwon addcda9325
add geospatial mime types repair step 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-14 10:48:56 +02:00
Lukas Reschke b76e43e0a3 Merge pull request #5361 from nextcloud/exclude-files-external-dir-from-encryption 
don't try to encrypt/decrypt the certificate bundle
 2017-06-14 09:50:45 +02:00
Morris Jobke 0b92700b52 Merge pull request #5072 from mjmunger/master 
Fixed a crash caused by Local::copyFromStorage() not conforming to Co…
 2017-06-13 17:51:16 -05:00
Joas Schilling 0f8c1b13a3
Fix unknown share token 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-13 18:44:50 +02:00
Lukas Reschke c46422b780 Merge pull request #5343 from nextcloud/share-filter-missing-groups 
filter missing groups in share provider
 2017-06-13 10:53:26 +02:00
Bjoern Schiessle 86eb23b91e
don't try to encrypt/decrypt the certificate bundle 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-06-13 09:50:45 +02:00
Morris Jobke 6a06df824e Merge pull request #5027 from nextcloud/require-nextcloud-version-as-per-docs 
Version and dependency are now required
 2017-06-12 22:33:16 -05:00
Morris Jobke 69b6504285 Merge pull request #5167 from nextcloud/rakekniven-patch-2 
l10n improvements from transifex
 2017-06-12 16:18:54 -05:00
Robin Appelman f707a40f19
filter missing groups in share provider 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-06-12 15:46:19 +02:00
Lukas Reschke ae6e1fe1df
Theme image for favicon-fb.png 
Fixes https://github.com/nextcloud/server/issues/5322

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-06-09 21:12:37 +02:00
Joas Schilling 7d806bdfbd Revert "Always enable Zip64 extension for zipstreamer" 2017-06-09 10:21:26 +02:00
Joas Schilling 3af8abb098
Allow to overwrite the email template again 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-06 14:23:03 +02:00
blizzz 2e2d406bf5 Merge pull request #5213 from nextcloud/fix-change-hook 
Trigger changeUser hook only on real changes
 2017-06-02 13:14:33 +02:00
blizzz 45305c762d Merge pull request #5209 from nextcloud/fix-install-mysql-mb4 
fix install on mb4 enabled mariadb/mysql
 2017-06-02 13:10:28 +02:00
Björn Schießle 74fccf20c8 Merge pull request #5084 from nextcloud/useful-gs-settings 
add new config switched for the global scale architecture
 2017-06-02 10:58:43 +02:00
Arthur Schiwon 18a8f3654b
fix install on mb4 enabled mariadb/mysql 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-01 13:44:18 +02:00
Arthur Schiwon 999455c1aa
emit changeUser only if there really was a change (quota, displayname) 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-01 11:34:17 +02:00
rakekniven f2d999aa70 Update setupchecks.js 
Fixed typo and removed doclink symbol.
Reported at transifex

Update util.php

Another l10n improvement from transifex.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-31 13:41:45 +02:00
Joas Schilling 1d227d83c0 Merge pull request #5116 from McNetic/zipstreamer 
Always enable Zip64 extension for zipstreamer
 2017-05-30 12:37:01 +02:00
Bjoern Schiessle 7c2d473d76
add new config switched for the global scale architecture 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-05-29 18:19:28 +02:00
Nicolai Ehemann 619afd499e Always enable Zip64 extension for zipstreamer 
Signed-off-by: Nicolai Ehemann <en@enlightened.de>
 2017-05-25 22:30:03 +02:00
Michael Letzgus 0d320fba4b Streamline templates, more DRY 
Use Unified function to emit <link> tags for css loading, obey "Don't Repeat Yourself" ;-)

(Next step might by to combine this with the emit <script> function (even more DRY?) AND move all this to a better place?)

Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
 2017-05-25 11:13:43 +02:00
Joas Schilling 3f29c55914
Register the autoloading earlier so we can load the background jobs 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-24 12:58:10 +02:00
Michael Munger b8f2418248 Fixed a crash caused by Local::copyFromStorage() not conforming to Common::copyFromStorage. Issue# 5071 2017-05-23 10:29:30 -04:00
Joas Schilling eebd2811dc
Version and dependency are now required 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-22 09:54:44 +02:00
Roeland Jago Douma 32f5c028a0
Set SCSS dependencies to memcache on compile 
Else when an upgrade happens we will recompile all the SCSS files all
the time (until the cache expires).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-21 22:10:00 +02:00
Morris Jobke 0dae4946cf Merge pull request #4854 from michaelletzgus/deferred-script-loading-v2 
Make page loading faster, deferred script loading, now switchable:
 2017-05-20 16:53:30 -05:00
Michael Letzgus fb9f13d4c1 Make page loading faster by deferred script loading: 
* Create generalized function for emmitting <script defer src=""> tags to templates
* Remove type attribute from inline_js
* Add defer attribute to external <script> tags

Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
 2017-05-20 13:44:04 +02:00
Morris Jobke fe8c67ad23 Merge pull request #4981 from nextcloud/fix-missing-argument-2-getAppContainer-master 
Fix missing argument 2 for Settings classes
 2017-05-19 17:05:49 -05:00
Joas Schilling a411adee6c
Fix missing argument 2 for Settings classes 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-19 22:32:50 +02:00
Roeland Jago Douma 7eb8b3cec1 Merge pull request #4956 from nextcloud/endless-loop-on-invalid-asset 
Stop infinit loop on invalid settings css/js file
 2017-05-19 16:51:49 +02:00
Miha Frangez 0d6493a0c7 Fixed typo 2017-05-19 15:58:13 +02:00
Joas Schilling bcddca9a64 Merge pull request #4905 from nextcloud/auto-di-for-apps-without-app.php 
Allow automatic DI for apps that don't register the container in app.php
 2017-05-19 13:48:01 +02:00
Joas Schilling 4792867357
Stop infinit loop on invalid settings css/js file 
Don't try to find dirname of false...

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-19 11:41:08 +02:00
Lukas Reschke 7976927628 Merge pull request #4894 from nextcloud/generic-security-activities 
Change 2FA activities to more generic security activities
 2017-05-19 00:50:44 +02:00
Lukas Reschke 8c624bdef9 Merge pull request #4792 from nextcloud/fix-storage-wrappers-on-scanner 
Make sure we use the passed-in storage when there is one
 2017-05-19 00:49:58 +02:00
Lukas Reschke 0eb4970ec8 Merge pull request #4704 from nextcloud/add-oauth-code-flow-support 
Add oauth code flow support
 2017-05-18 23:30:44 +02:00
Christoph Wurst 0928b5f621
Change 2FA activities to more generic security activities 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-05-18 22:10:57 +02:00
Lukas Reschke 77827ebf11
Rename table back to lowercase 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-18 20:49:09 +02:00
Bjoern Schiessle 1eb7f4956b
delete auth token when client gets deleted 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-05-18 20:49:07 +02:00
Lukas Reschke 5f71805c35
Add basic implementation for OAuth 2.0 Authorization Code Flow 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-18 20:49:03 +02:00
Robin Appelman 1f1e1b0d00
use unmasked permissions during scanning 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-05-18 16:38:54 +02:00
Joas Schilling 682a57d50e
Copy avatars to the new location 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-18 10:49:04 +02:00
Joas Schilling c90d56748f
We want to see 1 in 100 messages, not all but the 100th 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-18 10:49:04 +02:00
Joas Schilling e1b5d20b3b
Fix updating from some 11 versions when people didn't update 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-18 10:49:04 +02:00
Joas Schilling dd6c9cb03d
Allow migrating from ownCloud 10.0.0 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-18 10:49:04 +02:00
Joas Schilling 2259140e3b
Add some more casting 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-18 10:49:04 +02:00
Joas Schilling 0e325756c3
Avoid problems for some DBs by removing the table completly 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-18 10:49:03 +02:00