]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agoAdd more hints to settings 4540/head
Jan-Christoph Borchardt [Wed, 26 Apr 2017 20:43:58 +0000 (22:43 +0200)]
Add more hints to settings

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoMerge pull request #4518 from nextcloud/downstream-25838
Roeland Jago Douma [Wed, 26 Apr 2017 17:23:27 +0000 (19:23 +0200)]
Merge pull request #4518 from nextcloud/downstream-25838

Fix share indicator handling

7 years agoMerge pull request #4374 from nextcloud/contactsmenu_popover
Lukas Reschke [Wed, 26 Apr 2017 16:31:17 +0000 (18:31 +0200)]
Merge pull request #4374 from nextcloud/contactsmenu_popover

add contacts popover

7 years agoMerge pull request #4503 from nextcloud/downstream-27281
Roeland Jago Douma [Wed, 26 Apr 2017 15:17:24 +0000 (17:17 +0200)]
Merge pull request #4503 from nextcloud/downstream-27281

fix objectstore rename

7 years agoMerge pull request #4516 from nextcloud/downstream-27527
Roeland Jago Douma [Wed, 26 Apr 2017 14:59:03 +0000 (16:59 +0200)]
Merge pull request #4516 from nextcloud/downstream-27527

OCC scanner commit in batches

7 years agoMerge pull request #4512 from nextcloud/fix-translations-2
Morris Jobke [Wed, 26 Apr 2017 11:57:08 +0000 (08:57 -0300)]
Merge pull request #4512 from nextcloud/fix-translations-2

Fix translations

7 years agoFix share indicator handling 4518/head
Vincent Petry [Wed, 17 Aug 2016 10:25:58 +0000 (12:25 +0200)]
Fix share indicator handling

Properly update the fileInfoModel with the updated share types, which
also updates the file list row indicator properly

7 years agoFix scanner after review 4516/head
Vincent Petry [Mon, 3 Apr 2017 09:49:30 +0000 (11:49 +0200)]
Fix scanner after review

7 years agoOCC scanner commit in batches
Vincent Petry [Tue, 28 Mar 2017 17:18:58 +0000 (19:18 +0200)]
OCC scanner commit in batches

7 years agoMerge pull request #4430 from nextcloud/refactor-auth
Roeland Jago Douma [Wed, 26 Apr 2017 08:41:53 +0000 (10:41 +0200)]
Merge pull request #4430 from nextcloud/refactor-auth

Improve readability of login logic

7 years agoMerge pull request #4478 from nextcloud/improve_settings_help
Joas Schilling [Wed, 26 Apr 2017 07:45:01 +0000 (09:45 +0200)]
Merge pull request #4478 from nextcloud/improve_settings_help

adding some documentation hints and some smaller cleanup

7 years agoFix email vs mail 4512/head
Joas Schilling [Wed, 26 Apr 2017 07:33:18 +0000 (09:33 +0200)]
Fix email vs mail

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoUse correct plural form and add special strings for tomorrow and today
Joas Schilling [Wed, 26 Apr 2017 07:27:55 +0000 (09:27 +0200)]
Use correct plural form and add special strings for tomorrow and today

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agohandle 404 separately 4374/head
Georg Ehrke [Tue, 25 Apr 2017 20:01:56 +0000 (22:01 +0200)]
handle 404 separately

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
7 years agounit test jquery.contactsmenu
Georg Ehrke [Mon, 24 Apr 2017 20:34:33 +0000 (22:34 +0200)]
unit test jquery.contactsmenu

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
7 years agofix CommentsTabsView js test
Georg Ehrke [Mon, 24 Apr 2017 19:04:05 +0000 (21:04 +0200)]
fix CommentsTabsView js test

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
7 years agofix ContactsStoreTest
Georg Ehrke [Mon, 24 Apr 2017 18:54:33 +0000 (20:54 +0200)]
fix ContactsStoreTest

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
7 years agoadd contactsmenu popover to comments
Georg Ehrke [Mon, 24 Apr 2017 17:52:45 +0000 (19:52 +0200)]
add contactsmenu popover to comments

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
7 years agobetter detection whether or not contactsmenu target was clicked
Georg Ehrke [Mon, 24 Apr 2017 13:32:51 +0000 (15:32 +0200)]
better detection whether or not contactsmenu target was clicked

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
7 years agoadd contactsmenu popover to resharer infobox
Georg Ehrke [Mon, 24 Apr 2017 13:31:44 +0000 (15:31 +0200)]
add contactsmenu popover to resharer infobox

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
7 years agoContactsmenu popover: show proper message when server throws error
Georg Ehrke [Mon, 24 Apr 2017 11:09:24 +0000 (13:09 +0200)]
Contactsmenu popover: show proper message when server throws error

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
7 years agodon't toggle sharing popover together with contactsmenu popover
Georg Ehrke [Mon, 24 Apr 2017 11:04:49 +0000 (13:04 +0200)]
don't toggle sharing popover together with contactsmenu popover

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
7 years agoFix past tense
Joas Schilling [Wed, 26 Apr 2017 07:27:41 +0000 (09:27 +0200)]
Fix past tense

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoclose menu again when clicking on avatar
Georg Ehrke [Mon, 24 Apr 2017 11:03:52 +0000 (13:03 +0200)]
close menu again when clicking on avatar

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
7 years agoadd contactsmenu popover
Georg Ehrke [Mon, 24 Apr 2017 09:39:03 +0000 (11:39 +0200)]
add contactsmenu popover

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
7 years agoMerge pull request #4467 from nextcloud/lists-for-html-mails
Roeland Jago Douma [Wed, 26 Apr 2017 06:30:30 +0000 (08:30 +0200)]
Merge pull request #4467 from nextcloud/lists-for-html-mails

