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

6570 commits

Author SHA1 Message Date
Nextcloud bot
d551b8e6fd
[tx-robot] updated from transifex 2017-03-22 21:14:04 +00:00
Roeland Jago Douma
4518a28924 Revert "Bundle vendor js" 2017-03-22 17:01:54 +01:00
Roeland Jago Douma
ec3f5aa6e2 Merge pull request #3795 from nextcloud/bundle_vendor_js 
Bundle vendor js
 2017-03-22 13:34:21 +01:00
Roeland Jago Douma
d83b15cd85 Merge pull request #3982 from nextcloud/hide-systemtag-delete-tooltip 
Remove tooltip of delete button for systemtags
 2017-03-22 09:24:40 +01:00
Roeland Jago Douma
2337e11d88
Bump core.js 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-22 08:49:39 +01:00
Roeland Jago Douma
98a14909e1
Bundle more default vendor js 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-22 08:49:03 +01:00
Roeland Jago Douma
7195a9323d
Merge vendor js 
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>
 2017-03-22 08:48:10 +01:00
Christoph Wurst
c6c5896474 Merge pull request #3980 from nextcloud/fix-app-menu-triangle 
Fix position of triangle in app menu
 2017-03-22 08:43:45 +01:00
Morris Jobke
c3f08ab151
Remove tooltip of delete button for systemtags 
* fixes #3967

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-21 21:49:25 -06:00
Nextcloud bot
cae8702ab2
[tx-robot] updated from transifex 2017-03-22 01:07:53 +00:00
Morris Jobke
6d35827bf6
Fix position of triangle in app menu 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-21 16:48:13 -06:00
Nextcloud bot
fd0e42e093
[tx-robot] updated from transifex 2017-03-21 01:08:16 +00:00
Lukas Reschke
21cf1b22e9 Merge pull request #3530 from nextcloud/scss-variables 
Implement scss variables
 2017-03-20 19:49:53 +01:00
Lukas Reschke
29039eb608 Merge pull request #3951 from nextcloud/menu-firefox-fixes 
Fix new app menu on firefox
 2017-03-20 13:15:43 +01:00
Roeland Jago Douma
376e6f0884 Merge pull request #3915 from michaelletzgus/html5-fix_autocapitalize 
Fix value of attribute "autocapitalize"
 2017-03-20 13:13:32 +01:00
Julius Haertl
7381a2ec5c
Replace old color occurences with calculations 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:08 +01:00
Julius Haertl
322ecdca63
Make remaining colors depending on $color-main-text and $color-main-background 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:08 +01:00
Julius Haertl
9f259d4c7a
Remove legacy CSS 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:08 +01:00
Julius Haertl
c7de67e44a
Merge color tones aaaaaa, bebebe, cccccc in bbbbbb 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:08 +01:00
Julius Haertl
58a9d1b0f2
Remove grey tints 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:08 +01:00
Julius Haertl
5b3a1a558e
Remove separate error colors 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:07 +01:00
Julius Haertl
8ff3db1be8
Extra variable for loading icons 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:07 +01:00
Julius Haertl
33ee6e8d37
Merge #666 and #777 to #555 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:07 +01:00
Julius Haertl
19ce6372ad
Use one box-shadow color 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:07 +01:00
Julius Haertl
7b5d5d19a8
Replace #222 with #333 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:07 +01:00
Julius Haertl
51c6fcda10
Remove unused old #999 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:07 +01:00
Julius Haertl
52fdec8600
Merge colors 
- #fafafa/#f8f8f8/#f5f5f5 to #f8f8f8
- #f0f0f0/#eeeeee/#e8e8e8 to #eeeeee

Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:06 +01:00
Julius Haertl
14d73d07aa
Remove rgb color values 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:06 +01:00
Julius Haertl
bea61d063a
Simplify colors 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:06 +01:00
Julius Haertl
e2d7ac1c3a
SCSS colors in tooltip.scss 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:06 +01:00
Julius Haertl
6c59377b95
SCSS colors in styles.scss 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:06 +01:00
Julius Haertl
29028927d1
SCSS colors in share.scss 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:06 +01:00
Julius Haertl
78d1e7685f
SCSS colors in multiselect.scss 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:06 +01:00
Julius Haertl
128c271c73
SCSS colors in inputs.scss 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:05 +01:00
Julius Haertl
35a805a6f3
SCSS colors in icons.scss 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:05 +01:00
Julius Haertl
5dac3805b0
SCSS colors in apps.scss 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:05 +01:00
Julius Haertl
34bf2b5616
SCSS colors in header.scss 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:05 +01:00
Julius Haertl
2d1f886c6a
Add variables of existing colors 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:05 +01:00
Julius Haertl
2bd06e0d37
Add variables.scss and import it for each scss file 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:05 +01:00
Lukas Reschke
ac1aff7d92 Merge pull request #3950 from nextcloud/downstream-27149 
Forbid to upload part files via web UI
 2017-03-20 11:44:57 +01:00
Morris Jobke
8b670b41f1 Merge pull request #3952 from nextcloud/downstream-27209 
Log files:scan exception, add InterruptedException
 2017-03-20 03:22:58 -06:00
Vincent Petry
b8a8f43fce
Log files:scan exception, add InterruptedException 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-20 02:24:28 -06:00
Morris Jobke
daa7e11095 Merge pull request #3947 from nextcloud/downstream-27323 
Disable empty password for user::resetpassword command using CLI
 2017-03-20 01:53:28 -06:00
Morris Jobke
e446d22359 Merge pull request #3917 from michaelletzgus/html5-fix_dup-IDs 
Fix duplicate id "apps-management"
 2017-03-20 01:51:20 -06:00
Morris Jobke
5979f48134 Merge pull request #3934 from nextcloud/downstream-27246 
Update the occ:encrypt-all prompt
 2017-03-20 01:34:49 -06:00
Christoph Wurst
313173dd45 Merge pull request #3936 from nextcloud/downstream-27253 
Add extensionpoint to sharedialogview
 2017-03-20 08:31:01 +01:00
Julius Härtl
c994e7afcd
Fix filter for app icons on firefox 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-03-20 08:27:11 +01:00
Julius Härtl
d3592e9180
Fix popover position on firefox 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-03-20 08:27:11 +01:00
Felix Heidecke
11f838f9e4
Add ignore_files to config, 
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>
 2017-03-20 01:17:12 -06:00
Morris Jobke
24a8604426 Merge pull request #3942 from nextcloud/downstream-27264 
Clear onpopstate handlers after unit tests
 2017-03-20 01:12:11 -06:00