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
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
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
e5f9675a79
Merge pull request #4026 from nextcloud/appmenu-fix
...
Fix appmenu issues
2017-03-24 10:54:33 +01:00
f94bc6f8bb
Merge pull request #4013 from nextcloud/bundle_vendor_js
...
Bundle vendor js
2017-03-24 10:49:57 +01:00
22c58a6610
Fix appmenu issues
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-03-24 10:19:42 +01:00
df4d1f7b78
Merge pull request #4022 from nextcloud/downstream-27105
...
Remove auto-focus on certain input fields
2017-03-24 10:01:06 +01:00
34632de102
Merge pull request #4025 from nextcloud/downstream-27292
...
Update karma
2017-03-24 08:44:42 +01:00
1397b84777
Merge pull request #3928 from nextcloud/downstream-17978
...
Adjust 4 byte MySQL code to upstream
2017-03-23 23:45:43 -06:00
d197f609a8
Merge pull request #3889 from nextcloud/downstream-26950
...
Sharing dialog: make autocomplete sorting case insensitive
2017-03-23 23:45:28 -06:00
9bd4c406e3
also install sinon
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-23 23:42:54 -06:00
ab37577182
Properly clear heartbeat interval
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-23 23:37:24 -06:00
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
e18d928d9b
[tx-robot] updated from transifex
2017-03-24 01:08:00 +00:00
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
Nextcloud bot
Morris Jobke
Lukas Reschke
Vincent Petry
Roeland Jago Douma
Joas Schilling
Björn Schießle
Julius Härtl
Roeland Jago Douma
Felix Heidecke