Add lists to HTML emails

7 years agoMerge pull request #4061 from nextcloud/downstream-26407
Roeland Jago Douma [Wed, 26 Apr 2017 06:27:30 +0000 (08:27 +0200)]
Merge pull request #4061 from nextcloud/downstream-26407

Redis cluster support

7 years agoMerge pull request #4500 from nextcloud/downstream-27118
Morris Jobke [Wed, 26 Apr 2017 04:28:16 +0000 (01:28 -0300)]
Merge pull request #4500 from nextcloud/downstream-27118

Restrict proppatch to the proper nodes

7 years agoMerge pull request #4416 from gvmura/avoid-duplicate-files-google
Morris Jobke [Wed, 26 Apr 2017 04:26:04 +0000 (01:26 -0300)]
Merge pull request #4416 from gvmura/avoid-duplicate-files-google

Avoid duplicate files in google with the same name

7 years agoMerge pull request #4449 from stweil/mimetypes
Morris Jobke [Wed, 26 Apr 2017 04:22:49 +0000 (01:22 -0300)]
Merge pull request #4449 from stweil/mimetypes

Add mimetypes for jp2 and webp

7 years agoRefactor auth methods 4430/head
Jörn Friedrich Dreyer [Fri, 20 Jan 2017 09:46:29 +0000 (10:46 +0100)]
Refactor auth methods

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4486 from nextcloud/fix-js-unit
Morris Jobke [Wed, 26 Apr 2017 01:39:55 +0000 (22:39 -0300)]
Merge pull request #4486 from nextcloud/fix-js-unit

Remove DOMPurify from srcFiles

7 years agoMerge pull request #4489 from nextcloud/ldap-gidnumber-sprt-xuanwo
Morris Jobke [Wed, 26 Apr 2017 01:34:30 +0000 (22:34 -0300)]
Merge pull request #4489 from nextcloud/ldap-gidnumber-sprt-xuanwo

user_ldap: Add support for gidNumber

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 26 Apr 2017 00:07:43 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3233 from nextcloud/contactsmenu
Jan-Christoph Borchardt [Tue, 25 Apr 2017 23:31:11 +0000 (01:31 +0200)]
Merge pull request #3233 from nextcloud/contactsmenu

Contacts menu

7 years agoMerge branch 'master' into contactsmenu 3233/head
Jan-Christoph Borchardt [Tue, 25 Apr 2017 22:11:55 +0000 (00:11 +0200)]
Merge branch 'master' into contactsmenu

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoFix test
Jan-Christoph Borchardt [Tue, 25 Apr 2017 22:06:56 +0000 (00:06 +0200)]
Fix test

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoMerge pull request #4499 from nextcloud/downstream-26984
Morris Jobke [Tue, 25 Apr 2017 21:27:38 +0000 (18:27 -0300)]
Merge pull request #4499 from nextcloud/downstream-26984

Trigger change when a user is enabled/disabled

