Arthur Schiwon
5d98ab83e9
resolve displayname via manager and registerable resolvers
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-19 00:34:00 +02:00
Arthur Schiwon
fea3e20a80
move mention extraction to (I)Comment and report mentions via DAV
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-19 00:33:55 +02:00
Joas Schilling
303e073724
Do not skip when mysql uses utf8mb4
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-19 00:15:01 +02:00
Joas Schilling
43b7b143f4
Fix test of repair step
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-19 00:15:01 +02:00
Joas Schilling
17a2723948
Fix the test
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-19 00:15:01 +02:00
Morris Jobke
296a3274cf
only disable unicode test on mysql
2016-10-19 00:15:01 +02:00
Morris Jobke
972e560e72
Adding tests for 4 byte unicode characters
...
* success on SQLite and Postgres
* failure on MySQL due to the limited charset that only supports up to 3 bytes
2016-10-19 00:15:01 +02:00
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
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
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
Lukas Reschke
ea9b1cc340
Merge pull request #1306 from nextcloud/simplefs
...
Introducing AppData
2016-10-06 09:25:15 +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
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
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
Morris Jobke
19f94ac5f9
Merge pull request #1549 from nextcloud/kill-update-simulation
...
Kill update simulation
2016-09-28 16:29:09 +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
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
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
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
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
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
Morris Jobke
a3c1d74829
Remove unneeded Windows logic
2016-09-01 10:47:57 +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
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
Roeland Jago Douma
6a85882f61
Fix tests
2016-08-30 09:00:22 +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
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
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
Joas Schilling
ad4cab130e
Merge pull request #1069 from nextcloud/l10ntest_nodb
...
L10N tests do not require DB
2016-08-25 23:38:27 +02:00
Roeland Jago Douma
c5bdb4d4e8
L10N tests do not require DB
...
* Makes CI a bit more efficient
* Cleanup getMock warning
2016-08-25 22:41:23 +02:00
Roeland Jago Douma
04cffe6d81
CappedMemoryCacheTest does not require DB
...
Makes CI a bit more efficient
2016-08-25 22:32:39 +02:00
Robin Appelman
2693ae870e
cache user folders
2016-08-25 17:22:25 +02:00
Christoph Wurst
6af2efb679
prevent infinite redirect loops if the there is no 2fa provider to pass
...
This fixes infinite loops that are caused whenever a user is about to solve a 2FA
challenge, but the provider app is disabled at the same time. Since the session
value usually indicates that the challenge needs to be solved before we grant access
we have to remove that value instead in this special case.
2016-08-24 10:49:23 +02:00
Lukas Reschke
2f1b17d44a
Merge pull request #1007 from nextcloud/shared-storage-non-recursive
...
Fix shared storage recursive setup
2016-08-23 22:15:38 +02:00
Robin Appelman
a0c2342c20
prevent infinite recursion while getting storage from mount
2016-08-23 14:52:18 +02:00
Lukas Reschke
3ed102497e
Merge pull request #995 from nextcloud/workflow-section
...
Workflow section + hidden empty sections
2016-08-23 11:20:43 +02:00
Arthur Schiwon
5cd3f4e4dc
add test
2016-08-22 16:56:00 +02:00
Arthur Schiwon
baa91809bd
adjust test
2016-08-22 08:29:49 +02:00
Arthur Schiwon
7972fa5527
enlist only registered sections that also have settings registered to
2016-08-22 08:29:49 +02:00
Lukas Reschke
d50e7ee36c
Remove reading PATH_INFO from server variable
...
Having two code paths for this is unreliable and can lead to bugs. Also, in some cases Apache isn't setting the PATH_INFO variable when mod_rewrite is used.
Fixes https://github.com/nextcloud/server/issues/983
2016-08-19 14:48:13 +02:00
Julius Haertl
162b153f22
Fix loading of ThemingDefaults
2016-08-19 11:26:22 +02:00
Roeland Jago Douma
fe80bb1aff
Merge pull request #867 from nextcloud/notification-primary-action-always-first
...
Make sure the primary action is always the first one
2016-08-17 19:31:14 +02:00
Vincent Petry
df9b509ed3
Improve regexp to detect duplicate folders when repairing unmerged shares
2016-08-17 15:31:47 +02:00
Vincent Petry
7a2d25fab4
Fix unmerged shares repair with mixed group and direct shares
...
Whenever a group share is created after a direct share, the stime order
needs to be properly considered in the repair routine, considering that
the direct user share is appended to the $subShares array and breaking
its order.
2016-08-17 15:31:36 +02:00
Vincent Petry
56b94b220d
Improve file_target finding logic when repairing unmerged shares
...
Pick the most recent subshare that has no parenthesis from duplication
which should match whichever name the user picked last. If all
subshares have duplicate parenthesis names, use the least recent group
share's target instead.
2016-08-17 15:31:35 +02:00
Joas Schilling
027069cbae
Merge pull request #846 from nextcloud/provisioning_api_ocs
...
Move Provisioning API to the AppFramework
2016-08-17 10:23:13 +02:00
Arthur Schiwon
4943441bde
adjust tests to latest changes
2016-08-16 18:59:45 +02:00
Arthur Schiwon
717e22267a
Merge branch 'master' into implement_712
2016-08-16 18:31:59 +02:00
Roeland Jago Douma
c044aa34fa
Make the capabilities manager more error proof
...
If an app registers an invalid capabilty we should not crash hard.
Instead we should catch the exception. Log it (error) and carry on.
* Added tests
2016-08-15 20:37:19 +02:00
Lukas Reschke
7ffb7b0d84
Use MockBuilder instead of createMock
...
CI uses an older PHPUnit
2016-08-15 16:43:22 +02:00
Lukas Reschke
8a7a0f3287
Add unit tests
2016-08-15 16:25:34 +02:00
Joas Schilling
3ed05f8769
Make sure the primary action is always the first one
2016-08-15 11:13:54 +02:00