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

12799 commits

Author SHA1 Message Date
Joas Schilling
280d5325c7
Allow to register activity filters via info.xml 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:40 +01:00
Morris Jobke
3c00ff2616 Merge pull request #2145 from nextcloud/docs_to_com 
docs are on nc.com
 2016-11-16 00:57:35 +01:00
Morris Jobke
cb97cf559b Merge pull request #2144 from nextcloud/fix_1303 
Do not cache version info in the session
 2016-11-15 23:13:53 +01:00
Roeland Jago Douma
28babd319b Merge pull request #2137 from nextcloud/make-sure-tests-run-on-phpunit-4-again 
Add a magic wrapper to allow phpunit4 to run the code again
 2016-11-15 21:48:55 +01:00
Roeland Jago Douma
39f336035b
docs are on nc.com 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-15 19:17:42 +01:00
Roeland Jago Douma
f07d75a4dd
@since 9.2.0 to @since 11.0.0 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-15 18:51:52 +01:00
Roeland Jago Douma
7a8bf6ea26
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-15 18:10:17 +01:00
Roeland Jago Douma
028c668293
Do not cache version info in the sessions 
If the session is cleared and closed for whatever reason the loadVersion
will write to the session anyways. This will lead to an exception.

This should fix #1303

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-15 17:53:12 +01:00
Lukas Reschke
5fd428413b
Adjust previous fallbacks 
11.0 is 11 and not 9.2 anymore

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-15 15:07:58 +01:00
Joas Schilling
e76ef9aaa8
Add a magic wrapper from hell to allow phpunit4 to run the code again 
Remove this once phpunit 5 is the lowest supported version, by reverting:
https://github.com/nextcloud/server/pull/2137

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-15 14:49:14 +01:00
Roeland Jago Douma
0e60b78378 Merge pull request #2117 from nextcloud/master-add-bruteforce-check-to-person-endpoint 
Add bruteforce checker to Person.php
 2016-11-14 17:18:31 +01:00
Roeland Jago Douma
b7e13b43fb Merge pull request #2114 from nextcloud/downstream-26498 
make object prefix configurable
 2016-11-14 17:07:00 +01:00
Roeland Jago Douma
1e3d806416 Merge pull request #2113 from nextcloud/downstream-26299 
We need to ensure that the app holding the objectstore implementation…
 2016-11-14 16:44:16 +01:00
Lukas Reschke
0d89c14911
Add bruteforce checker to Person.php 
Also check for attempts on this endpoint

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-14 15:26:23 +01:00
Jörn Friedrich Dreyer
4a9361905d
make object prefix configurable 2016-11-14 15:10:56 +01:00
Thomas Müller
895b638a2c
We need to ensure that the app holding the objectstore implementation is loaded - fixes owncloud/objectstore#38 2016-11-14 15:00:45 +01:00
Thomas Müller
506ccdbd8d
Introduce an event for first time login based on the last login time stamp 
Use firstLogin event to trigger creation of default calendar and default address book

Delay login of admin user after setup so that firstLogin event can properly be processed for the admin

Fixing tests ...

Skeleton files are not copied over -> only 3 cache entries are remaining

Use updateLastLoginTimestamp to properly setup lastLogin value for a test user
 2016-11-14 14:50:10 +01:00
Morris Jobke
fdd904414f Merge pull request #2068 from nextcloud/sharetypesinfolder-no-getdirectorycontent 
remove unneeded getDirectoryContent when getting share types for a folder
 2016-11-14 11:49:24 +01:00
Morris Jobke
16a110e803 Merge pull request #2067 from nextcloud/fileinfo-lazy-substorages 
only query substorages to calculate the final mtime/size/etag when we need it
 2016-11-14 11:39:02 +01:00
Nextcloud bot
8c1cd07de3
[tx-robot] updated from transifex 2016-11-14 01:07:06 +00:00
Lukas Reschke
7cb0df28e2
Prevent downgrade attacks for apps 
We should verify the app versions when installing a new update, otherwise this could result in downgrade attacks when an attacker just copies the old signature.

Plus it prevents the case that in case of a bug in the appstore actually an older version gets installed.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-11 18:53:26 +01:00
Robin Appelman
cbcdf69dc2
only query substorages to calculate the final mtime/size/etag lazily 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-10 13:59:22 +01:00
Roeland Jago Douma
931493b70e
Get correct L10N for Settings Manager 
Fixes #2022

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-10 11:08:37 +01:00
Nextcloud bot
cfda17d8f3
[tx-robot] updated from transifex 2016-11-10 01:07:14 +00:00
Robin Appelman
74024c8f28
fix phpdoc 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-09 16:59:03 +01:00
Morris Jobke
742c215946 Merge pull request #2058 from nextcloud/better-error-message-for-installation-error 
Use a better error message and point the users to the support channels
 2016-11-09 13:59:33 +01:00
Lukas Reschke
9305094b8b
Add test and adjust PHP function arguments 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-09 10:49:57 +01:00
Joas Schilling
2f7e291101
Correctly catch the "soft errors" now 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-09 10:30:19 +01:00
Joas Schilling
224dfaf1e6
Use a better error message and point the users to the support channels 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-09 09:10:32 +01:00
Joas Schilling
706b5c3fb6
Use a php class for the definitions to avoid loading problems 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-09 08:52:07 +01:00
Roeland Jago Douma
100cec59a7 Merge pull request #2037 from nextcloud/fix-preview-urls 
Fix preview URLs
 2016-11-08 18:29:57 +01:00
Björn Schießle
1ad3043e4f Merge pull request #1998 from nextcloud/share-by-mail-notification 
add share by mail activity
 2016-11-08 17:37:46 +01:00
Joas Schilling
9296038d78
Fix preview URLs 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-08 16:39:13 +01:00
Bjoern Schiessle
25bcd71d02
add activity if a file was shared by mail 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-08 15:58:52 +01:00
Bjoern Schiessle
3bc643ec23
add new definition 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-08 15:42:07 +01:00
Bjoern Schiessle
087dab85b4
add activity for share by mail 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-08 15:42:07 +01:00
Donquixote
537d588726
refactoring code to reduce cyclomatic complexit 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-07 08:18:16 +01:00
Nextcloud bot
8d954c0ece
[tx-robot] updated from transifex 2016-11-07 01:07:03 +00:00
Nextcloud bot
e217040402
[tx-robot] updated from transifex 2016-11-06 01:07:48 +00:00
Nextcloud bot
ca3616cb58
[tx-robot] updated from transifex 2016-11-05 01:07:14 +00:00
Lukas Reschke
a9547a2fd7 Merge pull request #2015 from nextcloud/swift-bucket 
allow using 'bucket' to set the swift container
 2016-11-04 21:46:59 +01:00
Morris Jobke
f42d5b6e56 Merge pull request #2007 from nextcloud/downstream-26411 
[oc] Fix initMountPoints to set usersSetup earlier
 2016-11-04 15:03:52 +01:00
Robin Appelman
b72e5a2e4e
allow using 'bucket' to set the swift container 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-04 14:15:18 +01:00
Roeland Jago Douma
a56717673f
Remove adding sharedialogmailview 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-04 07:41:35 +01:00
Nextcloud bot
479d76d426
[tx-robot] updated from transifex 2016-11-04 01:07:04 +00:00
Lukas Reschke
c0bbae28f0 Merge pull request #1741 from nextcloud/new_preview 
Improve previews
 2016-11-03 21:07:16 +01:00
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
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
Robin Appelman
7be62d083e
explicitly cast mtime to int 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-03 14:36:46 +01:00