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

38634 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christoph Wurst
e3efc4979b Show mail address in popover menu 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-04-25 20:47:17 +02:00
Christoph Wurst
d091793ceb Contacts menu 
* load list of contacts from the server
* show last message of each contact

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-04-25 20:47:17 +02:00
Jan-Christoph Borchardt
61af3f41f0
Fix auth flow background color and redirect view layout 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-25 20:18:49 +02:00
Roeland Jago Douma
aae079aa29
AppToken to 72 chars 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-25 20:18:49 +02:00
Roeland Jago Douma
bb5e5efa6d
Do not remove the state token to early 
we should check the stateToken before we remove it. Else the check will
always fail.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-25 20:18:49 +02:00
Roeland Jago Douma
05e1092c44
Correctly case the stateToken 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-25 20:18:49 +02:00
Lukas Reschke
6a16df7288
Add new auth flow 
This implements the basics for the new app-password based authentication flow for our clients.
The current implementation tries to keep it as simple as possible and works the following way:

1. Unauthenticated client opens `/index.php/login/flow`
2. User will be asked whether they want to grant access to the client
3. If accepted the user has the chance to do so using existing App Token or automatically generate an app password.

If the user chooses to use an existing app token then that one will simply be redirected to the `nc://` protocol handler.
While we can improve on that in the future, I think keeping this smaller at the moment has its advantages. Also, in the
near future we have to think about an automatic migration endpoint so there's that anyways :-)

If the user chooses to use the regular login the following happens:

1. A session state token is written to the session
2. User is redirected to the login page
3. If successfully authenticated they will be redirected to a page redirecting to the POST controller
4. The POST controller will check if the CSRF token as well as the state token is correct, if yes the user will be redirected to the `nc://` protocol handler.

This approach is quite simple but also allows to be extended in the future. One could for example allow external websites to consume this authentication endpoint as well.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-25 20:18:49 +02:00
Lukas Reschke
db94b5d4af Merge pull request #4439 from nextcloud/appmenu-responsive 
Responsive app menu
 2017-04-25 19:42:01 +02:00
Stefan Weil
8ba67fbe1e Add test code for new image mime types 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2017-04-25 19:22:46 +02:00
Stefan Weil
c9e08a6445 Add repair steps for new image mime types 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2017-04-25 18:56:23 +02:00
Stefan Weil
eb7e4d48c9 Add mimetypes for jp2 and webp 
Those image formats can be processed by Tesseract, so they are needed
for improved Nextcloud OCR.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2017-04-25 18:43:39 +02:00
Joas Schilling
5334a3dc33
fix objectstore rename 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-25 17:52:05 +02:00
Lukas Reschke
16c8fdece3
Remove DOMPurify from srcFiles 
It is already included via core.json

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-25 12:50:15 -03:00
Jan-Christoph Borchardt
3bb41f4144 Move h2 and settings-hint together 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-25 17:47:23 +02:00
Morris Jobke
51da0442d9 Merge pull request #4494 from nextcloud/fix-jsunit 
Fix JS unit failure because of Jasmine 2.6 and the phantomjs launcher
 2017-04-25 12:45:52 -03:00
Jan-Christoph Borchardt
bbb58625fe Wording fixes 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-25 17:45:35 +02:00
Jan-Christoph Borchardt
4e537b5d6b Small layout fixes to settings hints 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-25 17:45:35 +02:00
Frank Karlitschek
f62b75b2b8 change the headline as suggested 2017-04-25 17:45:35 +02:00
Frank Karlitschek
c300d9b225 one more hint 2017-04-25 17:45:35 +02:00
Frank Karlitschek
5e1ce69b05 adding some documentation hints and some smaller cleanup 2017-04-25 17:45:35 +02:00
Julius Härtl
27b19aaba1
Fix loading spinner for new app menu 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-04-25 17:31:25 +02:00
Julius Härtl
673b58ef09
Fix adding/removing apps 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-04-25 17:31:24 +02:00
Julius Härtl
7548825743
Responsive app menu 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-04-25 17:31:24 +02:00
Vincent Petry
1c40a05204
Restrict proppatch to the proper nodes 
Need to fetch the node earlier because cancelling from within the
handler is not possible. Well, it is but it prevents other node types
using the same property names to run because the failure marks the
property with status 403.
 2017-04-25 17:25:03 +02:00
