2cd79a8d3d
Merge pull request #3988 from nextcloud/jscombiner
...
[PoC] JS Combiner
2017-03-24 19:31:31 +01:00
ee014bddbd
fix tests
...
calling getAbsoluteBundlePath() in the constructor makes other tests fail
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-24 11:27:01 +01:00
33867f331c
Load cert file before syncing addressbooks and contacts
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-24 11:06:44 +01:00
aa26a3ae74
use right format for avatars
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-24 11:06:44 +01:00
e637113452
don't add empty values to the vcard
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-24 11:06:44 +01:00
4531b4a81d
only execute code if exception was thrown by the corresponding controller
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-24 11:06:44 +01:00
faf836b0c0
fix the way we create a new vcard to avoid to have multiple UIDs
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-24 11:06:41 +01:00
48158c8bec
Combine additional files_sharing scripts
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 10:58:11 +01:00
35d3a082f2
Merge pull request #4010 from nextcloud/fac-58-mimetype-on-creating-directories
...
Fix workflow engine mimetype detection when creating a directory
2017-03-24 10:55:10 +01:00
f94bc6f8bb
Merge pull request #4013 from nextcloud/bundle_vendor_js
...
Bundle vendor js
2017-03-24 10:49:57 +01:00
e18d928d9b
[tx-robot] updated from transifex
2017-03-24 01:08:00 +00:00
49d0507f5d
Merge pull request #3879 from nextcloud/downstream-26915
...
Added integration tests for sharees using v2.php
2017-03-23 16:12:24 -06:00
71c80433c2
Merge pull request #4007 from nextcloud/backport-27155
...
Change showTemporary notifications for closable ones
2017-03-23 15:56:18 -06:00
a5a29ee27a
Merge pull request #3953 from nextcloud/downstream-27027
...
Ignore NoUserException for shares from ghosts
2017-03-23 15:26:43 -06:00
d2654c8aea
Merge pull request #3965 from nextcloud/downstream-27343
...
Providing --path option to transfer-ownership
2017-03-23 15:20:53 -06:00
6e6cbae37c
Merge pull request #3998 from nextcloud/backport-27032
...
Use the expected method depending on the target being a file or folder
2017-03-23 21:59:39 +01:00
40228c0c2b
added quit option in commentstabview.js
...
added quit option in notif in app.js
added quit option in notif in file-upload.js
added quit option in notif in fileinfomodel.js
added quit option in notif in filelist.js
added quit option in notif in filelist.js
added quit option in notif in tagsplugin.js
added quit option in notif in statusmanager.js
added quit option in notif in external.js
added quit option in notif in versionstabview.js
added quit option in notif in notification.js
changes according to the latest review.
timeout removed since there is a button to close it
translation capability added
typo fixed
test files updated
small errors fixed
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-23 13:12:29 -06:00
9039b71a23
Merge pull request #4000 from nextcloud/backport-27216
...
allow configuring authType for DAV backend
2017-03-23 19:28:49 +01:00
3c1e7e5ada
Make deleting a group compatible with ocs v2
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-23 19:24:02 +01:00
a12ec5ec77
set cache to failedcache when shared storage init fails
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-23 15:01:23 +01:00
03d688d6ac
Handlebars is already loaded by core.js
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-23 13:40:30 +01:00
394a61f1e6
Fix workflow engine mimetype detection when creating a directory
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-23 12:45:36 +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
9eca1da1dd
allow configuring authType for DAV backend
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-22 18:13:42 -06: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
713faa0fc0
Use the expected method depending on the target being a file or folder
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-22 18:02:09 -06:00
fbf3bfa3ea
improve file transfer code
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-22 17:40:36 -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
f654f29532
Providing --path option to transfer-ownership
...
This will help user to selectively move the folders
specified using --path option, instead of moving
entire folder under files directory.
Signed-off-by: Sujith H <sharidasan@owncloud.com>
Update the integration test for transfer-ownership
Update the integration test for transfer-ownership
as the new option --path is introduced in the command.
Signed-off-by: Sujith H <sharidasan@owncloud.com>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 18:29:21 -06: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
Lukas Reschke
Bjoern Schiessle
Joas Schilling
Roeland Jago Douma
Nextcloud bot
Morris Jobke
Roeland Jago Douma
noveens
Robin Appelman
Jörn Friedrich Dreyer
Matthew Setter
Juan Pablo Villafáñez
Sujith H
Thomas Müller