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

37833 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
f3917cfea1 Merge pull request #4053 from nextcloud/bump-zxcvbn 
[3rdparty] Bump zxcvbn
 2017-03-26 00:04:40 -06:00
Nextcloud bot
0981f9a18a
[tx-robot] updated from transifex 2017-03-26 01:07:03 +00:00
Roeland Jago Douma
b572cf8ec0
[3rdparty] Bump zxcvbn 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-25 20:56:20 +01:00
Roeland Jago Douma
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
Lukas Reschke
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
Nextcloud bot
4ea79a5bbe
[tx-robot] updated from transifex 2017-03-25 01:07:45 +00:00
Morris Jobke
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
Morris Jobke
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
Morris Jobke
8aedebff22 Merge pull request #4044 from nextcloud/merge-login-js 
Merge login JS
 2017-03-24 15:38:29 -06:00
Lukas Reschke
6a4fde11e6
Merge login JS 
Removes 2 requests.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-24 21:18:24 +01:00
Lukas Reschke
4f73911bab Merge pull request #4041 from nextcloud/merge-systemtags-js 
Merge systemtags JS
 2017-03-24 21:12:42 +01:00
Lukas Reschke
3623431ac3 Merge pull request #4040 from nextcloud/merge-js-for-versions 
Merge JS for files_versions
 2017-03-24 21:11:58 +01:00
Lukas Reschke
c628095ede Merge pull request #4042 from nextcloud/merge-js-forsharing-code 
Merge sharing backend JS
 2017-03-24 21:11:42 +01:00
Lukas Reschke
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
Lukas Reschke
4d68324ba6
Merge sharing backend JS 
Removes 8 requests.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-24 20:17:38 +01:00
Morris Jobke
84b6b1807f Merge pull request #4038 from nextcloud/merge-js-for-fileview 
Merge file view JS files
 2017-03-24 13:17:06 -06:00
Morris Jobke
773faa215b Merge pull request #4039 from nextcloud/merge-js-for-comments 
Merge JS for comments
 2017-03-24 13:16:38 -06:00
Lukas Reschke
a9c3692a9a
Merge systemtags JS 
Shaves off 7 requests.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-24 20:08:27 +01:00
Lukas Reschke
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
Lukas Reschke
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
Lukas Reschke
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
Vincent Petry
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
Lukas Reschke
2cd79a8d3d Merge pull request #3988 from nextcloud/jscombiner 
[PoC] JS Combiner
 2017-03-24 19:31:31 +01:00
Morris Jobke
94ab2e4029 Merge pull request #4021 from nextcloud/update-dependencies 
Update dependencies
 2017-03-24 11:10:20 -06:00
Morris Jobke
656528d6f8
Update dependencies 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-24 11:09:26 -06:00
Roeland Jago Douma
be6acbeb52
Update autoloader 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-24 16:11:54 +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
Roeland Jago Douma
677e11b1a4
Tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-24 11:31:48 +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
Roeland Jago Douma
b5299b1403
Add return 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-24 10:58:11 +01:00
Roeland Jago Douma
90910290d1
Add debug mode 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-24 10:58:11 +01:00
Roeland Jago Douma
242f8964cf
Add caching 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-24 10:58:11 +01:00
Roeland Jago Douma
48158c8bec
Combine additional files_sharing scripts 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-24 10:58:11 +01:00
Roeland Jago Douma
8e89ad21a2
[PoC] JS Combiner 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-24 10:58:10 +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