Joas Schilling
5ee445c54b
Audit log for enabling/disabling a user 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-25 17:20:35 +02:00
Joas Schilling
ac0c21f4a7
Trigger change when a user is enabled/disabled 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-25 17:20:35 +02:00
Victor Dubiniuk
131df248ef
Catch session already closed exception in destructor 2017-04-25 16:28:52 +02:00
Joas Schilling
8ef25a7628 Merge pull request #4490 from GitHubUser4234/audit_log_group_creation_deletion 
Audit group creation/deletion
 2017-04-25 16:14:52 +02:00
Morris Jobke
5a9224fb4c Merge pull request #3531 from nextcloud/theming-scss 
Theming using SCSS variables
 2017-04-25 10:56:13 -03:00
Morris Jobke
bcf587542c Merge pull request #4485 from nextcloud/translation-checker 
Check whether we can json decode the translations
 2017-04-25 10:46:51 -03:00
Morris Jobke
dd5dbe3ebd
Fix JS unit failure because of Jasmine 2.6 and the phantomjs launcher 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-25 10:26:46 -03:00
Morris Jobke
6f2df5e495 Merge pull request #3195 from nextcloud/settings-apps-tabular 
Make apps settings tabular
 2017-04-25 10:25:29 -03:00
Arthur Schiwon
43f451e9e0
Fix usersInGroup retrieval 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-04-25 15:07:05 +02:00
Joas Schilling
7ea492b69a
Loop over the apps directory and add the task 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-25 14:35:51 +02:00
Joas Schilling
f1ffb728b9
Allow meta info and icons 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-25 14:31:21 +02:00
Roeland Jago Douma
82c9eb1c56 Merge pull request #4462 from danxuliu/fix-sharing-password-protected-link 
Fix sharing a password protected link
 2017-04-25 14:12:44 +02:00
blizzz
026070a2fc Merge pull request #4484 from nextcloud/fix/logincontroller-redirect-url-failed-login 
Fix remember redirect_url on failed login attempts
 2017-04-25 13:15:53 +02:00
Roger Szabo
f1522a8dca 4190 
Signed-off-by: Roger Szabo <roger.szabo@web.de>
 2017-04-25 19:06:49 +08:00
Arthur Schiwon
685faad5ca
fix method name due to changes in master 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-04-25 13:03:08 +02:00
Arthur Schiwon
b1d646640a
Merge branch 'master' of https://github.com/Xuanwo/server into Xuanwo-master2 2017-04-25 12:42:17 +02:00
Joas Schilling
6448cf5748
Mock it 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-25 12:16:07 +02:00
Joas Schilling
bedd500884
Logo and background URLs must be relative 
They are used way to often for such a change

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-25 11:43:06 +02:00
Julius Härtl
bc1efdf2e1
Fix theming tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-04-25 11:39:49 +02:00
Julius Härtl
1c54463853
Use theming cachebuster for server resources 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-04-25 11:39:49 +02:00
Julius Haertl
68a63ad3f3
Implement scss variable injection by OC_Defaults 
Signed-off-by: Julius Haertl <jus@bitgrid.net>

Add Scss variables to example theme and theming app

Signed-off-by: Julius Haertl <jus@bitgrid.net>

Use SCSSCacher to build theming css

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Update theming.scss

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Code cleanup

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Fix tests

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Inject SCSSCacher for easier testing

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Fix typehint

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Generate absolute URLs

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Fix tests to always use absolute urls for theming images

Signed-off-by: Julius Härtl <jus@bitgrid.net>

MailheaderColor -> ColorPrimary

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-25 11:39:45 +02:00
Joas Schilling
5be1010d45
Fix invalid character 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-25 11:06:27 +02:00
Joas Schilling
dee2c8d23b
Check whether we can json decode the translations 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-25 11:01:34 +02:00
Christoph Wurst
bb1d191f82
Fix remember redirect_url on failed login attempts 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-04-25 09:38:19 +02:00
Xuanwo
8db21ad8c8 user_ldap: Add support for gidNumber 
This patch is based on the work of @dleeuw (https://github.com/dleeuw)
(See https://github.com/nextcloud/server/issues/2640#issuecomment-269615883 for more details).
The difference is user & group data will be written into cache to have
better performance, and functions splited from primaryGroupID series to
make them more readable.

Fixed https://github.com/nextcloud/server/issues/2640

Signed-off-by: Xuanwo <xuanwo@yunify.com>
 2017-04-25 10:06:47 +08:00
Nextcloud bot
133f3fdc9a
[tx-robot] updated from transifex 2017-04-25 00:07:30 +00:00