summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Logo and background URLs must be relativeJoas Schilling2017-04-252-11/+8
| | | | | | They are used way to often for such a change Signed-off-by: Joas Schilling <coding@schilljs.com>
* Fix theming testsJulius Härtl2017-04-252-30/+13
| | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Implement scss variable injection by OC_DefaultsJulius Haertl2017-04-255-681/+293
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* [tx-robot] updated from transifexNextcloud bot2017-04-2516-20/+30
|
* Merge pull request #4457 from nextcloud/fix-storage-info-with-wrong-casingMorris Jobke2017-04-242-84/+92
|\ | | | | Fix storage info with wrong casing
| * Remove dead argumentsJoas Schilling2017-04-242-45/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Fix similar issues with the group idJoas Schilling2017-04-242-4/+8
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Fix the storage info and other checks when the user has wrong casingJoas Schilling2017-04-242-35/+83
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #4463 from ↵Roeland Jago Douma2017-04-241-2/+3
|\ \ | | | | | | | | | | | | danxuliu/fix-working-icon-placement-on-password-save Fix working icon placement on password save
| * | Fix working icon placement on password saveDaniel Calviño Sánchez2017-04-241-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge pull request #4458 from nextcloud/fix/sinon-stub-deprecation-warningsRoeland Jago Douma2017-04-243-4/+6
|\ \ \ | | | | | | | | Fix sinon.stub deprecation warnings
| * | | Fix sinon.stub deprecation warningsChristoph Wurst2017-04-243-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge pull request #1023 from GitHubUser4234/ldap_password_renew_prblizzz2017-04-2435-175/+972
|\ \ \ \ | | | | | | | | | | Handle password expiry in user_ldap
| * | | | unit test adjustmentRoger Szabo2017-04-072-23/+33
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * | | | lower case for attributesRoger Szabo2017-04-061-7/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * | | | blizzz comments 03.04.2017 with cachingRoger Szabo2017-04-061-2/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * | | | blizzz comments 03.04.2017Roger Szabo2017-04-065-22/+26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * | | | usertest adjustmentRoger Szabo2017-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * | | | usertest adjustmentRoger Szabo2017-03-311-11/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * | | | remove redundant tabsRoger Szabo2017-03-311-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * | | | restore ldap_password_renew_prRoger Szabo2017-03-3134-163/+941
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
* | | | | Merge pull request #4443 from nextcloud/cleanup-unused-importsJoas Schilling2017-04-2448-82/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Remove unused use statements
| * | | | Remove unused use statementsMorris Jobke2017-04-2248-82/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #4401 from nextcloud/caldav-carddav-nc-owner-displaynameRoeland Jago Douma2017-04-246-12/+77
|\ \ \ \ \ | |_|_|_|/ |/| | | | add owner-displayname property to calendars and addressbooks
| * | | | add owner-displayname property to calendars and addressbooksGeorg Ehrke2017-04-236-12/+77
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | Merge pull request #4444 from nextcloud/remove-unused-variablesRoeland Jago Douma2017-04-241-1/+0
|\ \ \ \ | | | | | | | | | | Remove unused variables
| * | | | Remove unused variablesMorris Jobke2017-04-221-1/+0
| | |/ / | |/| | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | [tx-robot] updated from transifexNextcloud bot2017-04-2426-4/+62
| |/ / |/| |
* | | [tx-robot] updated from transifexNextcloud bot2017-04-2352-230/+688
| | |
* | | Merge pull request #4432 from nextcloud/fix-grammarLukas Reschke2017-04-221-4/+4
|\ \ \ | | | | | | | | Fix grammar
| * | | Fix grammarMorris Jobke2017-04-211-4/+4
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / / [tx-robot] updated from transifexNextcloud bot2017-04-2280-140/+356
|/ /
* | Merge pull request #4396 from nextcloud/scan-non-existingRoeland Jago Douma2017-04-212-7/+14
|\ \ | | | | | | show error when trying to scan non existing path
| * | Add PHPDoc and handle exception in ScanAppData as wellMorris Jobke2017-04-191-0/+2
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | show error when trying to scan non existing pathRobin Appelman2017-04-191-7/+12
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Use RESPOND_NOT_FOUND for non existing userMorris Jobke2017-04-212-2/+2
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #4422 from nextcloud/favorite-wording-detailRoeland Jago Douma2017-04-211-2/+1
|\ \ \ | | | | | | | | Wording detail fix for favorite emptycontent view
| * | | Wording detail fix for favorite emptycontent viewJan-Christoph Borchardt2017-04-211-2/+1
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #4423 from nextcloud/reload-fav-viewMorris Jobke2017-04-211-0/+6
|\ \ \ \ | |/ / / |/| | | properly reload favorites list
| * | | properly reload favorites listRobin Appelman2017-04-211-0/+6
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | No need to log guzzle exceptionRoeland Jago Douma2017-04-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge pull request #4406 from nextcloud/fix-unit-test-problemsRoeland Jago Douma2017-04-215-20/+31
|\ \ \ \ | | | | | | | | | | Fix unit test problems
| * | | | Fix invalid Dav testJoas Schilling2017-04-202-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | Fix theming testsJoas Schilling2017-04-202-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | Don't use deprecated getMock() anymoreJoas Schilling2017-04-201-3/+4
| |/ / / | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #4408 from nextcloud/accesslist_ngRoeland Jago Douma2017-04-212-14/+18
|\ \ \ \ | | | | | | | | | | Move systemtags and comments to new accesslist functions
| * | | | Move systemtags and comments to new accesslist functionsRoeland Jago Douma2017-04-202-14/+18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-04-218-0/+20
| | | | |
* | | | | Merge pull request #4412 from individual-it/masterMorris Jobke2017-04-201-1/+0
|\ \ \ \ \ | | | | | | | | | | | | deleted forgotten code in test
| * | | | | deleted forgotten code in testArtur Neumann2017-04-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | how embarrassing, left code from before I've done the loop around the test Signed-off-by: Artur Neumann <info@individual-it.net>