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

43786 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
245d20f9ac
Merge pull request #9531 from remyj38/master 
Fix translation bug on lost password page
 2018-05-22 16:31:30 +02:00
Jan-Christoph Borchardt
cbe5c193d0
Merge pull request #9538 from nextcloud/bugfix/noid/active-indicator-width 
Increase width of other active navigation indicators to 4px
 2018-05-22 15:53:42 +02:00
Roeland Jago Douma
0c7a797652
Merge pull request #9544 from nextcloud/bugfix/noid/fix-phpdoc 
Fix PHPDoc
 2018-05-22 15:39:07 +02:00
Morris Jobke
8c043dd00d
Remove ellipsis below public text file shares 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-05-22 15:14:23 +02:00
Morris Jobke
96efc42584
Fix PHPDoc 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-05-22 15:11:32 +02:00
John Molakvoæ (skjnldsv)
760b01e8db
Fix api error 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-05-22 10:33:48 +02:00
Roeland Jago Douma
57d4a16cfb
Merge pull request #9517 from nextcloud/feature/noid/improve_oauth_handling 
Improve OAuth handling
 2018-05-22 10:16:45 +02:00
Roeland Jago Douma
6fac639747
Merge pull request #9520 from nextcloud/3rdparty/noid/bump_phpseclib 
[3rdparty] Bump phpseclib to 2.0.11
 2018-05-22 09:24:53 +02:00
Roeland Jago Douma
461998dd15
Add tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-22 09:24:17 +02:00
Roeland Jago Douma
5a97148863
Don't use special chars to avoid confusion 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-22 09:24:17 +02:00
Roeland Jago Douma
f7ecec855b
Rotate token 
On a refresh token request:
* rorate
* reset expire

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-22 09:24:17 +02:00
Roeland Jago Douma
c28b25c4f0
Authenticate the clients on requesting a token 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-22 09:24:17 +02:00
Roeland Jago Douma
4e3aef22a1
Fail if the response type is not properly set 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-22 09:24:17 +02:00
Roeland Jago Douma
49795d2006
Set OAuth token expiration 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-22 09:24:17 +02:00
Roeland Jago Douma
bbcb36cd60
Merge pull request #9513 from nextcloud/3rdparty/noid/bump_autosize 
Bump autosize to 4.0.2
 2018-05-22 09:22:39 +02:00
Roeland Jago Douma
d4464cc3ef
Merge pull request #9515 from nextcloud/bugfix/noid/reset_session_when_auth_against_protected_share 
Regenerate session id after public share auth
 2018-05-22 09:21:39 +02:00
Julius Härtl
3c011c6d50
Increase width of other active navigation indicators to 4px 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-05-22 09:03:31 +02:00
Nextcloud bot
0d90c5ebc4
[tx-robot] updated from transifex 2018-05-22 00:13:31 +00:00
Nextcloud bot
7161d8eaee
[tx-robot] updated from transifex 2018-05-21 00:13:41 +00:00
Rémy Jacquin
04e1cab5ee
Fix translation bug on lost password page 
Fix nextcloud/password_policy#26

Signed-off-by: Rémy Jacquin <remy@remyj.fr>
 2018-05-20 12:51:50 +02:00
Nextcloud bot
ca089b9412
[tx-robot] updated from transifex 2018-05-20 00:13:24 +00:00
Nextcloud bot
e2f1f7b8f5
[tx-robot] updated from transifex 2018-05-19 00:13:41 +00:00
John Molakvoæ
b7fa89800d
Merge pull request #9521 from nextcloud/add-firefox-profile-with-support-for-css-grid-to-acceptance-tests 
Add Firefox profile with support for CSS grid to acceptance tests
 2018-05-19 00:29:47 +02:00
Roeland Jago Douma
03a6f8e14e
Merge pull request #9490 from marco44/faster_large_filehelper_32bits 
Make LargeFileHelper.php faster by avoiding execs as much as possible
 2018-05-18 21:09:17 +02:00
John Molakvoæ (skjnldsv)
16af12e0a0
Fixed webpack config, groups flex thanks to @juliushaertl and groups tooltip 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-05-18 17:47:10 +02:00
Daniel Calviño Sánchez
cb20503341 Add Firefox profile with support for CSS grid to acceptance tests 
The acceptance tests are currently run on Firefox 47; in that version
the CSS grid support was not enabled by default, but it could be enabled
through a setting in the Firefox profile.

By default Selenium uses a clean Firefox profile when a new session is
started, but it also allows the customization of the profile through a
zipped "user.js" file. The contents of that file have to be provided in
the "firefox_profile" capability when the Firefox session is created.