7 years agoMerge pull request #4508 from nextcloud/fix/remove-js-debug-logging
Morris Jobke [Tue, 25 Apr 2017 21:26:53 +0000 (18:26 -0300)]
Merge pull request #4508 from nextcloud/fix/remove-js-debug-logging

Remove js debug logging

7 years agoMerge pull request #4479 from nextcloud/auth-flow
Morris Jobke [Tue, 25 Apr 2017 21:26:15 +0000 (18:26 -0300)]
Merge pull request #4479 from nextcloud/auth-flow

Add new auth flow basics

7 years agoMerge pull request #4495 from nextcloud/downstream-27638
Roeland Jago Douma [Tue, 25 Apr 2017 20:24:50 +0000 (22:24 +0200)]
Merge pull request #4495 from nextcloud/downstream-27638

Catch session already closed exception in destructor

7 years agoRemove js debug logging 4508/head
Christoph Wurst [Tue, 25 Apr 2017 19:42:38 +0000 (21:42 +0200)]
Remove js debug logging

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoFix emptycontent HTML and wording
Jan-Christoph Borchardt [Tue, 25 Apr 2017 08:12:10 +0000 (10:12 +0200)]
Fix emptycontent HTML and wording

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoFix spinner position of Contacts menu
Jan-Christoph Borchardt [Tue, 25 Apr 2017 08:05:49 +0000 (10:05 +0200)]
Fix spinner position of Contacts menu

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoUse HTTP POST to retrieve the list of contacts
Christoph Wurst [Mon, 24 Apr 2017 09:02:07 +0000 (11:02 +0200)]
Use HTTP POST to retrieve the list of contacts

We do not want to have sensitive information in the URL and
therefore also not in the access log. Thus the GET request is
replaced by a POST request.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoUpdate composer autoloader
Christoph Wurst [Mon, 24 Apr 2017 06:48:17 +0000 (08:48 +0200)]
Update composer autoloader

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoAdjust entry unit test to newly added avatar property
Christoph Wurst [Mon, 24 Apr 2017 06:09:23 +0000 (08:09 +0200)]
Adjust entry unit test to newly added avatar property

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoFix failing contacts menu js test data
Christoph Wurst [Mon, 24 Apr 2017 06:07:02 +0000 (08:07 +0200)]
Fix failing contacts menu js test data

When we test wheter action menus in the contacts menu close
when clicking other ones, we have to provide test data
that actually causes the view to render the menu.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoFix icon of second action
Christoph Wurst [Tue, 18 Apr 2017 06:34:08 +0000 (08:34 +0200)]
Fix icon of second action

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoUse absolute URI for action icons
Christoph Wurst [Tue, 11 Apr 2017 07:09:45 +0000 (09:09 +0200)]
Use absolute URI for action icons

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoDon't show contacts an entry for themselves
Christoph Wurst [Mon, 10 Apr 2017 14:49:26 +0000 (16:49 +0200)]
Don't show contacts an entry for themselves

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoLet apps register contact menu provider via info.xml
Christoph Wurst [Mon, 3 Apr 2017 16:04:14 +0000 (18:04 +0200)]
Let apps register contact menu provider via info.xml

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoUse tooltop for contact's top action title
Christoph Wurst [Mon, 3 Apr 2017 13:30:15 +0000 (15:30 +0200)]
Use tooltop for contact's top action title

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoShow mail address in popover menu
Christoph Wurst [Mon, 3 Apr 2017 12:59:07 +0000 (14:59 +0200)]
Show mail address in popover menu

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoContacts menu
Christoph Wurst [Tue, 24 Jan 2017 06:47:14 +0000 (07:47 +0100)]
Contacts menu

* load list of contacts from the server
* show last message of each contact

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoFix auth flow background color and redirect view layout 4479/head
Jan-Christoph Borchardt [Tue, 25 Apr 2017 13:47:08 +0000 (15:47 +0200)]
Fix auth flow background color and redirect view layout

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoAppToken to 72 chars
Roeland Jago Douma [Tue, 25 Apr 2017 11:12:24 +0000 (13:12 +0200)]
AppToken to 72 chars

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoDo not remove the state token to early
Roeland Jago Douma [Tue, 25 Apr 2017 07:51:00 +0000 (09:51 +0200)]
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>
7 years agoCorrectly case the stateToken
Roeland Jago Douma [Tue, 25 Apr 2017 07:50:07 +0000 (09:50 +0200)]
Correctly case the stateToken

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoAdd new auth flow
Lukas Reschke [Mon, 24 Apr 2017 19:11:48 +0000 (21:11 +0200)]
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>
7 years agoMerge pull request #4439 from nextcloud/appmenu-responsive
Lukas Reschke [Tue, 25 Apr 2017 17:42:01 +0000 (19:42 +0200)]
Merge pull request #4439 from nextcloud/appmenu-responsive

