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

14848 commits

Author SHA1 Message Date
Thomas Citharel
994001c480
Dirty hack to disable dav plugins on public calendar urls 2016-09-26 11:55:36 +02:00
Thomas Müller
00dc157b19
Fix requests for browser plugin as well as for the public calendar root folder 2016-09-26 11:55:36 +02:00
Thomas Müller
e7085aab38
Allow not-authenticated access to specific urls 2016-09-26 11:55:36 +02:00
Thomas Müller
90ab6e4fd9
Add new root collection public-calendars which holds all public calendars 2016-09-26 11:55:36 +02:00
Thomas Citharel
8da2100e7d
Start work on returning CalDAV published calendars 2016-09-26 11:55:35 +02:00
Thomas Citharel
bd0aae8636
No need to call database twice 2016-09-26 11:55:35 +02:00
Thomas Citharel
7e5a82b968
Use urlgenerator to generate an absolute url 
And pass Config the correct way too
 2016-09-26 11:55:35 +02:00
Thomas Citharel
72f35f8862
Use ressource ID instead of name 2016-09-26 11:55:35 +02:00
Thomas Citharel
f89961ddba
Fix annotations 2016-09-26 11:55:34 +02:00
Thomas Citharel
4a0e6e2ad0
Remove unnecessary line 2016-09-26 11:55:34 +02:00
Thomas Citharel
1652a74feb
Fix publish-url property & getPublishStatus() fct 2016-09-26 11:55:34 +02:00
Thomas Citharel
981c38f6d9
Remove unnecessary implementation 2016-09-26 11:55:34 +02:00
Thomas Citharel
5824c2493b
Make little corrections 
Function getPublishedStatus) is not working atm.
 2016-09-26 11:55:34 +02:00
