Commit Graph

15874 Commits

Author SHA1 Message Date
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
Nextcloud bot 133f3fdc9a
[tx-robot] updated from transifex 2017-04-25 00:07:30 +00:00
Morris Jobke b156117cbd Merge pull request #4457 from nextcloud/fix-storage-info-with-wrong-casing
Fix storage info with wrong casing
2017-04-24 10:41:16 -03:00
Roeland Jago Douma c5617f4e8a Merge pull request #4463 from danxuliu/fix-working-icon-placement-on-password-save
Fix working icon placement on password save
2017-04-24 14:34:56 +02:00
Roeland Jago Douma 97c27395aa Merge pull request #4458 from nextcloud/fix/sinon-stub-deprecation-warnings
Fix sinon.stub deprecation warnings
2017-04-24 13:47:46 +02:00
blizzz 42e805f057 Merge pull request #1023 from GitHubUser4234/ldap_password_renew_pr
Handle password expiry in user_ldap
2017-04-24 12:17:04 +02:00
Daniel Calviño Sánchez 36f55b5867 Fix working icon placement on password save
Before, the icon appeared below the text input for the password. Now, it
appears inside the text input, to the right end.

The CSS was adjusted based on other icons shown in that position for
other text inputs in the Share tab view, like the information icon or
the clipboard icon.

Fixes #4135

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 11:50:06 +02:00
Joas Schilling 3d671cc536 Merge pull request #4443 from nextcloud/cleanup-unused-imports
Remove unused use statements
2017-04-24 11:47:37 +02:00
Christoph Wurst 2317d7bb49
Fix sinon.stub deprecation warnings
Calls to `sinon.stub(obj, 'meth', fn)` are deprecated and therefore
replaced by `sinon.stub(obj, 'meth).callsFake(fn)` as instructed by
the deprecation warning.

This makes the js unit testing output readable again.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-24 10:39:37 +02:00
Joas Schilling 7a87fedac3
Remove dead arguments
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-24 10:18:14 +02:00
Joas Schilling e19126425b
Fix similar issues with the group id
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-24 10:15:03 +02:00
Joas Schilling 992c48c89b
Fix the storage info and other checks when the user has wrong casing
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-24 10:10:50 +02:00
Roeland Jago Douma d842b29c5b Merge pull request #4401 from nextcloud/caldav-carddav-nc-owner-displayname
add owner-displayname property to calendars and addressbooks
2017-04-24 09:17:55 +02:00
Roeland Jago Douma 1c2cdc9d3a Merge pull request #4444 from nextcloud/remove-unused-variables
Remove unused variables
2017-04-24 08:09:01 +02:00
Nextcloud bot a01f946c56
[tx-robot] updated from transifex 2017-04-24 00:07:28 +00:00
Georg Ehrke c89e057d27
add owner-displayname property to calendars and addressbooks
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-23 11:26:49 +02:00
Morris Jobke c54a59d51e
Remove unused use statements
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-22 19:23:31 -05:00
Nextcloud bot 11c7953888
[tx-robot] updated from transifex 2017-04-23 00:07:31 +00:00
Morris Jobke 2b6f6dac00
Remove unused variables
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-22 18:20:51 -05:00
Lukas Reschke 7acdc2a096 Merge pull request #4432 from nextcloud/fix-grammar
Fix grammar
2017-04-22 08:15:46 +02:00
Nextcloud bot 363d1c69dd
[tx-robot] updated from transifex 2017-04-22 00:07:36 +00:00
Morris Jobke aa2bed44b6
Fix grammar
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-21 16:07:12 -05:00
Roeland Jago Douma 867b3ee234 Merge pull request #4396 from nextcloud/scan-non-existing
show error when trying to scan non existing path
2017-04-21 19:47:33 +02:00
Morris Jobke 4dd72e9eb9
Use RESPOND_NOT_FOUND for non existing user
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-21 11:30:00 -05:00
Roeland Jago Douma 9a0280f1c8 Merge pull request #4422 from nextcloud/favorite-wording-detail
Wording detail fix for favorite emptycontent view
2017-04-21 16:43:22 +02:00
Morris Jobke 5605166523 Merge pull request #4423 from nextcloud/reload-fav-view
properly reload favorites list
2017-04-21 09:35:34 -05:00
Robin Appelman c49def4a10
properly reload favorites list
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-21 14:20:34 +02:00
Jan-Christoph Borchardt 8b8f537f3b Wording detail fix for favorite emptycontent view
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-21 14:11:49 +02:00
Roeland Jago Douma bec4b468c3
No need to log guzzle exception
When getting/requesting a shared secret there is no need to log the full
exception when an unexpected status code is returned since this won't
really tell us anything as the bad stuff happened on a remote server