Responsive app menu

7 years agoAdd test code for new image mime types 4449/head
Stefan Weil [Tue, 25 Apr 2017 17:06:31 +0000 (19:06 +0200)]
Add test code for new image mime types

Signed-off-by: Stefan Weil <sw@weilnetz.de>
7 years agoAdd repair steps for new image mime types
Stefan Weil [Tue, 25 Apr 2017 16:56:23 +0000 (18:56 +0200)]
Add repair steps for new image mime types

Signed-off-by: Stefan Weil <sw@weilnetz.de>
7 years agoAdd mimetypes for jp2 and webp
Stefan Weil [Sun, 23 Apr 2017 14:40:42 +0000 (16:40 +0200)]
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>
7 years agofix objectstore rename 4503/head
Joas Schilling [Tue, 25 Apr 2017 15:52:05 +0000 (17:52 +0200)]
fix objectstore rename

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoRemove DOMPurify from srcFiles 4486/head
Lukas Reschke [Tue, 25 Apr 2017 09:31:55 +0000 (11:31 +0200)]
Remove DOMPurify from srcFiles

It is already included via core.json

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMove h2 and settings-hint together 4478/head
Jan-Christoph Borchardt [Tue, 25 Apr 2017 15:47:23 +0000 (17:47 +0200)]
Move h2 and settings-hint together

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoMerge pull request #4494 from nextcloud/fix-jsunit
Morris Jobke [Tue, 25 Apr 2017 15:45:52 +0000 (12:45 -0300)]
Merge pull request #4494 from nextcloud/fix-jsunit

Fix JS unit failure because of Jasmine 2.6 and the phantomjs launcher

7 years agoWording fixes
Jan-Christoph Borchardt [Tue, 25 Apr 2017 15:45:02 +0000 (17:45 +0200)]
Wording fixes

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoSmall layout fixes to settings hints
Jan-Christoph Borchardt [Tue, 25 Apr 2017 13:57:02 +0000 (15:57 +0200)]
Small layout fixes to settings hints

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agochange the headline as suggested
Frank Karlitschek [Tue, 25 Apr 2017 08:55:38 +0000 (04:55 -0400)]
change the headline as suggested

7 years agoone more hint
Frank Karlitschek [Mon, 24 Apr 2017 17:25:50 +0000 (13:25 -0400)]
one more hint

7 years agoadding some documentation hints and some smaller cleanup
Frank Karlitschek [Mon, 24 Apr 2017 17:09:30 +0000 (13:09 -0400)]
adding some documentation hints and some smaller cleanup

7 years agoFix loading spinner for new app menu 4439/head
Julius Härtl [Tue, 25 Apr 2017 15:31:04 +0000 (17:31 +0200)]
Fix loading spinner for new app menu

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoFix adding/removing apps
Julius Härtl [Tue, 25 Apr 2017 15:25:28 +0000 (17:25 +0200)]
Fix adding/removing apps

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoResponsive app menu
Julius Härtl [Tue, 28 Mar 2017 13:04:56 +0000 (15:04 +0200)]
Responsive app menu

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoRestrict proppatch to the proper nodes 4500/head
Vincent Petry [Wed, 8 Feb 2017 17:18:38 +0000 (18:18 +0100)]
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.

7 years agoAudit log for enabling/disabling a user 4499/head
Joas Schilling [Tue, 25 Apr 2017 15:18:56 +0000 (17:18 +0200)]
Audit log for enabling/disabling a user

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoTrigger change when a user is enabled/disabled
Joas Schilling [Tue, 25 Apr 2017 15:11:57 +0000 (17:11 +0200)]
Trigger change when a user is enabled/disabled

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoCatch session already closed exception in destructor 4495/head
Victor Dubiniuk [Wed, 12 Apr 2017 18:25:22 +0000 (21:25 +0300)]
Catch session already closed exception in destructor

7 years agoMerge pull request #4490 from GitHubUser4234/audit_log_group_creation_deletion
Joas Schilling [Tue, 25 Apr 2017 14:14:52 +0000 (16:14 +0200)]
Merge pull request #4490 from GitHubUser4234/audit_log_group_creation_deletion

