62827dd1da
use moments.js min in core.js
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-26 10:25:15 +02:00
68eaa1f1d2
[js] Bump momentjs
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-26 10:25:09 +02:00
329cee85d1
Update bundled core.js
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-26 09:35:08 +02:00
a847bad4aa
[js] Bump DOMPurify
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-26 09:34:32 +02:00
f3917cfea1
Merge pull request #4053 from nextcloud/bump-zxcvbn
...
[3rdparty] Bump zxcvbn
2017-03-26 00:04:40 -06:00
0981f9a18a
[tx-robot] updated from transifex
2017-03-26 01:07:03 +00:00
896dd76ab5
fix bug with shared_by for own calendars if shared
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-03-25 23:07:09 +01:00
b572cf8ec0
[3rdparty] Bump zxcvbn
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-25 20:56:20 +01:00
28b6929111
Merge pull request #4049 from nextcloud/fix-installation-again
...
Don't run JSCombiner when not installed
2017-03-25 19:22:38 +01:00
d81cdcbe88
Don't run JSCombiner when not installed
...
When the instance is not installed don't run the JSCombiner as the appdata folder does not yet exist.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-25 15:25:06 +01:00
4ea79a5bbe
[tx-robot] updated from transifex
2017-03-25 01:07:45 +00:00
ea8b61b61c
Merge pull request #4037 from nextcloud/downstream-27421
...
Use authType BASIC for Sabre client in integration tests
2017-03-24 17:30:24 -06:00
2f7669179e
Merge pull request #4043 from nextcloud/merge-js-for-template-prepend
...
Merge JS for template prepend
2017-03-24 15:42:08 -06:00
8aedebff22
Merge pull request #4044 from nextcloud/merge-login-js
...
Merge login JS
2017-03-24 15:38:29 -06:00
6a4fde11e6
Merge login JS
...
Removes 2 requests.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-24 21:18:24 +01:00
4f73911bab
Merge pull request #4041 from nextcloud/merge-systemtags-js
...
Merge systemtags JS
2017-03-24 21:12:42 +01:00
3623431ac3
Merge pull request #4040 from nextcloud/merge-js-for-versions
...
Merge JS for files_versions
2017-03-24 21:11:58 +01:00
c628095ede
Merge pull request #4042 from nextcloud/merge-js-forsharing-code
...
Merge sharing backend JS
2017-03-24 21:11:42 +01:00
6a470e5935
Merge JS for template prepend
...
Shaves off 14 requests.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-24 20:37:13 +01:00
4d68324ba6
Merge sharing backend JS
...
Removes 8 requests.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-24 20:17:38 +01:00
84b6b1807f
Merge pull request #4038 from nextcloud/merge-js-for-fileview
...
Merge file view JS files
2017-03-24 13:17:06 -06:00
773faa215b
Merge pull request #4039 from nextcloud/merge-js-for-comments
...
Merge JS for comments
2017-03-24 13:16:38 -06:00
a9c3692a9a
Merge systemtags JS
...
Shaves off 7 requests.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-24 20:08:27 +01:00
0ed56589cc
Merge JS for files_versions
...
Shaves off 3 requests.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-24 19:57:19 +01:00
bdd71b6081
Merge JS for comments
...
Shaves off 6 requests.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-24 19:49:43 +01:00
b70b138bdb
Merge file view JS files
...
Removes 26 requests on the file list loading
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-24 19:42:22 +01:00
c54091d43b
Use authType BASIC for Sabre client in integration tests
...
This helps massively reduce the numerous useless 401 exceptions that
appears in the test log. These appear only because Sabre first connects
without any auth type to receive the challenge and then sends the
authentication data.
With this change it will directly use basic auth.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-24 12:40:14 -06:00
2cd79a8d3d
Merge pull request #3988 from nextcloud/jscombiner
...
[PoC] JS Combiner
2017-03-24 19:31:31 +01:00
94ab2e4029
Merge pull request #4021 from nextcloud/update-dependencies
...
Update dependencies
2017-03-24 11:10:20 -06:00
656528d6f8
Update dependencies
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-24 11:09:26 -06:00
be6acbeb52
Update autoloader
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 16:11:54 +01:00
4174d75f86
Throw a nice HintException when the apps are missing
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-24 15:02:49 +01:00
6b9ef15803
Use master key for public links as well
2017-03-24 14:55:42 +01:00
305718370a
Add tests for null user
2017-03-24 14:55:33 +01:00
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
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
bc11c7ba97
Allow to use short URLs for calls
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-24 11:52:42 +01:00
34f0ad4ebe
Allow to push a non-query URL to the browser history
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-24 11:51:58 +01:00
677e11b1a4
Tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 11:31:48 +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
b5299b1403
Add return
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 10:58:11 +01:00
90910290d1
Add debug mode
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 10:58:11 +01:00
242f8964cf
Add caching
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 10:58:11 +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
8e89ad21a2
[PoC] JS Combiner
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 10:58:10 +01:00
Roeland Jago Douma
Morris Jobke
Nextcloud bot
Georg Ehrke
Roeland Jago Douma
Lukas Reschke
Vincent Petry
Joas Schilling
Björn Schießle