In the Mink extension for Behat several Mink sessions can be defined in
the "behat.yml" file. Each Mink session uses a different browser session
in Selenium, and each of those browser sessions is initialized with the
capabilities provided in the "behat.yml" file.

From the point of view of the acceptance tests each Mink session is an
actor, so different actors can use different browsers with different
capabilities.

Due to all this a new actor was introduced, "Rubeus", who uses a Firefox
browser that has CSS grid support; this actor is meant to be used only
in those acceptance tests that require proper support for CSS grids.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-05-18 17:44:43 +02:00
John Molakvoæ (skjnldsv)
38b1020f52
Bump webpack, config, deps, fixes groups selects, improved design and added tooltip to groups +x indicator 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-05-18 16:39:34 +02:00
Roeland Jago Douma
2cd633f21f
[3rdparty] Bump phpseclib to 2.0.11 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-18 12:55:40 +02:00
Roeland Jago Douma
9cc15bc9b0
Merge pull request #9508 from nextcloud/3rdparty/noid/bump_symfony 
[3rdparty] Bump symfony components
 2018-05-18 11:40:35 +02:00
Nextcloud bot
514b374923
[tx-robot] updated from transifex 2018-05-18 00:13:45 +00:00
Roeland Jago Douma
d6d0e60136
Regenerate session id after public share auth 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-17 22:07:20 +02:00
Roeland Jago Douma
9236c20a28
Merge pull request #9437 from nextcloud/feature/noid/imprint 
allow to specify a link to a legal notice
 2018-05-17 21:16:03 +02:00
Roeland Jago Douma
8696651cfb
Merge pull request #9491 from nextcloud/feature/noid/tokens_can_expire 
Allow token to expire
 2018-05-17 20:07:08 +02:00
Roeland Jago Douma
4a19079b06
Bump autosize to 4.0.2 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-17 16:42:16 +02:00
Roeland Jago Douma
c7ffb66b2c
[3rdparty] Bump symfony components 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-17 16:32:42 +02:00
Roeland Jago Douma
6b7cf46727
Certain tokens can expire 
However due to the nature of what we store in the token (encrypted
passwords etc). We can't just delete the tokens because that would make
the oauth refresh useless.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-17 16:10:19 +02:00
Morris Jobke
9f064b08b3
Merge pull request #9507 from nextcloud/dep/noid/update_dompurify_1_0_4 
Bump DOMPurify to 1.0.4
 2018-05-17 16:02:38 +02:00
Morris Jobke
63d5491a73
Merge pull request #9503 from nextcloud/bugfix/noid/theming-mime-check 
Check mime type properly in theming app
 2018-05-17 15:48:44 +02:00
marco44
32fd0919c1 Make LargeFileHelper.php faster by avoiding execs as much as possible 
Signed-off-by: Marc Cousin <cousinmarc@gmail.com>
 2018-05-17 14:28:32 +02:00
Roeland Jago Douma
972bc9491a
Bump DOMPurity to 1.0.4 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-17 13:24:00 +02:00
Julius Härtl
5b3ca8f7c6
Add Content-Disposition header 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-05-17 12:21:57 +02:00
Julius Härtl
2bf51c7b9e
Properly check mime type of the uploaded file 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-05-17 11:46:01 +02:00
Nextcloud bot
ef665fde42
[tx-robot] updated from transifex 2018-05-17 00:13:46 +00:00
Roeland Jago Douma
81ab924389
Merge pull request #9484 from nextcloud/feature/noid/support_rotating_tokens 
Allow the rotation of tokens
 2018-05-16 20:03:00 +02:00
Roeland Jago Douma
aba255997a
Allow the rotation of tokens 
This for example will allow rotating the apptoken for oauth

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-16 19:27:19 +02:00
Morris Jobke
0011bfb64b
Merge pull request #9475 from nextcloud/bug/9469/delete_preview_on_version_restore 
Delete the previews when a version is restored
 2018-05-16 11:37:12 +02:00
John Molakvoæ (skjnldsv)
746f3c9053
Proper error message and group order fix in select 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-05-16 09:50:25 +02:00
John Molakvoæ (skjnldsv)
e23e28b3cc
Various fixes 
* Fixed  subadmin group management
* Fixed pass policy prop retrieving
* Fixed fields subadmins were not supposed to see

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-05-16 09:50:25 +02:00
John Molakvoæ (skjnldsv)
bcffbab6f8
IE11 compatibility 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-05-16 09:50:24 +02:00
John Molakvoæ (skjnldsv)
549940ddb9
Fixed root url detection, new tests, default new user group to current 
opened group and user removal update fix

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-05-16 09:50:24 +02:00