Audit group creation/deletion

7 years agoMerge pull request #3531 from nextcloud/theming-scss
Morris Jobke [Tue, 25 Apr 2017 13:56:13 +0000 (10:56 -0300)]
Merge pull request #3531 from nextcloud/theming-scss

Theming using SCSS variables

7 years agoMerge pull request #4485 from nextcloud/translation-checker
Morris Jobke [Tue, 25 Apr 2017 13:46:51 +0000 (10:46 -0300)]
Merge pull request #4485 from nextcloud/translation-checker

Check whether we can json decode the translations

7 years agoFix JS unit failure because of Jasmine 2.6 and the phantomjs launcher 4494/head
Morris Jobke [Tue, 25 Apr 2017 13:26:46 +0000 (10:26 -0300)]
Fix JS unit failure because of Jasmine 2.6 and the phantomjs launcher

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #3195 from nextcloud/settings-apps-tabular
Morris Jobke [Tue, 25 Apr 2017 13:25:29 +0000 (10:25 -0300)]
Merge pull request #3195 from nextcloud/settings-apps-tabular

Make apps settings tabular

7 years agoFix usersInGroup retrieval 4489/head
Arthur Schiwon [Tue, 25 Apr 2017 13:07:05 +0000 (15:07 +0200)]
Fix usersInGroup retrieval

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agoLoop over the apps directory and add the task 4485/head
Joas Schilling [Tue, 25 Apr 2017 12:35:51 +0000 (14:35 +0200)]
Loop over the apps directory and add the task

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAllow meta info and icons 4467/head
Joas Schilling [Tue, 25 Apr 2017 12:31:21 +0000 (14:31 +0200)]
Allow meta info and icons

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #4462 from danxuliu/fix-sharing-password-protected-link
Roeland Jago Douma [Tue, 25 Apr 2017 12:12:44 +0000 (14:12 +0200)]
Merge pull request #4462 from danxuliu/fix-sharing-password-protected-link

Fix sharing a password protected link

7 years agoMerge pull request #4484 from nextcloud/fix/logincontroller-redirect-url-failed-login
blizzz [Tue, 25 Apr 2017 11:15:53 +0000 (13:15 +0200)]
Merge pull request #4484 from nextcloud/fix/logincontroller-redirect-url-failed-login

Fix remember redirect_url on failed login attempts

7 years ago4190 4490/head
Roger Szabo [Tue, 25 Apr 2017 11:06:49 +0000 (19:06 +0800)]
4190

Signed-off-by: Roger Szabo <roger.szabo@web.de>
7 years agofix method name due to changes in master
Arthur Schiwon [Tue, 25 Apr 2017 11:03:08 +0000 (13:03 +0200)]
fix method name due to changes in master

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agoMerge branch 'master' of https://github.com/Xuanwo/server into Xuanwo-master2
Arthur Schiwon [Tue, 25 Apr 2017 10:42:17 +0000 (12:42 +0200)]
Merge branch 'master' of https://github.com/Xuanwo/server into Xuanwo-master2

7 years agoMock it 3531/head
Joas Schilling [Tue, 25 Apr 2017 10:16:07 +0000 (12:16 +0200)]
Mock it

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoLogo and background URLs must be relative
Joas Schilling [Mon, 24 Apr 2017 10:15:28 +0000 (12:15 +0200)]
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>
7 years agoFix theming tests
Julius Härtl [Mon, 24 Apr 2017 08:50:24 +0000 (10:50 +0200)]
Fix theming tests

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoUse theming cachebuster for server resources
Julius Härtl [Sat, 22 Apr 2017 09:57:08 +0000 (11:57 +0200)]
Use theming cachebuster for server resources

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoImplement scss variable injection by OC_Defaults
Julius Haertl [Fri, 17 Feb 2017 15:42:07 +0000 (16:42 +0100)]
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>
7 years agoFix invalid character
Joas Schilling [Tue, 25 Apr 2017 09:06:27 +0000 (11:06 +0200)]
Fix invalid character

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoCheck whether we can json decode the translations
Joas Schilling [Tue, 25 Apr 2017 09:01:34 +0000 (11:01 +0200)]
Check whether we can json decode the translations

Signed-off-by: Joas Schilling <coding@schilljs.com>