Roeland Jago Douma
646db7f88d
Merge pull request #4518 from nextcloud/downstream-25838
...
Fix share indicator handling
2017-04-26 19:23:27 +02:00
Lukas Reschke
d89c76049f
Merge pull request #4374 from nextcloud/contactsmenu_popover
...
add contacts popover
2017-04-26 18:31:17 +02:00
Roeland Jago Douma
edd9444209
Merge pull request #4503 from nextcloud/downstream-27281
...
fix objectstore rename
2017-04-26 17:17:24 +02:00
Joas Schilling
c0a8942764
Fix missing conflict resolutions
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-26 17:05:59 +02:00
Roeland Jago Douma
94a4d47b22
Merge pull request #4516 from nextcloud/downstream-27527
...
OCC scanner commit in batches
2017-04-26 16:59:03 +02:00
Jan-Christoph Borchardt
d17258d4b9
Fix filelist and checkbox vertical align
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-26 16:47:04 +02:00
Robin Appelman
acb0903514
remove duplicate method
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-26 16:45:04 +02:00
Robin Appelman
43970b93d1
remove excessive logging
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-26 16:41:48 +02:00
Juan Pablo Villafáñez
f2bd5f7496
Add new specific tests for SMB
2017-04-26 16:23:52 +02:00
Juan Pablo Villafáñez
71012b3432
Adjust SMB permissions on the root
2017-04-26 16:23:52 +02:00
Vincent Petry
1c771c097a
Use regex to detect part files
2017-04-26 16:12:48 +02:00
Ilja Neumann
327094d557
#7496 Don`t allow upload of files with extension .part
2017-04-26 16:09:08 +02:00
Vincent Petry
d379b197d5
Fix forbidden backslash DAV integration tests
2017-04-26 15:47:59 +02:00
Vincent Petry
7b6e4d0dd2
Fix FutureFile MOVE to keep destination node
...
Sabre usually deletes the target node on MOVE before proceeding with the
actual move operation. This fix prevents this to happen in case the
source node is a FutureFile.
2017-04-26 15:46:38 +02:00
Vincent Petry
ec8d7010e5
Accept moving FutureFile into a Directory
2017-04-26 15:43:01 +02:00
Vincent Petry
642b4331a6
Moved unit tests from ObjectTree::move to Directory
2017-04-26 15:42:29 +02:00
Vincent Petry
82b967d3f9
Remove ObjectTree::move and let is use the IMoveTarget approach instead
...
This removes the duplicated code
2017-04-26 15:35:08 +02:00
Vincent Petry
0a9f7730d0
Ported ObjectTree::move to IMoveTarget in new DAV endpoint
2017-04-26 15:33:20 +02:00
Sergio Bertolin
a761d4cce7
Added test cases from core 16825
2017-04-26 15:29:01 +02:00
Vincent Petry
9bff66e68d
Simplified new endpoint move test
2017-04-26 15:27:02 +02:00
Vincent Petry
c30feafaa2
Added case when final chunk move must not change file id
2017-04-26 15:26:15 +02:00
Sergio Bertolin
9ab17c95c0
Added test about checking file id after a move
2017-04-26 15:24:19 +02:00
Joas Schilling
9e6ac3de70
Allow to create a user for a specific backend
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-26 15:07:11 +02:00
Morris Jobke
ba43a09380
Merge pull request #4512 from nextcloud/fix-translations-2
...
Fix translations
2017-04-26 08:57:08 -03:00
Vincent Petry
3f36548a6d
Reload file list when leaving hidden state
...
Whenever a file list is already initialized and was hidden when
switching to another file list in the navigation bar, if the user comes
back to this list it gets redisplayed. At this point the list needs to
be refreshed to be able to reflect any potential file changes done from
the other lists.
2017-04-26 13:51:44 +02:00
Vincent Petry
17a31a51c6
Fix share indicator handling
...
Properly update the fileInfoModel with the updated share types, which
also updates the file list row indicator properly
2017-04-26 13:38:12 +02:00
Vincent Petry
b92085f2c7
Fix recovery checkbox label to properly point
2017-04-26 13:29:42 +02:00
Vincent Petry
0721a7d5cc
Fix scanner after review
2017-04-26 13:26:47 +02:00
Vincent Petry
e3218ddffd
OCC scanner commit in batches
2017-04-26 13:26:27 +02:00
Piotr Mrówczyński
9fec4031b3
Adjust query/event logging code in favour of more complex owncloud/diagnostics ( #27643 )
...
* Adjust query/event logging code in favour of more complex owncloud/diagnostics
* Add descriptions to IQueryLogger and IEventLogger interfaces
2017-04-26 13:19:43 +02:00
Roeland Jago Douma
5b5c3a1773
Merge pull request #4430 from nextcloud/refactor-auth
...
Improve readability of login logic
2017-04-26 10:41:53 +02:00
Lukas Reschke
83c5f3f3e8
Bump version to Nextcloud 12.0 beta 1
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-26 10:36:38 +02:00
Joas Schilling
bec9f18a0f
Merge pull request #4478 from nextcloud/improve_settings_help
...
adding some documentation hints and some smaller cleanup
2017-04-26 09:45:01 +02:00
Joas Schilling
ec323cb687
Fix email vs mail
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-26 09:34:59 +02:00
Joas Schilling
6c28c4ac8b
Use correct plural form and add special strings for tomorrow and today
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-26 09:34:59 +02:00
Georg Ehrke
6bbc682c4b
handle 404 separately
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:30:21 +02:00
Georg Ehrke
99b201a188
unit test jquery.contactsmenu
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:15 +02:00
Georg Ehrke
6d7714f182
fix CommentsTabsView js test
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:15 +02:00
Georg Ehrke
f32fc97533
fix ContactsStoreTest
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:15 +02:00
Georg Ehrke
897bd5cfef
add contactsmenu popover to comments
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:14 +02:00
Georg Ehrke
e61cf83faf
better detection whether or not contactsmenu target was clicked
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:14 +02:00
Georg Ehrke
399f08bd33
add contactsmenu popover to resharer infobox
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:14 +02:00
Georg Ehrke
4d60aff6ec
Contactsmenu popover: show proper message when server throws error
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:14 +02:00
Georg Ehrke
8f404c1f56
don't toggle sharing popover together with contactsmenu popover
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:14 +02:00
Joas Schilling
f43e7a9405
Fix past tense
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-26 09:27:41 +02:00
Georg Ehrke
c844b2931e
close menu again when clicking on avatar
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:26:56 +02:00
Georg Ehrke
60f9ed6241
add contactsmenu popover
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:26:53 +02:00
Roeland Jago Douma
7386bea23f
Merge pull request #4467 from nextcloud/lists-for-html-mails
...
Add lists to HTML emails
2017-04-26 08:30:30 +02:00
Roeland Jago Douma
752b219970
Merge pull request #4061 from nextcloud/downstream-26407
...
Redis cluster support
2017-04-26 08:27:30 +02:00
Morris Jobke
527369be9c
Merge pull request #4500 from nextcloud/downstream-27118
...
Restrict proppatch to the proper nodes
2017-04-26 01:28:16 -03:00