76d8699c0f
Allow using '/' as external storage root
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-23 14:03:22 +01:00
f38d36a161
Merge pull request #3995 from nextcloud/files_scan_appdata
...
Add files:scanAppData command
2017-03-23 12:28:55 +01:00
1f210bf273
Merge pull request #3948 from nextcloud/downstream-27271
...
Tooltip in trashbin with previous location
2017-03-23 11:57:34 +01:00
1a80960a27
Merge pull request #3989 from nextcloud/files-external-save-button
...
replace autosave with a save button for external storage configuration
2017-03-23 11:55:36 +01:00
9e2588f2cb
Merge pull request #3999 from nextcloud/backport-27262
...
Updated UI messages relating to the encryption functionality
2017-03-23 00:25:59 -06:00
39ac804899
[tx-robot] updated from transifex
2017-03-23 01:07:52 +00:00
d7c9e2b841
Updated UI messages relating to the encryption functionality
...
The reason for updating these messages, is that grammatically they're
not quite correct. They showed a combination of:
- Related phrases, which could be either separated or joined better
- Related sentences, but which should be expressed as separate ones
They were also missing full-stops to end the them.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-22 18:06:55 -06:00
fb87aa61e7
fix path for files from root folder
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-22 17:17:37 -06:00
b26c8f8bd3
Use proper name and code style
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-22 15:59:55 -06:00
d551b8e6fd
[tx-robot] updated from transifex
2017-03-22 21:14:04 +00:00
e3f8e416e6
Add files:scanAppData command
...
Fixes https://github.com/nextcloud/server/issues/3041
Add a dedicated command to scan the special appdata dir
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 21:30:44 +01:00
4518a28924
Revert "Bundle vendor js"
2017-03-22 17:01:54 +01:00
11ee0b14bb
replace autosave with a save button for external storage configuration
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-22 14:32:26 +01:00
ec3f5aa6e2
Merge pull request #3795 from nextcloud/bundle_vendor_js
...
Bundle vendor js
2017-03-22 13:34:21 +01:00
d2a2cef4cc
Handlebars is already loaded by core.js
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 09:01:47 +01:00
16a0bccefa
Merge pull request #3972 from nextcloud/merge-some-more-css
...
Merge some CSS files using our SCSS compiler
2017-03-22 08:46:10 +01:00
cae8702ab2
[tx-robot] updated from transifex
2017-03-22 01:07:53 +00:00
20a0a18fbd
Fix reshare with user activity message
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-21 16:54:28 -06:00
1084cdb613
fix path
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-21 15:33:28 -06:00
d2b1b02244
Merge pull request #3937 from nextcloud/downstream-27234
...
fix typo in sftp public key
2017-03-21 13:18:19 -06:00
5c7ad6d3ec
Merge some CSS files using our SCSS compiler
...
This saves around 4 requests on the average page load.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-21 16:35:31 +01:00
d8e8d7b60e
[master] Fix branding
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-21 12:20:22 +01:00
7e95837097
Merge pull request #3955 from nextcloud/downstream-27113
...
Can we get some faster phpunit execution?
2017-03-21 11:27:00 +01:00
fd0e42e093
[tx-robot] updated from transifex
2017-03-21 01:08:16 +00:00
5bfce597a9
[CI] Can we get some faster phpunit execution? ( #27113 )
...
* Don't backup globals and static attributes
* Unset global variable to remove impact on followup tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 12:34:05 -06:00
abaf909ba2
Log access to preview images
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-20 18:36:36 +01:00
03a92eaf74
Merge pull request #3957 from nextcloud/downstream-27307
...
Follow up to #3949 (app exists on enable)
2017-03-20 18:10:05 +01:00
35f6b8716e
Merge pull request #3884 from nextcloud/downstream-26956
...
Skip null groups in group manager
2017-03-20 12:27:38 +01:00
25f772d592
Merge pull request #3868 from nextcloud/issue-3834-escape-theming-footer
...
Correctly escape the footer description from theming
2017-03-20 11:56:29 +01:00
ac1aff7d92
Merge pull request #3950 from nextcloud/downstream-27149
...
Forbid to upload part files via web UI
2017-03-20 11:44:57 +01:00
b3556456b6
Don't use private api
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-20 11:32:29 +01:00
1e61c17932
Fix grammar
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-20 11:08:39 +01:00
3abe86dade
Fix provisioning API call
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-20 10:45:27 +01:00
c4b6ff0bab
Merge pull request #3946 from nextcloud/downstream-27263
...
Fix public link download button (unit test only)
2017-03-20 10:23:29 +01:00
78ee125c34
Fix public link download button
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 02:39:46 -06:00
b8a8f43fce
Log files:scan exception, add InterruptedException
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 02:24:28 -06:00
11f838f9e4
Add ignore_files to config,
...
test files against ignore_files list on upload
fix typo and indentation
Move blacklist declaration to lib/public/Files/FileInfo.php,
Rename *ignored to *blacklisted
Mocked blacklist_files for testing
Mocked blacklist_files for testing
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 01:17:12 -06:00
17bed297db
In the real world id is an initial filename
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 00:06:32 -06:00
718d1f3f15
fix typo in sftp public key
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 22:44:09 -06:00
528a903a7b
[tx-robot] updated from transifex
2017-03-20 01:07:43 +00:00
ef789f8480
Merge pull request #3906 from nextcloud/shares-circles-2
...
Support Circles
2017-03-19 20:45:55 +01:00
6677963902
Merge pull request #3913 from cwickert/master
...
DummyGetResponsePlugin: ownCloud -> Nexcloud
2017-03-19 14:08:34 +01:00
1983606f80
[tx-robot] updated from transifex
2017-03-19 01:08:20 +00:00
07b35b7bae
DummyGetResponsePlugin: ownCloud -> Nexcloud
...
Signed-off-by: Christoph Wickert <cwickert@suse.de>
2017-03-18 12:59:25 +01:00
9e1e7dac47
[tx-robot] updated from transifex
2017-03-18 01:07:50 +00:00
69694012ab
shares-circles
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-03-17 18:48:33 -01:00
96ea85d01d
Merge pull request #3887 from nextcloud/downstream-26379
...
Add CleanupRemoteStorages command
2017-03-17 09:16:19 -06:00
bd97b7d130
Use DI
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 10:23:04 +01:00
5a8129f8ef
Merge pull request #3886 from nextcloud/downstream-26995
...
Chunking NG: Assemble in natural sort order of files
2017-03-17 10:05:25 +01:00
199405ddc0
Safer queries
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 09:59:56 +01:00
Robin Appelman
Lukas Reschke
Morris Jobke
Nextcloud bot
Matthew Setter
Roeland Jago Douma
Roeland Jago Douma
Joas Schilling
Thomas Müller
Christoph Wurst
Vincent Petry
Felix Heidecke
Victor Dubiniuk
Martin
Christoph Wickert
Maxence Lange