Fixes #3380

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-21 11:29:01 +02:00
Roeland Jago Douma e9b00f84b8 Merge pull request #4406 from nextcloud/fix-unit-test-problems
Fix unit test problems
2017-04-21 09:35:01 +02:00
Roeland Jago Douma c4bd01456b Merge pull request #4408 from nextcloud/accesslist_ng
Move systemtags and comments to new accesslist functions
2017-04-21 08:58:52 +02:00
Nextcloud bot fb7663cefe
[tx-robot] updated from transifex 2017-04-21 00:07:37 +00:00
Morris Jobke f5b900b654 Merge pull request #4412 from individual-it/master
deleted forgotten code in test
2017-04-20 18:04:32 -05:00
Morris Jobke 8a743e0359 Merge pull request #4404 from Ardinis/master
Remove json handling for files_external:config
2017-04-20 17:59:35 -05:00
Morris Jobke b99d2b78bd Merge pull request #3595 from nextcloud/dav-sharing-changes
Restrict DAV share handling to the owner only
2017-04-20 16:44:16 -05:00
Morris Jobke 5d18e4243d
Fix unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-20 16:01:26 -05:00
Artur Neumann faf55adb90 deleted forgotten code in test
how embarrassing, left code from before I've done the loop around the test
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-20 22:27:51 +05:45
Björn Schießle 810fb7ff2c Merge pull request #4402 from nextcloud/fix-clickable-area
Fix clickable area in share permissions menu
2017-04-20 16:49:00 +02:00
Morris Jobke 6c294c3407
fix typo
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-20 16:33:27 +02:00
Morris Jobke 9d07ec5a96
Fix casing
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-20 16:33:27 +02:00
Bjoern Schiessle aa54d31bd2
fix unit tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:27 +02:00
Bjoern Schiessle 972b4c04e2
respect password policy for auto generated passwords
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
Bjoern Schiessle 428d7cdb5e
improve mail text
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
Bjoern Schiessle f00c1eccf7
create activity if a password was send by mail
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
Bjoern Schiessle 7a8f8cbb33
templates no longer needed 2017-04-20 16:33:26 +02:00
Bjoern Schiessle d8dcd72118
allow admin to enforce password on mail shares
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
Roeland Jago Douma 4004e39f75
Move systemtags and comments to new accesslist functions
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-20 14:34:28 +02:00
Joas Schilling 73b6cd1061
Fix invalid Dav test
PHP Warning:  Declaration of PublicCalendarTest::testPrivateClassification()
should be compatible with CalendarTest::testPrivateClassification($expectedChildren, $isShared)
in apps/dav/tests/unit/CalDAV/PublicCalendarTest.php on line 29

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 13:54:20 +02:00
Joas Schilling 8c703c954d
Fix theming tests
Trying to configure method "shouldReplaceIcons" which cannot be configured
because it does not exist, has not been specified, is final, or is static

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 13:10:34 +02:00
Joas Schilling a0ada9aab4
Don't use deprecated getMock() anymore
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 12:30:21 +02:00