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

37802 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Petry
43c081bdc9
Fix public link for master key 
In public link mode there is no session, so the code should use the
public key instead.
 2017-03-24 14:55:12 +01:00
Björn Schießle
b79211e4ae Merge pull request #3825 from nextcloud/federation-fixes 
create correct VCard and return correct error codes
 2017-03-24 14:33:03 +01:00
Bjoern Schiessle
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
Joas Schilling
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
Bjoern Schiessle
aa26a3ae74
use right format for avatars 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-03-24 11:06:44 +01:00
Bjoern Schiessle
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
Bjoern Schiessle
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
Bjoern Schiessle
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
Joas Schilling
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
Lukas Reschke
e5f9675a79 Merge pull request #4026 from nextcloud/appmenu-fix 
Fix appmenu issues
 2017-03-24 10:54:33 +01:00
Lukas Reschke
f94bc6f8bb Merge pull request #4013 from nextcloud/bundle_vendor_js 
Bundle vendor js
 2017-03-24 10:49:57 +01:00
Julius Härtl
22c58a6610
Fix appmenu issues 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-03-24 10:19:42 +01:00
Roeland Jago Douma
df4d1f7b78 Merge pull request #4022 from nextcloud/downstream-27105 
Remove auto-focus on certain input fields
 2017-03-24 10:01:06 +01:00
Roeland Jago Douma
34632de102 Merge pull request #4025 from nextcloud/downstream-27292 
Update karma
 2017-03-24 08:44:42 +01:00
Morris Jobke
1397b84777 Merge pull request #3928 from nextcloud/downstream-17978 
Adjust 4 byte MySQL code to upstream
 2017-03-23 23:45:43 -06:00
Morris Jobke
d197f609a8 Merge pull request #3889 from nextcloud/downstream-26950 
Sharing dialog: make autocomplete sorting case insensitive
 2017-03-23 23:45:28 -06:00
Morris Jobke
9bd4c406e3
also install sinon 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-23 23:42:54 -06:00
Vincent Petry
ab37577182
Properly clear heartbeat interval 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-23 23:37:24 -06:00
Vincent Petry
46a32045d7
Update karma, use sinon from npm 
Update karma library and use sinon JS library provided by
karma-jasmine-sinon instead of local file.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-23 23:35:41 -06:00
Nextcloud bot
e18d928d9b
[tx-robot] updated from transifex 2017-03-24 01:08:00 +00:00
Felix Heidecke
a9dc3239b3
Remove auto-focus on certain input fields 
* remove autofocus on input certain input fields if browser is msie
* Update sharedialoglinkshareview.js
* Update sharedialogview.js

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-23 17:34:50 -06:00
Morris Jobke
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
Morris Jobke
71c80433c2 Merge pull request #4007 from nextcloud/backport-27155 
Change showTemporary notifications for closable ones
 2017-03-23 15:56:18 -06:00
Morris Jobke
dbaebc53b0
fix sorting in the backend 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-23 15:41:25 -06:00
Morris Jobke
8a4466f9ae
Improve error message of charset convert script and behaviour 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-23 15:36:22 -06:00
Morris Jobke
a5a29ee27a Merge pull request #3953 from nextcloud/downstream-27027 
Ignore NoUserException for shares from ghosts
 2017-03-23 15:26:43 -06:00
Morris Jobke
b59f6dcca4 Merge pull request #3850 from nextcloud/search-order 
Fix search ordering
 2017-03-23 15:25:27 -06:00
Robin Appelman
2d02a4735c
Fix search ordering 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-23 15:24:50 -06:00
Morris Jobke
d2654c8aea Merge pull request #3965 from nextcloud/downstream-27343 
Providing --path option to transfer-ownership
 2017-03-23 15:20:53 -06:00
Roeland Jago Douma
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
noveens
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
Morris Jobke
eee7e97a6e Merge pull request #4001 from nextcloud/backport-27389 
Ensure that FileInfo return values as required by its phpdoc.
 2017-03-23 13:00:49 -06:00
Lukas Reschke
9039b71a23 Merge pull request #4000 from nextcloud/backport-27216 
allow configuring authType for DAV backend
 2017-03-23 19:28:49 +01:00
Joas Schilling
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
Joas Schilling
88015bc51f
Fix type hints and doc blocks 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-23 17:52:47 +01:00
Robin Appelman
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
Roeland Jago Douma
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
Roeland Jago Douma
588f47d498
Add CI step to verify merged vendor js 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-23 13:40:30 +01:00
Roeland Jago Douma
eda98ed3df
Merge vendor js 
There is a bunch of javascript we always load from vendors. This
combines this into 1 javascript file. Which reduces the number of
request by ~10.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-23 13:40:23 +01:00
Joas Schilling
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
Lukas Reschke
f38d36a161 Merge pull request #3995 from nextcloud/files_scan_appdata 
Add files:scanAppData command
 2017-03-23 12:28:55 +01:00
Lukas Reschke
1f210bf273 Merge pull request #3948 from nextcloud/downstream-27271 
Tooltip in trashbin with previous location
 2017-03-23 11:57:34 +01:00
Lukas Reschke
9675bbd830 Merge pull request #3978 from nextcloud/scss_deps_memcache 
Cache SCSS dependency file in memcache
 2017-03-23 11:56:35 +01:00
Lukas Reschke
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
Lukas Reschke
d6cff564f6 Merge pull request #3994 from nextcloud/only_init_backbone_once 
Only initialize backbone once
 2017-03-23 11:54:54 +01:00
Roeland Jago Douma
17cf8dc450 Merge pull request #3997 from nextcloud/backport-27353 
Update davclient.js to 0.1.1
 2017-03-23 08:36:23 +01:00
Morris Jobke
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
Piotr M
5c7079f8c6
Ensure that FileInfo return values as required by its phpdoc. 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-22 20:03:46 -06:00
Nextcloud bot
39ac804899
[tx-robot] updated from transifex 2017-03-23 01:07:52 +00:00
Jörn Friedrich Dreyer
9eca1da1dd
allow configuring authType for DAV backend 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-22 18:13:42 -06:00