summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Update karma, use sinon from npmVincent Petry2017-03-231-5949/+0
| | | | | | | Update karma library and use sinon JS library provided by karma-jasmine-sinon instead of local file. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #3997 from nextcloud/backport-27353Roeland Jago Douma2017-03-232-25/+83
|\ | | | | Update davclient.js to 0.1.1
| * Update davclient.js to 0.1.1Vincent Petry2017-03-222-25/+83
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2017-03-232-0/+20
|/
* [tx-robot] updated from transifexNextcloud bot2017-03-2210-4/+46
|
* Revert "Bundle vendor js"Roeland Jago Douma2017-03-222-42551/+1
|
* Merge pull request #3795 from nextcloud/bundle_vendor_jsRoeland Jago Douma2017-03-222-1/+42551
|\ | | | | Bundle vendor js
| * Bump core.jsRoeland Jago Douma2017-03-221-1/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Bundle more default vendor jsRoeland Jago Douma2017-03-222-2/+4236
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Merge vendor jsRoeland Jago Douma2017-03-221-0/+38315
| | | | | | | | | | | | | | | | There is a bunch of javascript we always load from vendors. This combines this into 1 javascript file. Which reduces the number of request by ~10. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #3982 from nextcloud/hide-systemtag-delete-tooltipRoeland Jago Douma2017-03-221-0/+1
|\ \ | | | | | | Remove tooltip of delete button for systemtags
| * | Remove tooltip of delete button for systemtagsMorris Jobke2017-03-211-0/+1
| |/ | | | | | | | | | | * fixes #3967 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #3980 from nextcloud/fix-app-menu-triangleChristoph Wurst2017-03-221-1/+1
|\ \ | | | | | | Fix position of triangle in app menu
| * | Fix position of triangle in app menuMorris Jobke2017-03-211-1/+1
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / [tx-robot] updated from transifexNextcloud bot2017-03-228-2/+28
|/
* [tx-robot] updated from transifexNextcloud bot2017-03-2114-4/+26
|
* Merge pull request #3530 from nextcloud/scss-variablesLukas Reschke2017-03-209-248/+223
|\ | | | | Implement scss variables
| * Replace old color occurences with calculationsJulius Haertl2017-03-205-84/+75
| | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * Make remaining colors depending on $color-main-text and $color-main-backgroundJulius Haertl2017-03-203-21/+19
| | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * Remove legacy CSSJulius Haertl2017-03-202-45/+1
| | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * Merge color tones aaaaaa, bebebe, cccccc in bbbbbbJulius Haertl2017-03-204-14/+7
| | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * Remove grey tintsJulius Haertl2017-03-202-3/+3
| | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * Remove separate error colorsJulius Haertl2017-03-202-4/+3
| | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * Extra variable for loading iconsJulius Haertl2017-03-202-8/+7
| | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * Merge #666 and #777 to #555Julius Haertl2017-03-203-6/+6
| | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * Use one box-shadow colorJulius Haertl2017-03-203-5/+5
| | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * Replace #222 with #333Julius Haertl2017-03-202-3/+3
| | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * Remove unused old #999Julius Haertl2017-03-201-1/+0
| | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * Merge colorsJulius Haertl2017-03-204-16/+12
| | | | | | | | | | | | | | - #fafafa/#f8f8f8/#f5f5f5 to #f8f8f8 - #f0f0f0/#eeeeee/#e8e8e8 to #eeeeee Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * Remove rgb color valuesJulius Haertl2017-03-205-16/+15
| | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * Simplify colorsJulius Haertl2017-03-201-22/+24
| | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * SCSS colors in tooltip.scssJulius Haertl2017-03-201-6/+6
| | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * SCSS colors in styles.scssJulius Haertl2017-03-201-67/+67
| | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * SCSS colors in share.scssJulius Haertl2017-03-201-5/+5
| | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * SCSS colors in multiselect.scssJulius Haertl2017-03-201-11/+11
| | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * SCSS colors in inputs.scssJulius Haertl2017-03-201-63/+63
| | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * SCSS colors in icons.scssJulius Haertl2017-03-201-4/+4
| | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * SCSS colors in apps.scssJulius Haertl2017-03-201-40/+40
| | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * SCSS colors in header.scssJulius Haertl2017-03-202-16/+16
| | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * Add variables of existing colorsJulius Haertl2017-03-201-1/+36
| | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * Add variables.scss and import it for each scss fileJulius Haertl2017-03-201-0/+8
| | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* | Merge pull request #3951 from nextcloud/menu-firefox-fixesLukas Reschke2017-03-202-6/+6
|\ \ | | | | | | Fix new app menu on firefox
| * | Fix filter for app icons on firefoxJulius Härtl2017-03-201-4/+4
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Fix popover position on firefoxJulius Härtl2017-03-201-2/+2
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #3915 from michaelletzgus/html5-fix_autocapitalizeRoeland Jago Douma2017-03-202-10/+10
|\ \ \ | |_|/ |/| | Fix value of attribute "autocapitalize"
| * | Fix value of attribute "autocapitalize"Michael Letzgus2017-03-182-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | Change <input> attribute "autocapitalize" from value "off" to "none" regarding to apples dev guide: https://developer.apple.com/library/content/documentation/AppleApplications/Reference/SafariHTMLRef/Articles/Attributes.html#//apple_ref/doc/uid/TP40008058-autocapitalize Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
* | | Merge pull request #3950 from nextcloud/downstream-27149Lukas Reschke2017-03-202-1/+10
|\ \ \ | | | | | | | | Forbid to upload part files via web UI
| * | | Add ignore_files to config,Felix Heidecke2017-03-202-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test files against ignore_files list on upload fix typo and indentation Move blacklist declaration to lib/public/Files/FileInfo.php, Rename *ignored to *blacklisted Mocked blacklist_files for testing Mocked blacklist_files for testing Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #3952 from nextcloud/downstream-27209Morris Jobke2017-03-201-0/+26
|\ \ \ \ | | | | | | | | | | Log files:scan exception, add InterruptedException
| * | | | Log files:scan exception, add InterruptedExceptionVincent Petry2017-03-201-0/+26
| |/ / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>