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

35623 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Appelman
c5df58ec69
phpdoc 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-16 15:24:28 +01:00
Robin Appelman
7e9e5db496
fix setscope 
Signed-off-by: Robin Appelman <icewind@owncloud.com>
 2016-11-16 15:24:28 +01:00
Robin Appelman
da63af8b02
enable deleting/configuring new tokens 
Signed-off-by: Robin Appelman <icewind@owncloud.com>
 2016-11-16 15:24:28 +01:00
Robin Appelman
1afccde16a
allow configuring filesystem access 
Signed-off-by: Robin Appelman <icewind@owncloud.com>
 2016-11-16 15:24:27 +01:00
Robin Appelman
b4e27d35f5
app password scope wip 
Signed-off-by: Robin Appelman <icewind@owncloud.com>
 2016-11-16 15:24:27 +01:00
Robin Appelman
2389e0f250
read lockdown scope from token 
Signed-off-by: Robin Appelman <icewind@owncloud.com>
 2016-11-16 15:24:27 +01:00
Robin Appelman
b56f2c9ed0
basic lockdown logic 
Signed-off-by: Robin Appelman <icewind@owncloud.com>
 2016-11-16 15:24:23 +01:00
Roeland Jago Douma
d03446a0ae Merge pull request #2148 from nextcloud/add_autoloader_before_enabling 
Add autoloader before enabling apps
 2016-11-16 12:09:39 +01:00
Joas Schilling
81e9836900 Merge pull request #2092 from nextcloud/activity-filter-api 
Better API for activity filters, settings and providers + Rich Object support
 2016-11-16 11:47:17 +01:00
Joas Schilling
6b88d56e3a
Update the since version to 11.0.0 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:29:27 +01:00
Joas Schilling
6047493b6d
Fix integration tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:46 +01:00
Joas Schilling
b5f1296d1f
Make sure they are always arrays 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:46 +01:00
Joas Schilling
1dc23f2fd6
Remove the old activity extension 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:46 +01:00
Joas Schilling
cf8b91be52
Add back the support for the short translations 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:45 +01:00
Joas Schilling
8725302307
Fix InfoParser empty tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:45 +01:00
Joas Schilling
b8958ee937
Fix activity manager tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:45 +01:00
Joas Schilling
27c08167df
Don't even try to combine when the subject is different 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:45 +01:00
Joas Schilling
c2a5c1f2c6
Allow combining events 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:45 +01:00
Joas Schilling
6ddf43e27a
Provider for the files app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:45 +01:00
Joas Schilling
b2248efd75
Allow to register Providers 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:45 +01:00
Joas Schilling
72f0d9981e
Add ROS and icon support to the events 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:45 +01:00
Joas Schilling
a366602961
Validate the input into Event already 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:44 +01:00
Joas Schilling
ca2124a2a1
Register the settings of the files app via info.xml 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:44 +01:00
Joas Schilling
13ff56bfc5
Allow to register settings/types via info.xml 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:44 +01:00
Joas Schilling
0d940e581a
Move the favorites filter to IFilter 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:44 +01:00
Joas Schilling
5d71896c8e
Move files filter to IFilter 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:44 +01:00
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
d826e04757
Add autoloader before enabling apps 
Else apps that require already autoloading in the installer
(files_antivius) die hard!

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-15 22:28:57 +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
Morris Jobke
51688986df Merge pull request #2139 from nextcloud/increase-version-to-ELF 
Use 11.0 instead 9.2
 2016-11-15 20:56:41 +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
d7665292a2 Merge pull request #2132 from nextcloud/federated-cloud-id 
specify Federated Cloud ID syntax
 2016-11-15 18:57:43 +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
b775d935f2
Endpoint is now 11.0.0 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-15 15:10:17 +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
Lukas Reschke
bc1008ac38
Use 11.0 instead 9.2 
As discussed we're changing the version from 9.2 to 11.0 to make some more sense.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-15 14:45:58 +01:00
Jan-Christoph Borchardt
34e3acd897 specify Federated Cloud ID syntax 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-11-15 12:07:54 +01:00
Nextcloud bot
571c5aac5e
[tx-robot] updated from transifex 2016-11-15 01:07:05 +00:00
Morris Jobke
e5b61527da Merge pull request #2125 from nextcloud/downstream-26546 
Transfer ownership now returns exit code on error
 2016-11-15 00:08:09 +01:00
Roeland Jago Douma
d5afe2f3ca Merge pull request #2119 from nextcloud/downstream-26555 
disabling dropping on dragging objects temporarily
 2016-11-14 17:45:15 +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
Morris Jobke
42d754becd Merge pull request #2084 from nextcloud/files_drop_avatars_disabled 
Fixes files_drop when avatars are disabled
 2016-11-14 17:14:09 +01:00
Roeland Jago Douma
561a4fd989 Merge pull request #2115 from nextcloud/oc_26527 
Skip broken shares when transferring ownership (#26527)
 2016-11-14 17:07:59 +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
c9b1108e8e Merge pull request #2110 from nextcloud/oc_26526 
First process group shares and then user shares
 2016-11-14 17:06:28 +01:00