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

3609 commits

Author SHA1 Message Date
Morris Jobke
96f8f209b9 Merge pull request #1449 from nextcloud/comments-user-mention 
Notifications for simple @-mentioning in comments
 2016-10-17 09:30:47 +02:00
Lukas Reschke
62e19dfa80 Merge pull request #1441 from nextcloud/getby-id-less-queries 
optimize Folder::getById to use less queries
 2016-10-14 15:18:23 +02:00
Christoph Wurst
53eb0f7f42 Merge pull request #1037 from nextcloud/no-double-token-update 
dont update the auth token twice
 2016-10-14 14:53:17 +02:00
Arthur Schiwon
1bcd2ca8e3
emit pre-update event for comments 
* notifications can be cleaned up, no polluted DB
* updating comments will re-notify users or remove notifications, depending on the message

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-12 18:06:22 +02:00
Robin Appelman
0d842e0550
optimize Folder::getById to use less queries 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-10-12 16:12:28 +02:00
Roeland Jago Douma
7eba1d806b
Add tests for commands in info.xml 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-11 19:48:31 +02:00
Thomas Müller
c5ca71ee82
[9.2] Register commands in info.xml (#26248) 
* Use DI to load console commands from the apps - class name to be defined in the info.xml

* Load commands from info.xml

* Fix unit test

* Allow Di magic for IMountManager

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-11 19:48:26 +02:00
Thomas Müller
b1641cc113
Fix QueryBuilderTests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-11 12:30:46 +02:00
Robin Appelman
90db361827
Add test to ensure token times are updated 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-10-11 11:06:24 +02:00
Robin Appelman
25ed6714c7
dont update the auth token twice 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-10-11 11:05:25 +02:00
Roeland Jago Douma
3c173378e8
Fix typehint 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-10 22:13:51 +02:00
Thomas Müller
2806a4bca7
Cleanup test case 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-10 22:13:47 +02:00
Christoph Wurst
a0cb809342 Merge pull request #1660 from nextcloud/add-notification-icon-to-api 
Add an icon to the notification API
 2016-10-10 09:32:34 +02:00
Morris Jobke
195fc041da Merge pull request #1663 from nextcloud/dont-reparse-info-xml 
Dont reparse info xml + cache AppInfo XML
 2016-10-10 09:22:43 +02:00
Christoph Wurst
ce9e33bd3c Merge pull request #1656 from nextcloud/appinfo-check-class-existance 
Make sure all the jobs, command, provides and migrations are valid
 2016-10-10 09:04:27 +02:00
Lukas Reschke
0245dd7221
Simplify isSubDirectory check 
Shaves off another 9ms per request as can be seen at https://blackfire.io/profiles/compare/dd54cef3-e58d-4a22-b8f4-c7c4b70697be/graph

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-07 21:56:43 +02:00
Lukas Reschke
0c2b17c80f
Cache AppInfo in Memory Cache if configured 
This saves around 20ms on a bare-bone instance, on bigger ones more (depending on the number of installed apps).

See https://blackfire.io/profiles/compare/fc326ad3-100d-49b8-8ea9-8343240f53f3/graph

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-07 21:29:23 +02:00
Thomas Müller
67d3574bdf
Don't parse info.xml but reuse already cached app infos - fixes #25603 (#25968) 
* Don't parse info.xml but reuse already cached app infos - fixes #25603

* Use === in InfoParser. Fixes test

* InfoParser should not depend on UrlGenerator - fixes issue with session being closed too early
 2016-10-07 20:58:22 +02:00
Arthur Schiwon
e1073cf442
Notificacations for simple @-mentioning in comments 
(WIP) notify user when mentioned in comments

Fix doc, and create absolute URL for as notification link.

PSR-4 compatibility changes

also move notification creation to comments app

Do not notify yourself

unit test for controller and application

smaller fixes

- translatable app name
- remove doubles in mention array
- micro perf optimization
- display name: special label for deleted users, keep user id for users that could not be fetched from userManager

Comment Notification-Listener Unit Test

fix email adresses

remove notification when triggering comment was deleted

add and adjust tests

add missing @license tags

simplify NotificationsController registration

appinfo simplification, php docs

make string easier to translate

adjust test

replace dispatcher-based listeners with a registration method and interface

safer to not pass optional data parameter to setSubject for marking as processed. ID and mention suffices

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

update comment

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-07 17:11:19 +02:00
Joas Schilling
c77933ca22
Add an icon to the notification API 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-07 17:00:24 +02:00
Joas Schilling
c02a50a432
Make sure all the jobs, command, provides and migrations are valid 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-07 14:25:18 +02:00
Morris Jobke
c4b2639585 Merge pull request #1514 from nextcloud/integration-tests-orphaned-shares 
Integration tests orphaned shares + Prefilter inaccessible shares
 2016-10-06 22:58:56 +02:00
Joas Schilling
a0b34dfd2f Merge pull request #1629 from nextcloud/cleanup-settings-application 
Cleanup settings Application class
 2016-10-06 16:57:39 +02:00
Joas Schilling
ed30b1f645
Use our base class everywhere 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-06 14:11:04 +02:00
Joas Schilling
b130a0ee09
phpunit min version is 4.8 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-06 14:07:32 +02:00
Joas Schilling
ccc29a3da2
Fix tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-06 14:05:52 +02:00
Vincent Petry
626daabb56
Prefilter inaccessible shares in DefaultShareProvider::getSharedWith() 
The DefaultShareProvider now does a DB-level check to find out whether
file_source is accessible at all (deleted file) or whether it's in the
trashbin of a home storage.

One small corner case where the home storage id is in md5 form cannot
be covered properly with this approach.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-06 13:57:58 +02:00
Morris Jobke
c84dc6aa1c Properly catch password policy hint for personal page password changes 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-10-06 10:55:33 +02:00
Lukas Reschke
ea9b1cc340 Merge pull request #1306 from nextcloud/simplefs 
Introducing AppData
 2016-10-06 09:25:15 +02:00
Joas Schilling
4db5b2a2c6
Use magic DI as much as possible 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-05 16:36:49 +02:00
Joas Schilling
3395977d8f
Add a test for all the controllers and the middleware 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-05 15:25:41 +02:00
Lukas Reschke
815616fb2c Merge pull request #1624 from nextcloud/exclude_coverage_dirs 
Exclude tests and composer dir from coverage
 2016-10-05 14:49:13 +02:00
Lukas Reschke
a1f5364d7f
Generate coverage for quick DB tests 
This adds the "QUICKDB" group which excludes some tests that abuse unit tests as integration tests as displayed in https://github.com/nextcloud/server/issues/1626

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-05 13:55:44 +02:00
Roeland Jago Douma
408c562427
Exclude tests and composer dir from coverage 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-05 12:05:51 +02:00
Roeland Jago Douma
7512683ea9
Fix avatar tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-05 11:00:17 +02:00
Roeland Jago Douma
6807cb684f
avatar to appdata 
* Fix AvatarTest

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-05 11:00:16 +02:00
Roeland Jago Douma
ac38a3a654
Add Tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-05 11:00:16 +02:00
Christoph Wurst
f27b7fa8d1
Do not use underscores in PSR4 namespaces of the backup codes app 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-10-03 21:47:33 +02:00
Lukas Reschke
bf0371429c
Remove database requirement from test 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-03 14:15:18 +02:00
Joas Schilling
a1e4b17ff4
Remove unused endpoint 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-09-30 10:21:08 +02:00
Joas Schilling
877cb06bfe
Use magic DI for core controllers 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-09-30 10:00:26 +02:00
Lukas Reschke
341cd0ef61 Merge pull request #1582 from nextcloud/make-comments-100-tested 
Add test for setTopmostParentId and getTopmostParentId
 2016-09-30 01:04:29 +02:00
Lukas Reschke
d5f39164a1
Add test for setTopmostParentId and getTopmostParentId 
This wasn't tested before as proven by the coverage data.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-09-29 22:43:48 +02:00
Joas Schilling
4d1acfd4ef
Only trigger postDelete hooks when the user was deleted... 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-09-29 15:40:53 +02:00
Joas Schilling
f6ff60f4cb
Make sure that comments, notifications and preferences are deleted 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-09-29 15:40:53 +02:00
Lukas Reschke
0f321fe116 Merge pull request #1534 from nextcloud/svg-optimization 
Svgo optimization
 2016-09-28 23:05:48 +02:00
Morris Jobke
19f94ac5f9 Merge pull request #1549 from nextcloud/kill-update-simulation 
Kill update simulation
 2016-09-28 16:29:09 +02:00
skjnldsv
71830b285c Svgo optimization 
Signed-off-by: John Molakvoæ <fremulon@protonmail.com>
 2016-09-27 20:56:26 +02:00
Lukas Reschke
c4d263199c Merge pull request #1521 from nextcloud/fix-mimetypedetect-hiddenfolder 
Fix mimetype detection inside hidden folders (#26138)
 2016-09-27 18:52:48 +02:00
Vincent Petry
da0cea404d
Kill update simulation 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-09-27 18:43:53 +02:00
Joas Schilling
615b69677e
Use the same URL everywhere 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-09-27 14:52:22 +02:00
Joas Schilling
6f955defe4
Return the autoupdater value from the server 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-09-27 14:38:10 +02:00
Vincent Petry
9b4de310bd
Fix mimetype detection inside hidden folders (#26138) 
Downstreaming of https://github.com/owncloud/core/pull/26138

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-09-26 11:31:03 +02:00
Roeland Jago Douma
6dace7f6ad
Add tests 2016-09-15 13:11:36 +02:00
Morris Jobke
e39e1bdf4e Merge pull request #1395 from nextcloud/issue-369-htaccess-max-sizes 
Make sure memory limit is > post size and upload filesize
 2016-09-13 22:39:08 +02:00
Joas Schilling
a3c8534b7b
Make sure memory limit is > post size and upload filesize 2016-09-13 16:50:36 +02:00
Joas Schilling
db710e0b03
Make tests work with 4.8 at least 2016-09-13 16:31:33 +02:00
Roeland Jago Douma
368f407698
Fix getMock UtilTest 2016-09-13 09:09:53 +02:00
Roeland Jago Douma
206b48d250
Fix getMock UsersControllerTest 2016-09-13 09:09:53 +02:00
Roeland Jago Douma
d616984879
Fix getMock User 2016-09-13 09:09:53 +02:00
Roeland Jago Douma
478b86e5e5
Fix getMock UrlGeneratortest 2016-09-13 09:09:53 +02:00
Roeland Jago Douma
2f36bbecb8
Fix getMock TagTest 2016-09-13 09:09:53 +02:00
Roeland Jago Douma
1d166d645b
Fix getMock ManagerTest 2016-09-13 09:09:53 +02:00
Roeland Jago Douma
7bc2d178ca
Fix getMock CertificateMangerTest 2016-09-13 09:09:53 +02:00
Roeland Jago Douma
5aad530e6c
Fix getMock RepairUnmergedSharesTest 2016-09-13 09:09:53 +02:00
Roeland Jago Douma
cd5183dccc
Fix getMock DBLockingProviderTest 2016-09-13 09:09:53 +02:00
Roeland Jago Douma
dcf8091d69
Fix getMock HelperStorageTest 2016-09-13 09:09:53 +02:00
Roeland Jago Douma
31532ecf13
Fix getMock ViewTest 2016-09-13 09:09:52 +02:00
Roeland Jago Douma
5069b74f8b
Fix getMock scannertest 2016-09-13 09:09:52 +02:00
Roeland Jago Douma
d277053f22
Fix getMock QuotaTest 2016-09-13 09:09:52 +02:00
Roeland Jago Douma
fe15dccb45
Fix getMock FolderTests 2016-09-13 09:09:52 +02:00
Roeland Jago Douma
d77982c03f
Fix getMock UserMountcacheTest 2016-09-13 09:09:52 +02:00
Roeland Jago Douma
4b8d474ec5
Fix getMock Cache 2016-09-13 09:09:52 +02:00
Roeland Jago Douma
3782edf49c
Fix getMock DecryptAllTest 2016-09-13 09:09:52 +02:00
Roeland Jago Douma
16e88a7ebf
Fix getMock ManagerTest 2016-09-13 09:09:52 +02:00
Roeland Jago Douma
77779d678f
Fix getMock FileCacheTest 2016-09-13 09:09:52 +02:00
Roeland Jago Douma
c4ef825ceb
Fix getMock JobListTest 2016-09-13 09:09:52 +02:00
Roeland Jago Douma
9404c04512
Fix getMock AppTests 2016-09-13 09:09:50 +02:00
Thomas Müller
6eba111e09
Fix failing preview unit tests (#26039) 2016-09-12 16:46:39 +02:00
Thomas Müller
3212e2f9e3
Clean up code coverage 
- owncloud/core#26091
 2016-09-12 15:03:35 +02:00
Morris Jobke
c16aefcff5 Merge pull request #1317 from nextcloud/add-sharing-disclaimer 
Adding a optional disclaimer to the anonymous upload page
 2016-09-08 21:18:28 +02:00
Morris Jobke
5ac26d12f0 Merge pull request #1247 from nextcloud/storage-id-global-cache 
more efficient querying of numeric storage ids
 2016-09-08 21:09:14 +02:00
Lukas Reschke
9a2ae2fe7d
Fix tests 2016-09-08 20:11:21 +02:00
Morris Jobke
6bb95de1c5
Adding a optional disclaimer to the anonymous upload page 2016-09-08 18:44:27 +02:00
Joas Schilling
0cec06d0c8
Change updater URL 2016-09-08 12:30:17 +02:00
Lukas Reschke
ff691b4d8a Merge pull request #836 from nextcloud/php7.1 
Add PHP 7.1 drone tests
 2016-09-08 09:19:59 +02:00
Joas Schilling
cdfe538452 Merge pull request #1243 from nextcloud/fix-detection-of-file-types-a-bit 
Fix detection of file types a bit
 2016-09-08 09:19:33 +02:00
Roeland Jago Douma
9d00f367f9
Compare arrays not json strings 
In php 7.1 the pretty print json output changed. Thus now we compare
arrays.
 2016-09-07 23:06:18 +02:00
Roeland Jago Douma
1cdf4e9540
Set default 2016-09-07 22:09:32 +02:00
Roeland Jago Douma
835daedbbc
Fix getMock settings 2016-09-07 20:42:38 +02:00
Roeland Jago Douma
ab797929e2
Fix getMock Updater 2016-09-07 20:42:38 +02:00
Roeland Jago Douma
d8a4769cd6
Fix getMock Template 2016-09-07 20:42:38 +02:00
Roeland Jago Douma
9d4729cb6a
Fix getMock TempManagerTest 2016-09-07 20:42:38 +02:00
Roeland Jago Douma
80c519fe89
Fix getMock Share 2016-09-07 20:42:38 +02:00
Roeland Jago Douma
65409f5327
Fix getMock SetupTest 2016-09-07 20:42:38 +02:00
Roeland Jago Douma
e1096c964d
Fix getMock Security 2016-09-07 20:42:38 +02:00
Roeland Jago Douma
dc60f4c441
Fix getMock Repair 2016-09-07 20:42:38 +02:00
Roeland Jago Douma
1b5ed67857
Fix getMock Migration 2016-09-07 20:42:38 +02:00
Roeland Jago Douma
b8b9fc2b1c
Fix getMock OCSClient 2016-09-07 20:42:38 +02:00
Roeland Jago Douma
c95d5c77d7
Fix getMock LegacyHelperTest 2016-09-07 20:42:38 +02:00
Roeland Jago Douma
f167e65d49
Fix getMock L10NTest 2016-09-07 20:42:38 +02:00
Roeland Jago Douma
ba3a90d30c
Fix getMock checkertest 2016-09-07 20:42:37 +02:00
Roeland Jago Douma
97f6410ac8
Fix getMock Http Client 2016-09-07 20:42:37 +02:00
Roeland Jago Douma
aa670cab14
Fix getMock HTTPHelper 2016-09-07 20:42:37 +02:00
Roeland Jago Douma
28c801b3d5
Fix getMock MetaDataTest 2016-09-07 20:42:37 +02:00
Roeland Jago Douma
7656a8fa12
File getMock Files tests 2016-09-07 20:42:37 +02:00
Roeland Jago Douma
a819fd3f1e
Fix getMock FileChunkingTest 2016-09-07 20:42:37 +02:00
Roeland Jago Douma
4da1ee99d6
Fix getMock Encryption 2016-09-07 20:42:37 +02:00
Roeland Jago Douma
9ea2153e9b
Fix getMock Command/Intergrity 2016-09-07 20:42:37 +02:00
Roeland Jago Douma
4066f04c4b
Fix getMock MapperTestUtility 2016-09-07 20:42:37 +02:00
Morris Jobke
2d9574db34
fix tests 2016-09-07 17:27:41 +02:00
Robin Appelman
e8e950a4d2
more efficient querying of numeric storage ids 2016-09-07 17:22:40 +02:00
Roeland Jago Douma
8a5af2d335
Fix tests 
* hasParameterOption has an additional default value which we must match
  in the return map
* Fix deprecated getMock calls
 2016-09-06 21:20:01 +02:00
Joas Schilling
7c0951244a
Deprecate getEditionString() 2016-09-06 16:05:28 +02:00
Morris Jobke
b6bdf81d55 Merge pull request #1275 from nextcloud/OCS_forward_headers_cleanup 
Internal OCS Controller cleanup
 2016-09-06 14:46:05 +02:00
Roeland Jago Douma
3c55fe6bab
Split OCS version handling 
This cleans up a bit the OCSController/Middleware. Since the 2 versions
of OCS differ a bit. Moved a lot of stuff internal since it is of no
concern to the outside.
 2016-09-06 11:57:39 +02:00
Roeland Jago Douma
c609e291bd
Fix getMock share 2016-09-06 09:33:48 +02:00
Roeland Jago Douma
1a05201543
Fix getMock Avatar 2016-09-06 09:33:48 +02:00
Roeland Jago Douma
4d3b92e687
Fix getMock Authentication 2016-09-06 09:29:27 +02:00
Roeland Jago Douma
3a3a17b2e3
Fix getMock TwoFactorMiddlewareTest 2016-09-06 09:29:27 +02:00
Roeland Jago Douma
777c3ee325
Add FileDisplayResponse 
A lazy implementation of the DisplayResponse that only hits the
filesystem if the etag and mtime do not match.
 2016-09-05 15:09:54 +02:00
Lukas Reschke
06fa486706 Merge pull request #1158 from nextcloud/cache_avatars 
Cache avatars
 2016-09-05 15:08:43 +02:00
Joas Schilling
db6a3367ad Merge pull request #1259 from nextcloud/language_order 
ACCEPT_LANGUAGE goes before default_langauge
 2016-09-05 12:37:44 +02:00
Joas Schilling
24d90a4bb1
Correctly remove the charset from finfo mimetype 2016-09-05 09:48:22 +02:00
Roeland Jago Douma
581a83c2a1
Fix AppTest and intergration test 2016-09-05 09:42:58 +02:00
Christoph Wurst
ddb659dd90
increase core version number to trigger db ugprade and fix app manager tests 2016-09-05 08:51:13 +02:00
Christoph Wurst
8acb734854
add 2fa backup codes app 
* add backup codes app unit tests
* add integration tests for the backup codes app
 2016-09-05 08:51:13 +02:00
Roeland Jago Douma
0228bc6e66
ACCEPT_LANGUAGE goes before default_langauge 
See https://github.com/nextcloud/server/issues/970

Before we had

1. Users settings in personal settings
2. Admins default language settings
3. Accept-Language settings of the browser

However this is not in line with
https://www.w3.org/International/questions/qa-lang-priorities

So this changes the order to

1. Users settings in personal settings
3. Accept-Language settings of the browser
2. Admins default language settings
 2016-09-04 13:19:40 +02:00
Morris Jobke
7ffed2deae Merge pull request #1221 from nextcloud/proper_204_304_response 
No body or content-length for 204 and 304 responses
 2016-09-01 15:04:09 +02:00
Joas Schilling
d3f82356bb Merge pull request #1227 from nextcloud/improve-tests 
Improve tests
 2016-09-01 14:02:04 +02:00
Morris Jobke
a3c1d74829
Remove unneeded Windows logic 2016-09-01 10:47:57 +02:00
Roeland Jago Douma
74fdaab870
Fix depreccated getMock in Core/Command tests 2016-09-01 09:20:54 +02:00
Roeland Jago Douma
21a87d3c2e
No body or content-length for 204 and 304 responses 
See: https://tools.ietf.org/html/rfc7230#section-3.3
 2016-08-31 23:07:48 +02:00
Lukas Reschke
2685129184 Merge pull request #1188 from nextcloud/2fa-redirect-default-app 
redirect to default app after solving the 2FA challenge
 2016-08-31 19:46:38 +02:00
Joas Schilling
f9cea0b582 Merge pull request #797 from nextcloud/only-match-for-auth-cookie 
Match only for actual session cookie
 2016-08-31 15:59:16 +02:00
Joas Schilling
e4311a2ebd Merge pull request #608 from nextcloud/small-encryption-improvement 
skip shared files, if files get decrypted only for a specific user we…
 2016-08-31 12:30:37 +02:00
Lukas Reschke
57f9117843 Merge pull request #1087 from nextcloud/get-delay-twice 
dont get bruteforce delay twice
 2016-08-30 18:43:01 +02:00
Christoph Wurst
8e5c4c91fa check same URL in unit tests 2016-08-30 13:28:04 +02:00
Christoph Wurst
0a0c7a9b92 redirect to default app after solving the 2FA challenge 2016-08-30 11:10:45 +02:00
Roeland Jago Douma
6a85882f61
Fix tests 2016-08-30 09:00:22 +02:00
Morris Jobke
e341bde8b9 Merge pull request #1172 from nextcloud/core_cleanup 
Core controller cleanup
 2016-08-30 08:32:55 +02:00
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
b1a090f357
AvatarController use proper JSONResponse 
* Do not rely on DataResponse magic. We want JSON so use JSON
* Fix tests
 2016-08-29 21:52:14 +02:00
Roeland Jago Douma
f6423f74e3
Minor cleanup in core Controllers 2016-08-29 21:52:09 +02:00
Christoph Wurst
291dd0bd31 redirect to 2fa provider if there's only one active for the user 2016-08-29 18:36:39 +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
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
Lukas Reschke
8bf9be2167 Merge pull request #1058 from nextcloud/avatarController_cleanup 
Avatar controller cleanup
 2016-08-27 22:25:34 +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