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

35649 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Petry
237dab675e
Fix initMountPoints to set usersSetup earlier 
This is needed because in some cases like LDAP, the user manager itself
might trigger avatar updates which would internally also call
initMountPoints with the same user. This could cause the same user to
be setup twice, and in some sharing situations could cause recursive
deduplication of shares by adding "(2)" every time.
 2016-11-03 20:45:40 +01:00
Lukas Reschke
8bf57462ea Merge pull request #2002 from nextcloud/propagate-mtime-iont 
explicitly cast mtime to int in propagation
 2016-11-03 20:43:13 +01:00
Vincent Petry
e8d614b59e
Hide "Add group" for subadmins 2016-11-03 20:41:10 +01:00
Roeland Jago Douma
f6ff624e3d Merge pull request #1733 from nextcloud/dav-events 
Activities for calendars, events and todos
 2016-11-03 19:31:20 +01:00
Roeland Jago Douma
dca9184a12
Fix tests 
* Tests fixed and controller coverage to 100%

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 19:08:56 +01:00
Morris Jobke
9e27e2f048 Merge pull request #2003 from nextcloud/query-logger-limit 
Cap the number of queries we save in the query logger
 2016-11-03 17:04:50 +01:00
Robin Appelman
95ac9f60ce
Cap the number of queries we save in the query logger 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-03 16:00:28 +01:00
Björn Schießle
1c52d87821 Merge pull request #2000 from nextcloud/sharebymail-icon 
add share by mail icon, fix #1979
 2016-11-03 15:33:58 +01:00
Joas Schilling
7a0e003ade
Add more tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-03 15:24:18 +01:00
Robin Appelman
7be62d083e
explicitly cast mtime to int 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-03 14:36:46 +01:00
Joas Schilling
36b656e207
Add tests for triggerCalendarActivity 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-03 14:30:02 +01:00
Lukas Reschke
6d686c213b
[WIP] Use mail for encrypting the password reset token as well 2016-11-03 14:27:26 +01:00
Morris Jobke
ae5eb79593 Merge pull request #1908 from nextcloud/downstream-26078 
Upload autorename on client side
 2016-11-03 14:21:35 +01:00
Roeland Jago Douma
7ba7949dc1 Merge pull request #1994 from nextcloud/proper-cron-hints 
Show a hint for system based cron user name
 2016-11-03 14:11:37 +01:00
Roeland Jago Douma
f44cd7aed3
Update changelog 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:08:54 +01:00
Jan-Christoph Borchardt
219b536f70 add share by mail icon, fix #1979 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-11-03 14:05:43 +01:00
Roeland Jago Douma
9e6b26dcd0
Add cache 1 day cache to preview endpoint 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:33 +01:00
Roeland Jago Douma
55af6b45f7
More tests 
* PreviewController test
* PublicPreview test
* Versions Preview test
* Trash Preview test

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:33 +01:00
Roeland Jago Douma
87855aa97b
Added genertor helper & tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:33 +01:00
Roeland Jago Douma
3d6ee7ffc9
Update thumbnail endpoint to new generato 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:33 +01:00
Roeland Jago Douma
5d11085190
Move over files_trashbin 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:33 +01:00
Roeland Jago Douma
d720a2fb57
Moved over files_versions 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:33 +01:00
Roeland Jago Douma
2164085f22
Fix urlgenerator test 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:33 +01:00
Roeland Jago Douma
a6ca81b474
Update autoloader 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:33 +01:00
Roeland Jago Douma
3822bceea2
Move publicpreview over 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:33 +01:00
Roeland Jago Douma
5466fbf761
Move Ipreview to more of DI thingy 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:33 +01:00
Roeland Jago Douma
8468212386
Fix name conflict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:33 +01:00
Roeland Jago Douma
d6f1287ae6
Move file 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:33 +01:00
Roeland Jago Douma
02525fd98b
Move preview endpoint to controller 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:33 +01:00
Roeland Jago Douma
c8ff9fb00e
Watch for file modification/deletion 
* Only connect the watcher once the instance is properly setup else
AppData fails hard.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:33 +01:00
Roeland Jago Douma
743132650a
Move to AppData 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:32 +01:00
Roeland Jago Douma
958c1289b1
New preview generator 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:32 +01:00
Roeland Jago Douma
b129adfb58 Merge pull request #1997 from nextcloud/changelog 
Introducing changelog.md
 2016-11-03 13:57:10 +01:00
Roeland Jago Douma
d1550283de Merge pull request #1996 from nextcloud/allow-phpunit-options 
Allow to run autotest with phpunit options
 2016-11-03 13:15:39 +01:00
Roeland Jago Douma
2002d5eab5
Added changelog.md 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 13:12:14 +01:00
Joas Schilling
c4775a5bce
Start unit tests for the activity listener 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-03 12:57:40 +01:00
Joas Schilling
e8f82c6b61
Add tests for dispatching of the events 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-03 12:28:12 +01:00
Lukas Reschke
b33ceb6fdd Merge pull request #1915 from nextcloud/downstream-26398 
Add using casing check/fix for initMountPoints
 2016-11-03 12:14:28 +01:00
Joas Schilling
52dd27892b
Use the event dispatcher 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-03 12:07:59 +01:00
Joas Schilling
d3e8463de2
Use a different type for events and todos 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-03 12:07:59 +01:00
Joas Schilling
43b46bcc6a
Activities for events and todos 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-03 12:07:58 +01:00
Joas Schilling
07f6747305
Move the methods into a new class 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-03 12:07:58 +01:00
Joas Schilling
776622f3de
Add activities for shares 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-03 12:07:58 +01:00
Joas Schilling
35ce4c772c
Fix unshare actions for author != owner 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-03 12:07:58 +01:00
Joas Schilling
9a7c522cc6
Add activity for unshare from group 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-03 12:07:58 +01:00
Joas Schilling
83d51afab1
Unshare user activities 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-03 12:07:57 +01:00
Joas Schilling
90578327d5
Start working on calendar activities 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-03 12:07:57 +01:00
Joas Schilling
11fa8fe7ee
Allow to run autotest with phpunit options 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-03 12:04:54 +01:00
Christoph Wurst
e11197bc48 Merge pull request #1954 from nextcloud/issue_#1953 
#1953 add can to subshare options
 2016-11-03 11:50:29 +01:00
Andreas Hechenberger
09c4fe6d62
Fixes https://github.com/nextcloud/server/issues/1953 
Signed-off-by: Andreas Hechenberger <world@greenstation.de>
 2016-11-03 11:19:45 +01:00