Thomas Citharel
69d3601dcb
Proper work on Publishing 2016-09-26 11:55:33 +02:00
Jörn Friedrich Dreyer
b79997dd33
use correct case for addScript (#26214) 
Downstreaming of https://github.com/owncloud/core/pull/26214

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-09-26 11:44:57 +02:00
Vincent Petry
e8836bfd30
Allow uploading empty files (#26113) 
Downstreaming of https://github.com/owncloud/core/pull/26113

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-09-26 11:28:05 +02:00
Vincent Petry
b17e836e45
FilesHome now also returns DAV properties 
The files home node must also return DAV properties like etag,
permissions, etc for the clients to work like they did with the old
endpoint.

This fix makes FilesHome extend the Sabre Directory class, this makes
the FilesPlugin and other plugins recognize it as a directory and will
retrieve the matching properties when applicable.

Downstream of https://github.com/owncloud/core/pull/26066

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-09-26 11:24:23 +02:00
Vincent Petry
f07d146644
Display "Share" alt text for share action icon (#26158) 
Downstreaming of https://github.com/owncloud/core/pull/26158

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-09-26 10:30:11 +02:00
Joas Schilling
968dc876b2
Do not translate the samples themselves 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-09-26 10:30:08 +02:00
Nextcloud bot
9e91a76b30
[tx-robot] updated from transifex 2016-09-26 08:10:43 +00:00
Joas Schilling
73cb19ca0d
Fix selection of workflowengine rules and operators 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-09-26 09:43:54 +02:00
Morris Jobke
4a33bb6d18
add workflowengine l10n 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-09-26 09:42:20 +02:00
Nextcloud bot
5f2b29b2dc
[tx-robot] updated from transifex 2016-09-26 00:09:43 +00:00
Nextcloud bot
a086011e00
[tx-robot] updated from transifex 2016-09-25 00:09:40 +00:00
Nextcloud bot
8767e9566f
[tx-robot] updated from transifex 2016-09-24 00:09:45 +00:00
Morris Jobke
3f740966dc
Revert "Show an update button instead of the updater" 
This reverts commit 202ae42506.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-09-23 13:11:08 +02:00
Nextcloud bot
b30c79b63c
[tx-robot] updated from transifex 2016-09-23 00:09:45 +00:00
Joas Schilling
a0e62f0880 Merge pull request #1455 from nextcloud/use-magic-di 
Use magic DI
 2016-09-22 12:23:46 +02:00
Nextcloud bot
6a873acf46
[tx-robot] updated from transifex 2016-09-22 00:11:32 +00:00
Jan-Christoph Borchardt
f383b2a3c3 Merge pull request #1469 from nextcloud/hide-empty-tag-input 
Hide collaborative tag input when empty
 2016-09-21 10:39:17 +02:00
Nextcloud bot
d24e78d1ff
[tx-robot] updated from transifex 2016-09-21 00:09:40 +00:00
Jan-Christoph Borchardt
dd74627e85 proper padding for Tags action 2016-09-21 00:22:19 +02:00
Joas Schilling
c5c69edd40
Add viewbox to icons 2016-09-20 18:45:55 +02:00
Joas Schilling
c5c403b574
Add a handle for the tags label 2016-09-20 18:07:06 +02:00
Joas Schilling
d853899ab6
Hide the tags input field when it's empty 2016-09-20 17:19:11 +02:00
Joas Schilling
94b0315d7a
Fix more tests 2016-09-20 14:28:17 +02:00
Vincent Petry
118c9d58fe
Fix fed share test call to return proper result 
Fixes an issue where retrying a previously failed federated share would
not properly reset the availability flag because the return value was
undefined instead of "true".
 2016-09-20 12:11:26 +02:00
Steven Bühner
1bd4eebb26
Also fire a bulk pre- and post-delete hook 2016-09-20 12:07:03 +02:00
Steven Bühner
2b37dc9c9e
Always use the same relative Path (Starting from users home dir. i.e.: "/files_trashbin/...") 2016-09-20 12:07:00 +02:00
Steven Bühner
55fe036dbf
Take the same path (with /USERNAME/ as base) for every emmited hooks 2016-09-20 12:06:56 +02:00
Steven Bühner
a41541ae22
Emit hooks for each file before and after all files in trashbin have been deleted. 2016-09-20 12:06:51 +02:00
Steven Bühner
2f555cb10d
Fiy typo 2016-09-20 12:06:47 +02:00
Steven Bühner
0408d9a2e4
Emit Hooks for each file bevore and after all files in trashbin have been deleted. 2016-09-20 12:06:43 +02:00
Thomas Müller
1f825f0fe8
Adding repair step to fix component of birthday calendars 2016-09-20 11:28:00 +02:00
Thomas Müller
6eb1bc55ab
The birthday calendar can only hold VEVENT - refs https://github.com/owncloud/tasks/issues/338 2016-09-20 11:26:09 +02:00
Nextcloud bot
70660d0d6c
[tx-robot] updated from transifex 2016-09-20 00:09:37 +00:00
Joas Schilling
1944d9b3ab
Use magic DI 2016-09-20 01:15:24 +02:00
Nextcloud bot
f4a4578f0d
[tx-robot] updated from transifex 2016-09-19 00:09:33 +00:00
Nextcloud bot
bcc4b5cd0a
[tx-robot] updated from transifex 2016-09-18 00:09:26 +00:00
Nextcloud bot
cb6e16ab5c
[tx-robot] updated from transifex 2016-09-17 00:10:14 +00:00
Roeland Jago Douma
fcc91cbc49 Merge pull request #1408 from nextcloud/chunk-calendar-objects-query 
Chunk if you have too many contacts/events
 2016-09-16 10:12:30 +02:00
Nextcloud bot
9fa288f12b
[tx-robot] updated from transifex 2016-09-16 00:09:34 +00:00
Joas Schilling
44fbf6f734
Close cursors 2016-09-15 09:47:39 +02:00
Nextcloud bot
4fdee00c27
[tx-robot] updated from transifex 2016-09-15 00:12:37 +00:00
Joas Schilling
08c6ca5a1a
Chunk if you have too many contacts 2016-09-14 16:29:58 +02:00
Joas Schilling
62f31d67bd
Chunk if you have too many events 2016-09-14 16:29:33 +02:00
Morris Jobke
8d4e5747f3
Fix folder drag glitch in Firefox 
issue:
* drag'n'drop a folder into the files app in Firefox
* the highlight stays there because Firefox doesn't trigger the drop event for folders

solution:
* behave like the drop event if the dragover event isn't fired for 100ms (only applied in Firefox)
 2016-09-14 13:44:34 +02:00
Nextcloud bot
7ffadc7e26
[tx-robot] updated from transifex 2016-09-14 00:10:31 +00:00
Roeland Jago Douma
b6439da128 Merge pull request #1338 from nextcloud/fix-trashbin-errors 
Opening the trashbin causes errors in log for files without preview
 2016-09-13 19:23:51 +02:00
Lukas Reschke
c0656fb4ef
Move Travis tests to DroneCI 
Should give us some quicker test execution speed as we're not limited by Travis

Explicitly invoke with "bash"

Install instance already

Use newest litmus container
 2016-09-13 18:17:15 +02:00
Morris Jobke
15e7f8f3cc Merge pull request #1370 from nextcloud/dav-fixassemblystreamperf 
[uc] Improve chunk upload AssemblyStream performance
 2016-09-13 10:28:39 +02:00
Roeland Jago Douma
56d37e27bc
Fix tests 2016-09-13 09:40:59 +02:00
Vincent Petry
fb52b1af67
Allow increasing permissions for share owner 
In some cases, the owner of the share is also recipient through a group
share. The owner must still be able to increase permissions in that
situation.
 2016-09-13 09:40:59 +02:00
Vincent Petry
1ab472b9ad
Improve chunk upload AssemblyStream performance 2016-09-13 09:29:02 +02:00
Nextcloud bot
feb85981cd
[tx-robot] updated from transifex 2016-09-13 00:11:21 +00:00
Joas Schilling
6f8f78b07a
Fix some more sniffs 2016-09-12 16:48:11 +02:00
Joas Schilling
5e5e5b77d5
Fix encryption app 2016-09-12 16:48:11 +02:00
Joas Schilling
6ac2b8d83f
Fix twofactor_backupcodes 2016-09-12 16:48:11 +02:00
Joas Schilling
60c22dd074
Fix more sniffing 2016-09-12 16:48:11 +02:00
Joas Schilling
01cf85e4e5
Fix the User_LDAP app 2016-09-12 16:48:11 +02:00
Joas Schilling
a2668b11e5
Fix sniffes in admin_audit 2016-09-12 16:48:11 +02:00
Nextcloud bot
cf57055960
[tx-robot] updated from transifex 2016-09-12 00:09:35 +00:00
Morris Jobke
9c3ffa6a65 Merge pull request #1351 from nextcloud/cast_to_int 
Cast query result to int
 2016-09-11 23:18:44 +02:00
Roeland Jago Douma
bc40a033f3 Merge pull request #1250 from nextcloud/remote_ocs 
Move remote_shares OCS endpoint to AppFramework
 2016-09-11 20:57:46 +02:00
Nextcloud bot
96d176d1e8
[tx-robot] updated from transifex 2016-09-11 00:09:14 +00:00
Roeland Jago Douma
ef4eaaee17 Merge pull request #1346 from nextcloud/trash-detect-correct-mimetype 
deleted files, fix mimetype detection
 2016-09-10 14:42:06 +02:00
Nextcloud bot
341d4f0c01
[tx-robot] updated from transifex 2016-09-10 00:09:19 +00:00
Roeland Jago Douma
94fb5bcbae
Cast query result to int 
Else we never create the default address book
 2016-09-09 19:15:27 +02:00
Jan-Christoph Borchardt
a45cfbc2d2 search design details 2016-09-09 18:01:00 +02:00
Bjoern Schiessle
68b53669c0
detect the correct mimetype of the files in the trashbin, therefore we have to check the filename without the appended timestamp 2016-09-09 15:36:30 +02:00
Morris Jobke
3fc37b2fc5 Merge pull request #1342 from nextcloud/throw-exceptions-not-printable 
Don't print exception message in HTML
 2016-09-09 14:57:23 +02:00
Morris Jobke
f56ae37e8f
Opening the trashbin causes errors in log for files without preview 
* put a file without a generated preview in the trashbin
  (e.g. a *.docx file)
* open the trashbin
* following errors will show up in the nextcloud.log:
	- filesize(): stat failed for ...
	- fopen(...): failed to open stream: No such file or directory at ...
	- fread() expects parameter 1 to be resource, boolean given at ...
	- fclose() expects parameter 1 to be resource, boolean given at ...
	- imagecreatefromstring(): Empty string or invalid image at ...

This is because the preview code tries to load an SVG image, which
is obviously only text.

The fix simply handles this before the loading happens and the web UI
keeps showing the default mimetype icon.
 2016-09-09 13:53:06 +02:00
Lukas Reschke
f715b5ea2e
Don't print exception message in HTML 
The exception message is potentially influenced by user input and could thus be confusing (e.g. somebody could try to open a file like "Please send a mail to support@foo.com", and then the message would include that string.

It is thus reasonable to not show the exception message by default. Also for the browser view I added an `exit()` at the end, as otherwise the XML exception would be attached.
 2016-09-09 13:52:34 +02:00
Lukas Reschke
67439951e6
Filter more mimetypes 
There's no need to allow more than those defined mimetypes for images.
 2016-09-09 12:33:10 +02:00
Roeland Jago Douma
ba104233b0
Move remote_shares OCS endpoint to AppFramework 2016-09-09 07:40:33 +02:00
Nextcloud bot
f5aafdc897
[tx-robot] updated from transifex 2016-09-09 00:09:31 +00: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
268c5a0aa0
Adjust test 2016-09-08 20:34:04 +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
27a3c68d84
Fix tests 2016-09-08 11:13:36 +02:00
Joas Schilling
202ae42506
Show an update button instead of the updater 2016-09-08 10:59:14 +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
Nextcloud bot
b992bf2142
[tx-robot] updated from transifex 2016-09-08 00:10:21 +00:00
Lukas Reschke
25a1a68bc9 Merge pull request #1310 from nextcloud/shared-with-you-owner 
dont show shares you own in "shared with you"
 2016-09-07 22:05:44 +02:00
Roeland Jago Douma
680b557a4b
Fix apps warnings 2016-09-07 20:42:38 +02:00
Roeland Jago Douma
3dc840cadf Merge pull request #1311 from nextcloud/add-doc-link 
Add a docs link when given
 2016-09-07 20:35:41 +02:00
Morris Jobke
c36ceb6fff Merge pull request #1301 from nextcloud/fix-required-permissions-for-webdav-move-and-copy 
Fix required permissions for webdav move and copy
 2016-09-07 19:56:04 +02:00
Joas Schilling
3dabfb0793
Add a docs link when given 2016-09-07 18:52:49 +02:00
Joas Schilling
b94a4df592
Fix tests 2016-09-07 18:39:48 +02:00
Robin Appelman
9adf78c155
dont show shares you own in "shared with you" 2016-09-07 18:38:08 +02:00
Robin Appelman
e8e950a4d2
more efficient querying of numeric storage ids 2016-09-07 17:22:40 +02:00
Morris Jobke
5bf17607b3
Fix layout of success message and text 2016-09-07 16:51:25 +02:00
Joas Schilling
cf69a2b7eb
UPDATE permissions qualify for renaming a node 2016-09-07 11:22:57 +02:00
Joas Schilling
4c0665b6ec
Only require CREATE permissions when the file does not exist yet 2016-09-07 11:10:48 +02:00
Joas Schilling
0027304b5f Merge pull request #1210 from nextcloud/bump_symfony_console 
[3rparty] Bump symfony/console
 2016-09-07 09:23:47 +02:00
Morris Jobke
74daac49ac Merge pull request #1292 from nextcloud/add-theming-icon 
Add icon for the theming app
 2016-09-07 08:31:50 +02:00
Nextcloud bot
1110ef52ed
[tx-robot] updated from transifex 2016-09-07 00:09:25 +00:00
Felix Epp
aacaf7a568 Add icon for the theming app 2016-09-07 01:23:53 +02:00
Roeland Jago Douma
59e5ebf330
Cleanup files_external command imports 2016-09-06 21:36:03 +02:00
Joas Schilling
7c0951244a
Deprecate getEditionString() 2016-09-06 16:05:28 +02:00
Morris Jobke
836c938583 Merge pull request #1245 from nextcloud/get-external-mounts 
get files_external mounts more efficiently
 2016-09-06 15:43:32 +02:00
Morris Jobke
d13d1e1f06
add twofactor_backupcodes to l10n 2016-09-06 14:50:05 +02:00
Joas Schilling
6a6af86a1c Merge pull request #1242 from nextcloud/bump_phpunit 
Bump phpunit
 2016-09-06 14:18:57 +02:00
Christoph Wurst
ea6562aa57 translate 2fa backup strings 2016-09-06 12:52:44 +02:00
Christoph Wurst
c57976879c fix 2fa backup codes typo 2016-09-06 10:39:00 +02:00
Morris Jobke
314afcecf9 Merge pull request #1272 from nextcloud/theming-info-capabilities 
Add theming information to capabilities for the client
 2016-09-06 10:00:42 +02:00
Roeland Jago Douma
5fb2eee5df
Fix getMock user_ldap 2016-09-06 09:29:27 +02:00
Roeland Jago Douma
798dd40139
Fix getMock files_versions 2016-09-06 09:29:27 +02:00
Roeland Jago Douma
327352e73a
Fix getMock files_trashbin 2016-09-06 09:29:27 +02:00
Roeland Jago Douma
9cd6374878
Fix getMock files 2016-09-06 09:29:27 +02:00
Roeland Jago Douma
c629761fea
Fix getMock files_sharing 2016-09-06 09:29:27 +02:00
Roeland Jago Douma
d13ac20bca
Fix getMock files_external 2016-09-06 09:29:27 +02:00
Roeland Jago Douma
0c154c1ed7
Fix getMock encryption 2016-09-06 09:29:27 +02:00
Joas Schilling
67408c3f63
Add image URLs and tests 2016-09-06 08:55:22 +02:00
Nextcloud bot
5d48809609
[tx-robot] updated from transifex 2016-09-06 00:09:18 +00:00
Robin Appelman
b573c5b8f8
get files_external mounts more efficiently 2016-09-05 14:34:20 +02:00
Joas Schilling
1d834bd49e
Add theming information to capabilities for the client 2016-09-05 14:27:19 +02:00
Joas Schilling
2d61ee3c13
Make mimetype also work for READ and DELETE operations 2016-09-05 09:48:23 +02:00
Joas Schilling
d08240e364
Better detection of mimetypes while uploading a zip on a mac 2016-09-05 09:48:22 +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
Nextcloud bot
8b484eedf0
[tx-robot] updated from transifex 2016-09-05 00:09:10 +00:00
Nextcloud bot
fc02c4a980
[tx-robot] updated from transifex 2016-09-04 00:09:21 +00:00
Nextcloud bot
e7f618ef14
[tx-robot] updated from transifex 2016-09-03 00:09:24 +00:00
Roeland Jago Douma
3a45475592
Remove dead OCS register code 2016-09-02 15:13:44 +02:00
Nextcloud bot
ab876619dc
[tx-robot] updated from transifex 2016-09-02 00:09:11 +00:00
Joas Schilling
59d240c3aa Merge pull request #1194 from nextcloud/card-caldav-check-exists 
more efficient check if addressbook and calendar exists for user
 2016-09-01 14:52:59 +02:00
Roeland Jago Douma
ca7b60ba81 Merge pull request #1215 from nextcloud/issue-1083-update-live-relative-timestamps 
Update relative timestamps for a better "live" feeling
 2016-09-01 14:13:23 +02:00
Roeland Jago Douma
8325c4443b Merge pull request #1224 from nextcloud/do-not-allow-linebreak-in-paths 
Do not allow linebreaks and null bytes in paths
 2016-09-01 14:06:40 +02:00
Joas Schilling
6c81c65eea
Also prevent null byte character 2016-09-01 12:24:14 +02:00
Joas Schilling
1ae4a2f9e4 Merge pull request #1143 from nextcloud/ldap-smells-for-fun-and-profit 
fix a few minor code smells
 2016-09-01 10:09:23 +02:00
Joas Schilling
4beadfc290 Merge pull request #1217 from nextcloud/federation_phpunit_fixes 
Fix deprecated getMock call in Federation app
 2016-09-01 10:08:33 +02:00
Joas Schilling
7cd86cfe59
Filter out %0A from paths 2016-09-01 10:06:06 +02:00
Joas Schilling
80e8d3db35
Use live timestamp on comments tab 2016-09-01 09:02:36 +02:00
Joas Schilling
0c73797131
Use live timestamps in the versions tab of the sidebar 2016-09-01 09:02:36 +02:00
Joas Schilling
ee838a224e
Use live timestamp in the sidebar details 2016-09-01 09:02:36 +02:00
Joas Schilling
ee1c1b39b2
Update live timestamps to give a more live feeling 2016-09-01 09:02:36 +02:00
Nextcloud bot
4a5cd74fb2
[tx-robot] updated from transifex 2016-09-01 00:09:24 +00:00
Roeland Jago Douma
62485ed08f
Fix deprecated getMock call in Federation app 2016-08-31 20:54:17 +02:00
Roeland Jago Douma
011364317a
Fix ThemingDefaults getMock deprecation 2016-08-31 20:33:18 +02:00
Roeland Jago Douma
5fe25fa648 Merge pull request #1212 from nextcloud/fix_federatedfilesharingtests 
Fix deprecated usages of getMock in federatedfilesharing
 2016-08-31 16:37:40 +02:00
Robin Appelman
344945bfe9 more efficient check if addressbook and calendar exists for user 2016-08-31 15:08:29 +02:00
Roeland Jago Douma
a0af513a4a Merge pull request #1201 from nextcloud/usermountcache-orphanedshare 
[master] Usermountcache orphanedshare
 2016-08-31 15:07:13 +02:00
Roeland Jago Douma
ac2be923a6
Fix deprecated usages of getMock in federatedfilesharing 2016-08-31 14:06:51 +02:00
Lukas Reschke
b3ad3a3086 Merge pull request #1137 from nextcloud/external_storage_lnk 
External storage lnk
 2016-08-31 12:00:48 +02:00
Lukas Reschke
aa90e69b66 Merge pull request #1189 from nextcloud/share-allowspaceinremote 
Allow space for federated share id search
 2016-08-30 19:54:35 +02:00
Vincent Petry
423378ea17
Added closeCursor in SharedMount numeric id 2016-08-30 19:49:31 +02:00
Vincent Petry
669b0bc2ae
Prevent error with orphaned shares when updating user mount cache 2016-08-30 19:49:23 +02:00
Morris Jobke
c54d6d05c9 Merge pull request #1190 from nextcloud/addressbook-correctly-handle-multi-values 
Correctly handle multi-values when converting VCards to array
 2016-08-30 14:46:36 +02:00
Joas Schilling
a123fe6f18
Add a unit test for all the magic 2016-08-30 12:24:20 +02:00
Joas Schilling
0c4d471c18
Correctly handle multi-values when converting VCards to array 2016-08-30 12:08:39 +02:00
Roeland Jago Douma
989473169e Merge pull request #1138 from nextcloud/expiry-as-occ-command 
Add occ command to expire the trashbin (#25878)
 2016-08-30 11:32:26 +02:00
Vincent Petry
ec9fd67bc5
Allow space for federated share id search 2016-08-30 11:11:59 +02:00
Joas Schilling
f4dfd1f1a3 Merge pull request #1178 from nextcloud/theming-spinner-animation 
Theming: Show loading spinner while uploading files
 2016-08-30 10:01:36 +02:00
Morris Jobke
dd2482e2c2 Merge pull request #988 from nextcloud/ocs_federation 
Move OCSAuthAPI to AppFramework
 2016-08-30 08:49:05 +02:00
Morris Jobke
c481210e2b Merge pull request #974 from nextcloud/move_ocs_routes_to_fedfilesharing 
Move federated sharing routes to the federatedfilesharing app
 2016-08-30 08:45:44 +02:00
Julius Haertl
0e8b138534
Theming: Show loading spinner while uploading files 2016-08-30 06:40:41 +02:00
blizzz
7278bd2987 Merge pull request #1132 from nextcloud/prevent-parse-error-on-editing-an-html-comment 
Prevent parse error on editing an HTML comment
 2016-08-30 00:14:08 +02:00
Lukas Reschke
9ebc58c3d8 Merge pull request #1170 from nextcloud/theming-fix-primary-button 
Theming: fix primary button for bright colors
 2016-08-29 21:39:09 +02:00
Roeland Jago Douma
4f93dce2e1 Merge pull request #1130 from nextcloud/shared-upload-quota 
[uc] Fix uploading to shared folder with quota
 2016-08-29 20:37:07 +02:00
Roeland Jago Douma
e1ea45f32b Merge pull request #1147 from nextcloud/files-hidden-files-summary 
Display number of hidden files in files summary (#25870)
 2016-08-29 20:36:07 +02:00
Roeland Jago Douma
606fd77432 Merge pull request #1146 from nextcloud/init-filesconfig 
Make sure file list files config always exists
 2016-08-29 20:35:56 +02:00
Roeland Jago Douma
1f8c3c153c Merge pull request #1148 from nextcloud/files-scan-reconnect-database-before-each-user-master 
Before a user is getting scanned the database connection is re-establ…
 2016-08-29 20:25:59 +02:00
Roeland Jago Douma
013f691fe9
Fix phpdoc 2016-08-29 20:20:17 +02:00
Roeland Jago Douma
613704c58e Merge pull request #1145 from nextcloud/upstream-25794 
DAV: Return data-fingerprint always when asked
 2016-08-29 19:56:50 +02:00
Julius Haertl
d43c9b9e79
Theming: fix primary button for bright colors 2016-08-29 19:07:27 +02:00
Lukas Reschke
4005e58f93 Merge pull request #1117 from iamfool/master 
Update Admin.php
 2016-08-29 15:27:41 +02:00
Thomas Müller
a4cf4a53f3
Before a user is getting scanned the database connection is re-established 2016-08-29 14:49:55 +02:00
Vincent Petry
7fa66409ae
Display number of hidden files in files summary (#25870) 
When dot files are hidden, the table summary and selection summary will
not show how many hidden files were included.
 2016-08-29 14:47:41 +02:00
Vincent Petry
29b45c5c42
Make sure file list files config always exists 
Initialize files config with defaults in case none was passed
 2016-08-29 14:44:25 +02:00
Markus Goetz
0cb34c2fa5
[master] DAV: Return data-fingerprint always when asked (#25482) 
For owncloud/client#5056
Users can configure arbitrary subfolders for syncing, therefore we should
always return it when asked for.
The sync client makes sure to not always ask for it to save bandwidth.
 2016-08-29 14:37:14 +02:00
Jörn Friedrich Dreyer
4d31caa6f8
fix a few minor code smells 2016-08-29 14:34:37 +02:00
Thomas Müller
297d2e48ad
Add occ command to expire the trashbin (#25878) 
* Add occ command to expire the trashbin

* Fix versions folder in setup check
 2016-08-29 14:30:40 +02:00
davitol
ad0090d51a
add in files view a link to personal files external 2016-08-29 14:29:46 +02:00
davitol
9b5a5dcf89
add link to personal files external 2016-08-29 14:29:41 +02:00
Joas Schilling
28792a010c
Prevent parse error on editing an HTML comment 2016-08-29 14:18:34 +02:00
Thomas Müller
6c365cb06d A shared storage is never a home storage - fixes #25582 2016-08-29 14:13:26 +02:00
iamfool
7e1a690059 Update AdminTest.php 2016-08-29 01:47:23 -07:00
iamfool
e13cd289cb Update Admin.php 2016-08-28 18:02:45 -07:00
Roeland Jago Douma
2812755359
Move federated sharing routes to the federatedfilesharingapp 
* Move routes to app
* Move routes over to the AppFramework
* Fix tests

There is plenty of stuff to fix properly here. But out of scope for now.
 2016-08-28 21:26:33 +02:00
Lukas Reschke
3647fbe7cd Merge pull request #976 from nextcloud/downstream-25702 
Hide the LDAP password in the client side
 2016-08-28 15:06:27 +02:00
Roeland Jago Douma
b6520827f7
Use function parameters 2016-08-28 11:40:58 +02:00
Roeland Jago Douma
16ff207465
Move OCSAuthAPI to AppFramework 
* Convert class
* Convert routes
* Convert tests
 2016-08-28 11:40:53 +02:00
Jan-Christoph Borchardt
48a307ffdc Merge pull request #1103 from nextcloud/improve-theming-performance 
Increase theming performance
 2016-08-27 23:18:34 +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
Lukas Reschke
683f0e7f77
Use temporary file as cache 2016-08-27 21:38:41 +02:00
Lukas Reschke
73bc108451
Increase theming performance 
1. Set proper caching headers (`Pragma: cache`)
2. Resize image proportionally to a max size of 1920px
3. Store images with progressive mode

This resizes a previous 2.8 MB picture to 300kb and makes it rendering going down from 11 seconds to less than 1 here. And future requests won't have to download the file newly.
 2016-08-27 21:02:08 +02:00
Julius Haertl
d7f0a970ae
Theming: Preview for page title 2016-08-26 18:21:05 +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
Roeland Jago Douma
c20aef8795 Merge pull request #1085 from nextcloud/fix-ffs-sharing-syntax 
Fix the syntax of the federation ID share buttons
 2016-08-26 15:10:03 +02:00
Roeland Jago Douma
53725d4d15 Merge pull request #771 from nextcloud/theming-fixes 
Theming: Fix missing color usage
 2016-08-26 15:02:21 +02:00
Lukas Reschke
63addaa6c6 Merge pull request #1077 from nextcloud/sharee_ocs_appframework 
Sharee API to AppFramework
 2016-08-26 14:56:12 +02:00
Joas Schilling
6b885bbc56
Reorder the buttons by importance 2016-08-26 14:16:27 +02:00
Joas Schilling
ab5a69b94d
FIx the syntax of the buttons 2016-08-26 13:59:50 +02:00
Julius Haertl
a7273f1658
Make federadedfilesharing button match the theming values 2016-08-26 12:52:16 +02:00
Julius Haertl
3d38cb9570
Theming: Hide undo button on default values 2016-08-26 12:08:12 +02:00
Julius Haertl
d95aec2ed2
Theming: Add preview for login screen 2016-08-26 12:08:12 +02:00
Julius Haertl
218e2f7850
Theming: Adjust jquery ui elements 2016-08-26 12:07:52 +02:00
Julius Haertl
2b0ed6c27a
Theming: colorize primary buttons 2016-08-26 12:07:52 +02:00
Julius Haertl
a7c5f1b3c4
Theming: fix federated sharing button color 2016-08-26 12:07:45 +02:00
Roeland Jago Douma
044d7c3bb7 Merge pull request #1026 from nextcloud/theming-extend-defaults 
Theming: Add logo and background to ThemingDefaults
 2016-08-26 11:53:24 +02:00
Roeland Jago Douma
2fdda01b4b
Sharee API to AppFramework 
* Move to OCSController
* Move to Controller folder
* Use automatic DI
* Use function parameters
* Updated tests
 2016-08-26 11:36:09 +02:00
Robin Appelman
7c4d9add0d reuse the userfolder's fileinfo when possible during dav setup 2016-08-25 17:22:22 +02:00
Roeland Jago Douma
cae87d028d
Fix tests 2016-08-24 21:30:42 +02:00
Roeland Jago Douma
a1ed8207e9
HTTPHelper is deprecated 
Use the IClientService instead
 2016-08-24 21:30:39 +02:00
Roeland Jago Douma
42ef33661f Merge pull request #1033 from nextcloud/fix_theming_autoloader_magic 
Fix theming autoloader magic
 2016-08-24 14:16:48 +02:00
Lukas Reschke
b124647e32 Merge pull request #936 from nextcloud/better-dav-display-names 
Better dav display names
 2016-08-24 13:46:18 +02:00
Roeland Jago Douma
60974de97b
Require a ThemingDefaults class again 2016-08-24 13:22:44 +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
Joas Schilling
c7c53aefb2
Use the lazy root to make tests pass 🙈 2016-08-24 09:52:05 +02:00
Joas Schilling
3fbb5de74f
Better displaynames for shared address books 2016-08-24 08:50:25 +02:00
Joas Schilling
53182fb780
Better displaynames for shared calendars 2016-08-24 08:50:25 +02:00
Roeland Jago Douma
352d22e473
Do not error on NotFoundException 
Since this exception can be thrown when a shared file is in the
trashbin there is no need to spam the log like crazy.

Fixes #938
 2016-08-24 08:18:08 +02:00
Julius Haertl
80fe499707
Theming: Add logo and background to ThemingDefaults 2016-08-24 00:40:22 +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
Lukas Reschke
d85e678f09 Merge pull request #1005 from nextcloud/fix_994 
Do not error on maxUploadChange
 2016-08-23 11:18:24 +02:00
Lukas Reschke
e0ae67545e Merge pull request #956 from nextcloud/fix_952 
When using permalinks don't error out if file id can't be found
 2016-08-23 00:58:25 +02:00
Arthur Schiwon
ee6f29812f
put file handling into a section again 2016-08-22 20:25:58 +02:00
Roeland Jago Douma
f744131b18
Do not error on maxUploadChange 
The new admin page broke the updating of the max upload size. This is
due to very old code there.

* Now update is done in the background using js
* Added proper route+controller to update

Fixes #994
 2016-08-22 20:25:58 +02:00
Robin Appelman
1e7c108bff handle failed shares 2016-08-22 12:32:39 +02:00
Robin Appelman
3ed01e8459 Lazy init shared storage 2016-08-22 12:27:56 +02:00
Robin Appelman
95570d607c reuse existing root id 2016-08-22 12:27:20 +02:00
Arthur Schiwon
a065fee3ff
fixes registering of theming settings where server return OC_Defaults instead of ThemingDefaults 2016-08-22 12:02:06 +02:00
Joas Schilling
8b117ee0d7 Merge pull request #965 from nextcloud/master-files-render-hidden-files-hidden 
Fix hidden files handling
 2016-08-22 09:44:00 +02:00
Joas Schilling
d1c9f744e1
Move admin settings to workflow section 2016-08-22 08:35:03 +02:00
Arthur Schiwon
cb3c1eee97
add section to worklfowengine 2016-08-22 08:29:44 +02:00
Lukas Reschke
ede32a558a Merge pull request #969 from nextcloud/allow-to-validate-operations 
Allow to validate operations
 2016-08-21 20:45:40 +02:00
Morris Jobke
56a9997435
use simple bell as update notification icon 2016-08-19 13:59:33 +02:00
Morris Jobke
1fab954353
Change federation icon to the share icon 2016-08-19 13:52:38 +02:00
Juan Pablo Villafáñez
5b4e752079
Hide the LDAP password in the client side 
Connection checks will be done by using the configuration id, with the
stored password. LDAP password won't be sent to the client.
 2016-08-19 12:23:41 +02:00
Joas Schilling
a111181eb3
Validate the operation 2016-08-19 12:23:05 +02:00
Joas Schilling
6d4ede3e84
System tags are not sharing but workflow 2016-08-19 12:23:05 +02:00
Vincent Petry
f7deb2c2eb
Fix hidden files handling 
Hidden files (dot files) are now always rendered in the DOM to make
sure that all file operations and selection still work as expected.

Their visibility is now toggled on CSS level.
 2016-08-19 10:26:19 +02:00
Thomas Müller
f960aec5bb
Move over to new CalDAVTester repo (#25859) 
* Move over to new caldac tester repo

* no run.py anymore
 2016-08-19 10:18:59 +02:00
Roeland Jago Douma
cc9b36131c
When requesting a permalink to an invalid file redirect 
We need to do the redirect to update address bar.
 2016-08-19 10:10:19 +02:00
Roeland Jago Douma
54f79a28f6
When using permalinks don't error out if file id can't be found 
Fixes #952

* Use only the index route (since it went to showFile anyways)
* Fix tests
* Use getUserFolder to force init of users mounts
 2016-08-19 08:15:30 +02:00
Marius Blüm
a83c5e8b00 Merge pull request #906 from nextcloud/files_external-settings-polish-missing 
Files external settings polish
 2016-08-18 23:32:13 +02:00
Morris Jobke
6d7c5e2265 Merge pull request #903 from nextcloud/allow-disable-comments 
Revert "Always add activities for comments to the stream"
 2016-08-18 16:51:42 +02:00
Morris Jobke
ab5bd81020 Merge pull request #925 from nextcloud/use-util-methods 
Load the Template class in case it's not loaded
 2016-08-18 16:41:07 +02:00
Robin Appelman
c51e2eb3ba fix error when not logged in 2016-08-18 16:06:25 +02:00
blizzz
3b6bbf8159 Merge pull request #934 from nextcloud/add-cachebusters 
Add cachebusters
 2016-08-18 15:45:22 +02:00
Roeland Jago Douma
71d81eef08 Merge pull request #927 from nextcloud/drop-unneeded-statements 
white-space: pre-wrap is supported on all current browsers
 2016-08-18 15:09:43 +02:00
Robin Appelman
2332ed3292 change remote cloud naming to Nextcloud 2016-08-18 12:57:47 +02:00
Robin Appelman
5dd20a55e8 dont register personal files_external setting if it's empty 2016-08-18 12:57:47 +02:00
Lukas Reschke
1f5b297722
Add cachebuster to apps.css 2016-08-18 12:38:41 +02:00
Joas Schilling
b4313f1969
Load the Template class in case it's not loaded 2016-08-18 12:00:59 +02:00
Joas Schilling
9f58e62925
Fix double ending quotes 2016-08-18 11:44:03 +02:00
Morris Jobke
436fb00162
white-space: pre-wrap is supported on all current browsers 
* Chrome 1, Firefox 3, IE8, Opera 8 and Safari 3
* see https://developer.mozilla.org/en-US/docs/Web/CSS/white-space
 2016-08-18 11:18:44 +02:00
Lukas Reschke
5580a77bd7 Merge pull request #714 from nextcloud/comments-layout 
fix design details in comments sidebar
 2016-08-18 11:04:20 +02:00
Morris Jobke
869c841082
Improve layout of cancel button in the comments sidebar 2016-08-18 09:07:03 +02:00
Morris Jobke
8c960821f1
Fix layout of comments submit button on all screen sizes 
* tested in IE10, IE11, Edge, Chrome and Firefox
 2016-08-18 08:57:46 +02:00
Roeland Jago Douma
fda4241dfb
Cleanup Tests 2016-08-17 20:45:29 +02:00
Roeland Jago Douma
af074eb2b7
Move updateShare and getShares over to use proper parameters 
* Update tests
 2016-08-17 20:45:29 +02:00
Roeland Jago Douma
22e23f3045
Use parameters in createShare 
* Fix tests
 2016-08-17 20:45:27 +02:00
Morris Jobke
77cfc8bfb2
add viewBox to app icon for proper scaling in Firefox 2016-08-17 18:38:53 +02:00
Morris Jobke
ec4d127e58 Merge pull request #905 from nextcloud/invisible_icons 
Fix icons on App page in FF
 2016-08-17 17:24:16 +02:00
Nextcloud bot
39c180117e
[tx-robot] updated from transifex 2016-08-17 13:30:52 +00:00
Roeland Jago Douma
ba4633b165
Add viewBox to app icons 
If we don't add a viewbox a lot of browsers will just say NOPE!!! when
we ask them to scale.
 2016-08-17 15:23:51 +02:00
Joas Schilling
af46b64ef2
Revert "Always add activities for comments to the stream" 
This reverts commit 48c41b888c
 2016-08-17 13:30:32 +02:00
Marius Blüm
baaf1521ce Merge pull request #787 from nextcloud/files_external-settings-polish 
Files external settings polish
 2016-08-17 12:32:33 +02:00
Roeland Jago Douma
0d96478758
Fix js unit test 2016-08-17 11:48:26 +02:00
Roeland Jago Douma
252ddcc1a4
Fix edit comment layout 2016-08-17 11:35:18 +02:00
Jan-Christoph Borchardt
efd1cf57da
fix design details in comments sidebar 2016-08-17 11:12:49 +02:00
Morris Jobke
9a7193ce83
Fix casing of external storage app 2016-08-17 10:44:00 +02:00
Joas Schilling
04c5259df0
Allow to retrieve the quota itself via the provisioning api 2016-08-17 10:41:13 +02:00
Morris Jobke
27796a4077
layout refinements 2016-08-17 10:40:59 +02:00
Robin Appelman
644770c950
hide files external in personal settings if it's empty 2016-08-17 10:40:59 +02:00
Robin Appelman
ff89354588
don't show dependency info if we cant create new mounts 2016-08-17 10:40:59 +02:00
Robin Appelman
c62e512989
hide global credentials in personal when a user cant add mounts 2016-08-17 10:40:59 +02:00
Roeland Jago Douma
ce0604bd06 Merge pull request #892 from nextcloud/fix_phpdoc 
Some scrutinizer phpdoc fixes
 2016-08-17 10:38:21 +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
Marius Blüm
c1632c3abd Merge pull request #893 from nextcloud/ie8_be_gone 
IE8 be gone!
 2016-08-17 09:02:58 +02:00
Nextcloud bot
0cc8b8b244
[tx-robot] updated from transifex 2016-08-17 00:09:19 +00:00
Roeland Jago Douma
9fd274c447
Remove IE8 support from ViewController 
* Update tests
* Fix getMock in tests
 2016-08-16 20:58:33 +02:00
Roeland Jago Douma
64ff8ac6fa
Fix phpdoc in Comments 2016-08-16 20:33:09 +02:00
Arthur Schiwon
717e22267a
Merge branch 'master' into implement_712 2016-08-16 18:31:59 +02:00
Arthur Schiwon
4946cc220d
for new we cannot have nested settings, default module is only appended if available 2016-08-16 18:26:16 +02:00
Björn Schießle
9db189174c Merge pull request #870 from nextcloud/oc-missingprefixforlastinsertid 
Fix oracle support of external storage app
 2016-08-16 16:24:45 +02:00
Roeland Jago Douma
d14c6ef78c Merge pull request #860 from nextcloud/fix_updatenotifcations_warnings 
Fix deprecated getMock warning
 2016-08-16 14:50:31 +02:00
Nextcloud bot
8c424c7971
[tx-robot] updated from transifex 2016-08-16 00:10:47 +00:00
Lukas Reschke
6c6338b810
Merge branch 'master' into implement_712 2016-08-15 21:55:09 +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
Roeland Jago Douma
396678c9ce Merge pull request #855 from nextcloud/files_drop_capability 
Add files drop capability for clients
 2016-08-15 15:38:35 +02:00
Joas Schilling
b204af2f0f
Fix oracle support of external storage app 2016-08-15 12:03:53 +02:00
Nextcloud bot
f3124b5052
[tx-robot] updated from transifex 2016-08-15 00:12:16 +00:00
Roeland Jago Douma
092b767ef9
Move Apps to OCSController 2016-08-14 18:34:07 +02:00
Roeland Jago Douma
8f4adebab7
Move Users to OCSController 2016-08-14 18:34:02 +02:00
Roeland Jago Douma
432e7c93c6
Move Groups over to OCSController 
* Take advantage of the AppFramework
* Fix tests
 2016-08-14 18:34:01 +02:00
Roeland Jago Douma
0fdeefe47c
Add ProvisioningAPI middleware 
The provisioning API has 3 access levels:

* Admin
* SubAdmin
* User

This middleware adds a check for the SubAdmin part.
 2016-08-14 18:34:01 +02:00
Roeland Jago Douma
3b948f7694
Fix deprecated getMock warning 2016-08-14 15:45:45 +02:00
Nextcloud bot
241fc286c7
[tx-robot] updated from transifex 2016-08-14 00:10:34 +00:00
Roeland Jago Douma
9daf41e05a
Add files drop capability for clients 2016-08-13 14:02:09 +02:00
Nextcloud bot
4da01eeef6
[tx-robot] updated from transifex 2016-08-13 00:13:29 +00:00
Arthur Schiwon
158d78e1ab
move mail settings and file handling to additional ones, thus files_external gets its own section 2016-08-13 01:02:25 +02:00
Arthur Schiwon
d2fcac8300
change federatedfilesharing css class to followupsection to reduce whitespace 2016-08-13 00:36:32 +02:00
Arthur Schiwon
b99ecb3c23
move systemstags to sharign section, drop collaboration section 2016-08-13 00:33:09 +02:00
Arthur Schiwon
a133e7970d
make updatenotification settings appear as if it is part of the version part in server settings 2016-08-13 00:29:39 +02:00
Arthur Schiwon
7a2b96c7e6
change casing in section display names 2016-08-13 00:06:10 +02:00
Arthur Schiwon
0fdf801c25
fix theming tests 2016-08-12 16:58:59 +02:00
Arthur Schiwon
0c15081279
rename remaining occurences of OCA/Theming/Template 2016-08-12 16:00:39 +02:00
Bjoern Schiessle
18fd8ff70c
rename "Tenmplate" to "ThemingDefaults" to make the auto loader happy" 2016-08-12 15:32:28 +02:00
Arthur Schiwon
ac04ba6784
register app autoload instead of loading apps 2016-08-12 13:23:14 +02:00
Nextcloud bot
35358bdde0
[tx-robot] updated from transifex 2016-08-12 00:10:18 +00:00
Lukas Reschke
8261ccce1b
Merge branch 'master' into implement_712 2016-08-11 19:37:17 +02:00
Arthur Schiwon
3dfdc8e311
adjust systemtags app 2016-08-11 19:05:06 +02:00
Arthur Schiwon
3f9e1b3b45
adjust federation app 2016-08-11 18:53:45 +02:00
Arthur Schiwon
c0a2a1ff64
superfluous 2016-08-11 18:40:19 +02:00
Arthur Schiwon
30ff3ad45b
adjust files app, and integrate files_external into that section 2016-08-11 18:39:16 +02:00
Arthur Schiwon
36c1b7eb31
adjust Theming app 2016-08-11 17:29:58 +02:00
Arthur Schiwon
e8ea67139b
superfluous 2016-08-11 16:42:37 +02:00
Arthur Schiwon
a2f752bcf3
adjust files_external 2016-08-11 15:50:31 +02:00
Arthur Schiwon
5696c8aa35
adjust federatedfilesharing 2016-08-11 15:13:40 +02:00
Arthur Schiwon
14ddf9d923
rename IAdmin to ISettings, the interface is not bound to a specific settings scope 2016-08-11 14:48:21 +02:00
Nextcloud bot
f68f1d5f37
[tx-robot] updated from transifex 2016-08-11 12:08:42 +00:00
Nextcloud bot
56bf0a8399
[tx-robot] updated from transifex 2016-08-11 00:14:12 +00:00
Arthur Schiwon
f3b15a9ab9
fixes, improvements, and another app: 
* setupSettings now also triggered on enable
* fixes detection of present admin section or settings in the DB
* add update routine in such cases
* encryption app migrated
 2016-08-11 01:41:18 +02:00
Roeland Jago Douma
ba922c9f73 Merge pull request #807 from nextcloud/ocs_dataresponse 
OCSController requires DataResponse
 2016-08-10 22:36:25 +02:00
Lukas Reschke
67d016833d Merge pull request #810 from nextcloud/shared-cachethepropagatorinstance 
Store the shared propagator instance
 2016-08-10 17:24:57 +02:00
Lukas Reschke
8831d1f53b Merge pull request #808 from nextcloud/skip_expiry_for_users_that_never_logged_in 
Skip version and trash expiry for users that never logged in
 2016-08-10 16:31:11 +02:00
Lukas Reschke
7249f1340f Merge pull request #819 from nextcloud/theming-support-for-apps 
Theming support for apps
 2016-08-10 16:11:48 +02:00
Arthur Schiwon
1eb8b951c2
more admin page splitup improvements 
* bump version to ensure tables are created
* make updatenotification app use settings api
* change IAdmin::render() to getForm() and change return type from Template to TemplateResponse
* adjust User_LDAP accordingly, as well as built-in forms
* add IDateTimeFormatter to AppFramework/DependencyInjection/DIContainer.php. This is important so that \OC::$server->query() is able to resolve the
constructor parameters. We should ensure that all OCP/* stuff that is available from \OC::$server is available here. Kudos to @LukasReschke
* make sure apps that have settings info in their info.xml are loaded before triggering adding the settings setup method
 2016-08-10 15:21:25 +02:00
Björn Schießle
219f36d261 Merge pull request #820 from nextcloud/shared-storage-lazy-numeric-id 
get shared storage storage id without setting up the storage
 2016-08-10 14:56:41 +02:00
Julius Haertl
5f4e88ef6c
Theming: Add OCA.Theming Js for app interaction 2016-08-10 13:39:21 +02:00
Roeland Jago Douma
4006763f5b
Move the Share20OCS code over to use the proper DataResponse 2016-08-10 12:40:32 +02:00
Vincent Petry
412b5c5407
Store the shared propagator instance 
This instead of recreating it for every call.
 2016-08-10 10:57:49 +02:00
Jörn Friedrich Dreyer
d59cb04427
Skip version and trash expiry for users that never logged in 2016-08-10 10:51:51 +02:00
Nextcloud bot
d6bee61131
[tx-robot] updated from transifex 2016-08-10 00:09:59 +00:00
Arthur Schiwon
518545fc2f
Fallback for legacy settings. They are placed into Additional Settings 2016-08-09 23:30:07 +02:00
Julius Haertl
ef17f8b3ba
Add css classes to allow app developers using the theming colors 2016-08-09 22:54:25 +02:00
Arthur Schiwon
ceeb44bd04
Initial work on Apps page split: 
* interfaces for the Admin settings (IAdmin) and section (ISection)
* SettingsManager service
* example setup with LDAP app
 2016-08-09 18:05:09 +02:00
Roeland Jago Douma
edeb41ccaf Merge pull request #780 from nextcloud/copy_fed_cloud_id 
Add clipboard action to Personal Settings Fed Cloud Id
 2016-08-09 16:18:15 +02:00
Marius Blüm
352ec077a2 Merge pull request #789 from nextcloud/padding_federation 
Padding of federated servers
 2016-08-09 16:02:48 +02:00
Robin Appelman
a999420c75 get shared storage storage id without setting up the storage 2016-08-09 15:52:13 +02:00
Roeland Jago Douma
59a073c185
Padding of federated server 2016-08-09 14:42:01 +02:00
Marius Blüm
ba15687cc9 Merge pull request #767 from nextcloud/federation-error-messages 
improve federation error messages
 2016-08-09 14:28:11 +02:00
Roeland Jago Douma
6f37a65b77
Add clipboard action to Personal Settings Fed Cloud Id 2016-08-09 14:22:00 +02:00
Björn Schießle
5253af5664 Merge pull request #779 from nextcloud/slideup_addtowebsite 
Make 'Add to your website' toggleable
 2016-08-09 13:44:56 +02:00
Roeland Jago Douma
d8e8096eba
Make 'Add to your website' toggleable 2016-08-09 12:21:10 +02:00
Lukas Reschke
c04b0364ac Merge pull request #750 from nextcloud/workflow-cleanup 
Workflow cleanup
 2016-08-09 11:29:31 +02:00
Bjoern Schiessle
50044fb792
improve federation error messages 2016-08-09 10:24:45 +02:00
Nextcloud bot
3a26def7cf
[tx-robot] updated from transifex 2016-08-09 00:10:11 +00:00
Marius Blüm
a858c73357 Merge pull request #764 from nextcloud/fix-tags-icon 
Add black version of system tags icon
 2016-08-08 19:42:16 +02:00
Joas Schilling
81c30907e2
Disable by default 2016-08-08 16:45:40 +02:00
Joas Schilling
352e8b3c79
More casing 2016-08-08 16:45:40 +02:00
Joas Schilling
dae6432ae7
Increment the versions and adjust the capitilization 2016-08-08 16:45:40 +02:00
Lukas Reschke
70eef2a82e Merge pull request #445 from nextcloud/ocs_share_to_appframework 
OCS Share API to appframework
 2016-08-08 14:59:59 +02:00
Bugsbane
9a9b78252f Add black version of system tags icon 
Includes PNG (16x16px) and SVG (scoured) versions in black, to be uniform with the other icon files.
 2016-08-08 03:08:46 -04:00
Nextcloud bot
344916de15
[tx-robot] updated from transifex 2016-08-07 00:10:23 +00:00
Nextcloud bot
b80e3e70e5
[tx-robot] updated from transifex 2016-08-06 00:10:17 +00:00
Joas Schilling
94ac627c37
Allow a description for workflow sections 2016-08-05 15:18:15 +02:00
Joas Schilling
09f095d30f
Add placeholder to the name field 2016-08-05 15:15:27 +02:00
Joas Schilling
e3ed77adcf
Rename operations and checks 2016-08-05 15:14:40 +02:00
Joas Schilling
549f22ab62
Highlight the check row on hover 2016-08-05 15:13:22 +02:00
Joas Schilling
777504d0e0
Add some space between the rule groups 2016-08-05 15:12:57 +02:00
Roeland Jago Douma
0556e40d3e
Fix tests 2016-08-05 14:17:32 +02:00
Roeland Jago Douma
d9418c105e
Add OCSShareAPIMiddleware tests 2016-08-05 14:17:32 +02:00
Roeland Jago Douma
4504d7f5e9
DataResponse required ['data' => DATA] 2016-08-05 14:17:31 +02:00
Roeland Jago Douma
7fdc2f32fa
More exceptions 2016-08-05 14:17:31 +02:00
Roeland Jago Douma
3a31b2875b
Add OCSShareAPIMiddleware 
* This will cleanup the locks after each request
* Move check for enabled share api to the middleware
 2016-08-05 14:17:31 +02:00
Roeland Jago Douma
8b160077f1
Throw OCSNotFoundExceptions 2016-08-05 14:17:25 +02:00
Roeland Jago Douma
54f21bccdf
Remove unneeded wrapper 2016-08-05 14:17:25 +02:00
Roeland Jago Douma
a32caa4904
Convert Share API to use the AppFramework 2016-08-05 14:17:25 +02:00
Joas Schilling
f37fa6e45c
Move Share backends to PSR-4 instead of using class path (#24941) 2016-08-05 14:13:41 +02:00
Nextcloud bot
c44c9a55f4
[tx-robot] updated from transifex 2016-08-05 00:10:09 +00:00
Morris Jobke
e1807ed0a4 Merge pull request #465 from nextcloud/fix_smb_attributes 
Fix file permissions for SMB (read-only folders will be writeable) (#…
 2016-08-04 19:48:21 +02:00
Bernhard Posselt
d7c1bfb4ed fix #724 by using step instead of job 2016-08-04 13:32:03 +02:00
Nextcloud bot
258ee140a4
[tx-robot] updated from transifex 2016-08-04 00:11:51 +00:00
Joas Schilling
8ad79eb097 Merge pull request #611 from nextcloud/add-more-checks 
Add more checks
 2016-08-03 14:38:53 +02:00
Vincent Petry
2404f6a5a7
Make share target consistent when grouping group share with user share 
In some situations, a group share is created before a user share, and
the recipient renamed the received share before the latter is created.
In this situation, the "file_target" was already modified and the second
created share must align to the already renamed share.

To achieve this, the MountProvider now groups only by "item_source"
value and sorts by share time. This makes it so that the least recent
share is selected as super-share and its "file_target" value is then
adjusted in all grouped shares.

This fixes the issue where this situation would have different
"file_target" values resulting in two shared folders appearing instead
of one.
 2016-08-03 10:16:28 +02:00
Vincent Petry
0bddaa23b0
Added more tests for sharing's MountProvider 2016-08-03 10:16:28 +02:00
Vincent Petry
714d7ec936
Improved share grouping readability + fixed test 2016-08-03 10:16:28 +02:00
Roeland Jago Douma
04d5465228
Group shares with same source and target 
Fixes #24575

Note that this is a very limited solution and eventually we want smarter
merging!
 2016-08-03 10:16:28 +02:00
Nextcloud bot
0874460e48
[tx-robot] updated from transifex 2016-08-03 00:11:12 +00:00
Joas Schilling
bcf022c964
Ooops 2016-08-02 12:52:46 +02:00
Joas Schilling
4e5fb74773
Do not allow to delete/update group shares as a group member 2016-08-02 10:50:35 +02:00
Joas Schilling
248020f61f
No multi support, less magic 2016-08-02 10:50:21 +02:00
Joas Schilling
62d009ad09
Allow to define the operation 2016-08-02 10:50:21 +02:00
Nextcloud bot
5f83f4d9a8
[tx-robot] updated from transifex 2016-08-02 00:09:59 +00:00
Morris Jobke
dbf3ca5baf Merge pull request #682 from nextcloud/fix-theming-logo 
fix missing semicolon to fix themed logo on log in page
 2016-08-01 19:50:42 +02:00
Morris Jobke
32e5e48b0b Merge pull request #653 from nextcloud/animate-sidebar 
slight animation for the sidebar for better feedback what happens
 2016-08-01 18:21:31 +02:00
Joas Schilling
7c1560d787
Tags need to be loaded before 2016-08-01 18:09:22 +02:00
Joas Schilling
6aa5d674d6
Translate the errors 2016-08-01 17:56:33 +02:00
Joas Schilling
ea4c6bd285
Load the timezones via select2 2016-08-01 17:19:05 +02:00
Morris Jobke
2734ff7d4e
add a UI to render proper time picker 2016-08-01 17:19:05 +02:00
Joas Schilling
e0b5949a9f
Add request time 2016-08-01 17:19:05 +02:00
Joas Schilling
2cfd67e13b
Add remote address 2016-08-01 17:19:05 +02:00
Joas Schilling
1091cbb778
Add Request URL 2016-08-01 17:19:05 +02:00
Joas Schilling
477e79c2f2
User agent check 2016-08-01 17:19:05 +02:00
Joas Schilling
8a753342ee
Add file mime type 2016-08-01 17:19:04 +02:00
Joas Schilling
136a1a4223
Add file size as check 2016-08-01 17:19:04 +02:00
Joas Schilling
c6bf641ebe
Add system tag check 2016-08-01 17:19:04 +02:00
Joas Schilling
306d725bc3
Add the systemtag js files 2016-08-01 17:19:04 +02:00
Joas Schilling
6430164a09
Make sure each plugin is only added once 2016-08-01 17:19:01 +02:00
Björn Schießle
368e1c3f2b Merge pull request #685 from nextcloud/validate-theming-input 
Validate the input of the theming options
 2016-08-01 11:24:22 +02:00
Nextcloud bot
8ef5fcec1d
[tx-robot] updated from transifex 2016-08-01 08:53:07 +00:00
Jan-Christoph Borchardt
ad5e98c81a fix missing semicolon to fix themed logo on log in page 2016-08-01 09:57:05 +02:00
Lukas Reschke
f0b30d7260 Merge pull request #674 from nextcloud/action-menu-position 
remove extra file size padding to fix action menu position
 2016-08-01 09:40:48 +02:00
Joas Schilling
13c19e5286
Validate the input of the theming options 2016-08-01 09:37:12 +02:00
Nextcloud bot
50c8367041
[tx-robot] updated from transifex 2016-08-01 00:10:15 +00:00
blizzz
7bb9502d23 Merge pull request #595 from nextcloud/fix_slow_test 
Close session fast when doing a test to prevent blocking the next requests
 2016-07-31 17:29:22 +02:00
Nextcloud bot
2a2526e1d1
[tx-robot] updated from transifex 2016-07-31 00:09:54 +00:00
Jan-Christoph Borchardt
41519810e1 remove extra file size padding to fix action menu position 2016-07-30 18:30:07 +02:00
Julius Haertl
217b52085d
Fix javascript tests for sidebar animation 2016-07-30 16:30:05 +02:00
Nextcloud bot
2565a39361
[tx-robot] updated from transifex 2016-07-30 00:11:16 +00:00
Jan-Christoph Borchardt
696ff90cbe Merge pull request #625 from nextcloud/video-container-size 
up the minimum size of the public share video a bit, use 16/9 ratio
 2016-07-29 15:36:30 +02:00
Jan-Christoph Borchardt
748745d381 up the minimum size of the public share video a bit, use 16/9 ratio, fix #603 2016-07-29 10:47:00 +02:00
Thomas Müller
6f34c37cfb
Adding quota plugin to new dav endpoint (#25615) 
* Adding quota plugin to new dav endpoint

* Added integrated test failing in old endpoint

* Added 0B quota test
 2016-07-29 10:03:46 +02:00
Nextcloud bot
937577f7bc
[tx-robot] updated from transifex 2016-07-29 00:09:49 +00:00
Joas Schilling
5306b4feba
Fix tests 2016-07-28 17:49:08 +02:00
Joas Schilling
2de4112176
Update routes.php 2016-07-28 17:49:08 +02:00
Joas Schilling
2f574f60ec
Remove useless check 2016-07-28 17:49:08 +02:00
Joas Schilling
ba558664cf
Use the methods on the Response object 2016-07-28 17:49:08 +02:00
Joas Schilling
eec6986d7c
Use public API preferable 2016-07-28 17:49:08 +02:00
Joas Schilling
7efadf7b6b
Move classes to PSR-4 2016-07-28 17:49:08 +02:00
Morris Jobke
a1f02086e5 Merge pull request #636 from nextcloud/theming-fix 
fix background id selector for the first run wizard
 2016-07-28 17:42:46 +02:00
Morris Jobke
83c64f3485 Merge pull request #590 from nextcloud/fixing-undefined-OfflineUser-composeAndStoreDisplayName 
Fix undefined OfflineUser::composeAndStoreDisplayName()
 2016-07-28 17:41:02 +02:00
Lukas Reschke
bf7afcdace Merge pull request #592 from nextcloud/ldap-avoidneedlesssetemailonlogin 
Prevent setting email and triggering events at login time (#25553)
 2016-07-28 17:09:59 +02:00
Bjoern Schiessle
14ca7c9cdc
fix background id selector for the first run wizard 2016-07-28 16:32:39 +02:00
Morris Jobke
1e4266b076 Merge pull request #583 from nextcloud/issue-577-add-l10n 
Add L10N support
 2016-07-28 16:12:45 +02:00
Bjoern Schiessle
ee1be23b37
fix unit tests 2016-07-28 13:30:55 +02:00
Bjoern Schiessle
be365b4975
re-use background color from theme in the firstrunwizard 2016-07-28 12:16:39 +02:00
Bjoern Schiessle
583f86d90a
apply theme to the firstrunwizard 2016-07-28 12:15:33 +02:00
Jan-Christoph Borchardt
9ebd0914b7 Merge pull request #415 from nextcloud/theming-colorize-checkboxes 
Colorize checkboxes depending on theming color
 2016-07-28 11:12:39 +02:00
blizzz
73311091bf Merge pull request #519 from GitHubUser4234/master 
New LDAPProvider for user_ldap
 2016-07-28 10:14:34 +02:00
Lukas Reschke
abdf8c2c84 Merge pull request #494 from nextcloud/systemtag-management 
Add a simple Admin UI to manage systemtags
 2016-07-28 09:36:33 +02:00
root
bd65a17203 Nextcloud license header for new files 2016-07-28 15:13:00 +08:00
Nextcloud bot
ffa25ff74d
[tx-robot] updated from transifex 2016-07-28 00:11:51 +00:00
Julius Haertl
217b02aaa0
Theming: Cleanup and remove opacity from checkbox/radiobutton 2016-07-27 20:21:53 +02:00
Julius Haertl
cc457cd665
Theming: Generate colorized radio buttons dynamically 2016-07-27 20:00:23 +02:00
Julius Haertl
7ff19e342e
Theming: Colorize radio buttons and append new styles on preview 2016-07-27 20:00:23 +02:00
Julius Haertl
acd1172998
Theming: Clean up css generation and fix tests 2016-07-27 19:54:54 +02:00
Julius Haertl
d07f04e4f7
Theming: Colorize checkboxes depending on luminance 2016-07-27 19:45:57 +02:00
Julius Haertl
0acfbd5b47
Theming: Preview for colorized checkboxes 2016-07-27 19:45:57 +02:00
Julius Haertl
9ebe0c8d64
Colorize checkboxes depending on theming color 2016-07-27 19:45:57 +02:00
Morris Jobke
638f852ed8 Merge pull request #571 from nextcloud/no-missing-preview 
Don't try to load previews when we know there is none
 2016-07-27 15:48:40 +02:00
Joas Schilling
5bb35577db
Add a simple Admin UI to manage systemtags 2016-07-27 15:29:25 +02:00
Joas Schilling
62219c7b2d
Add L10N support 2016-07-27 14:56:21 +02:00
Joas Schilling
e6f4ba5929 Merge pull request #601 from nextcloud/fix-workflowengine-loading 
Fix loading icon for workflowengine
 2016-07-27 14:04:54 +02:00
Morris Jobke
e0beaf6643
Fix loading icon for workflowengine 2016-07-27 13:19:20 +02:00
Robin Appelman
c662e4b983 fix js test 2016-07-27 12:59:43 +02:00
Robin Appelman
6368506e57 only load sidebar previews when we know it's available 2016-07-27 12:59:43 +02:00
Robin Appelman
03c17ff614 dont load filelist previews if we know we dont have one 2016-07-27 12:59:43 +02:00
Robin Appelman
1fef5d3d06 add dav property to check if a file has a preview available 2016-07-27 12:59:39 +02:00
Joas Schilling
29a9cb7f1a
Allow to reuse the template 2016-07-27 12:29:49 +02:00
Joas Schilling
d47b7bd4b2
Fix default value of operator 2016-07-27 12:29:30 +02:00
Juan Pablo Villafáñez
12442f3270
Close session fast when doing a test to prevent blocking the next 
requests
 2016-07-27 11:41:34 +02:00
Vincent Petry
77df09d58a
Prevent setting email and triggering events at login time (#25553) 
Whenever an LDAP user also has an email address defined in LDAP, the
LDAP code will try and update the email address of the locally known
user. This happens at login time or every time the user's LDAP
attributes are processed.

There is code listening to the email setting hook which updates the
system address book, which also will trigger FS setup due to avatars
and other things.

This fix only sets the email address when really necessary.
 2016-07-27 11:28:33 +02:00
Thomas Müller
1177c70b9d
[stable9.1] Fix undefined OfflineUser::composeAndStoreDisplayName() - fixes #23248 2016-07-27 11:17:53 +02:00
Joas Schilling
a3d1cd4ad2
Fix morris comments 2016-07-27 10:38:03 +02:00
Joas Schilling
681eebcfe6
Remove php side of check registration 2016-07-27 10:21:26 +02:00
Joas Schilling
7588f648a1
Generate the checks list in JS 2016-07-27 10:21:26 +02:00
Joas Schilling
318d68a9a9 Merge pull request #565 from nextcloud/workflowengine 
Add workflowengine
 2016-07-27 10:07:20 +02:00
root
2719dcabed Merge branch 'master' of https://github.com/nextcloud/server 2016-07-27 15:17:29 +08:00
root
1c64ee67af comments amended 2016-07-27 15:16:57 +08:00
root
32fb6beac3 final changes 2016-07-27 15:10:35 +08:00
Nextcloud bot
95a0714973
[tx-robot] updated from transifex 2016-07-27 00:09:48 +00:00
blizzz
f88109be75 Merge pull request #349 from nextcloud/ldab-groupOfUniqueNames 
add groupOfUniqueNames as valid group object class
 2016-07-26 23:32:47 +02:00
Jan-Christoph Borchardt
b709d59a1e Add app icons for Comments and Tags (#579) 
* add icon for Comments app

* add icon for Tags app
 2016-07-26 19:42:54 +02:00
Morris Jobke
0e5114ddd7
Move template to workflowengine app 2016-07-26 14:35:01 +02:00
Morris Jobke
8c31ac57ce
create an operation based on the correct model 2016-07-26 12:03:16 +02:00
Morris Jobke
2f42a3fc31
Add workflowengine 2016-07-26 11:16:34 +02:00
Joas Schilling
cc5ddcf537 Merge pull request #525 from nextcloud/fix-theme-logo-position 
Fix theme logo position and shape
 2016-07-26 10:46:13 +02:00
Morris Jobke
3b6bba09d4 Merge pull request #557 from nextcloud/fix-css-scope-files-external 
Add proper scope to files external CSS
 2016-07-26 08:58:38 +02:00
Julius Haertl
d58ff68531
Theming: Fix preview and center alignment of logo 2016-07-25 18:54:13 +02:00
Morris Jobke
8fd7edb2c8
Add proper scope to files external CSS 
* for select2
 2016-07-25 17:55:05 +02:00
William Bargent
352e24e703 Merge pull request #292 from nextcloud/recent-files 
Add "Recent" file listing
 2016-07-25 15:25:02 +01:00
Morris Jobke
88cbde6a66 Merge pull request #550 from nextcloud/ldap-integration-test-autoloader 
fix autoloading in LPAP integration tests, resolves #544
 2016-07-25 12:54:50 +02:00
Arthur Schiwon
686cb599b6
fix autoloading in LPAP integration tests, resolves #544 2016-07-25 11:05:59 +02:00
root
1fb080df2b Merge branch 'master' of https://github.com/nextcloud/server 2016-07-25 16:56:14 +08:00
Robin Appelman
f18338d932 fix test 2016-07-25 10:41:53 +02:00
Morris Jobke
59b87fade5
Fix error message while restoring all files 
* use $_POST['files'] only of ssinlge files are restored
* fixes #528
 2016-07-25 09:24:32 +02:00
Nextcloud bot
7d969962db
[tx-robot] updated from transifex 2016-07-25 00:09:09 +00:00
Nextcloud bot
a20f4c432b
[tx-robot] updated from transifex 2016-07-24 00:09:10 +00:00
Nextcloud bot
e36decc12b
[tx-robot] updated from transifex 2016-07-23 00:09:06 +00:00
Jan-Christoph Borchardt
dd1a5b9ac3 Fix search box overlapping on mobile (#450) 
* fix searchbox overlapping on mobile

* also adjust log in background color in theme

* Fix unit tests
 2016-07-22 15:38:37 +02:00
Robin Appelman
2139a031e7 block user sorting in recent files 2016-07-22 15:20:55 +02:00
Robin Appelman
81e103074e use limit instead of since when listing recent files 2016-07-22 15:20:55 +02:00
Robin Appelman
a4ba3eadd0 fix test 2016-07-22 15:20:55 +02:00
Robin Appelman
2e3114cc28 Add recent file listing 2016-07-22 15:20:51 +02:00
Lukas Reschke
8457c617e0
Adjust tests 2016-07-22 14:58:30 +02:00
Robin Appelman
b94ff97a77 add recent files api endpoint 2016-07-22 14:48:51 +02:00
Joas Schilling
7400ff05ac
Also increase the min version 2016-07-22 14:46:52 +02:00
Robin Appelman
6062b6365b bumb compatible app versions for core apps 2016-07-22 13:04:23 +02:00
Jos Poortvliet
183d4d8e99 Update themingcontroller.php 2016-07-22 12:25:58 +02:00
Joas Schilling
194c385c7a Merge pull request #517 from nextcloud/fix-typo 
Fix typo in docs
 2016-07-22 11:41:20 +02:00
root
c1b37e4ccb Merge branch 'master' of https://github.com/nextcloud/server 2016-07-22 16:47:27 +08:00