Morris Jobke
|
292a704648
|
Merge pull request #6544 from nextcloud/fix/duplicate-session-token
Fix duplicate session token after remembered login
|
2017-09-25 17:39:02 +02:00 |
John Molakvoæ
|
9080976975
|
Merge pull request #6372 from nextcloud/scss-normalization
Scss normalization
|
2017-09-25 16:50:30 +02:00 |
Roeland Jago Douma
|
3bd4e7e541
|
Merge pull request #6632 from nextcloud/do_not_show_hyphen
Do not show hyphen
|
2017-09-25 16:34:50 +02:00 |
Joas Schilling
|
f2b7205a88
|
Merge pull request #6627 from nextcloud/icon-on-apps-settings
Icon on apps settings
|
2017-09-25 16:29:26 +02:00 |
Roeland Jago Douma
|
c3491e3f14
|
Add annotation
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
|
2017-09-25 16:18:50 +02:00 |
|
Roeland Jago Douma
|
894958e3e2
|
For images we have a preview for use the preview link
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
|
2017-09-25 16:18:50 +02:00 |
|
Roeland Jago Douma
|
7d8c5f73f5
|
Add direct preview link to single shared image files
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
|
2017-09-25 16:18:50 +02:00 |
|
Roeland Jago Douma
|
29fb315ffc
|
Allow requesting the max preview
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
|
2017-09-25 16:18:48 +02:00 |
John Molakvoæ (skjnldsv)
|
ab1c34c5a5
|
Fixed tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
|
2017-09-25 16:17:33 +02:00 |
|
Morris Jobke
|
1ad79e3039
|
Merge pull request #6630 from nextcloud/same_site_cookie_middleware
Handle SameSiteCookie check for index.php in AppFramework Middleware
|
2017-09-25 16:17:12 +02:00 |
|
John Molakvoæ (skjnldsv)
|
9ff6dab07c
|
Fix typo
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
|
2017-09-25 13:07:18 +02:00 |
|
Joas Schilling
|
e0a4c61350
|
Merge pull request #6633 from nextcloud/dav-remove-like-when-not-needed
Don't add a LIKE condition when it's not needed
|
2017-09-25 12:12:50 +02:00 |
|
Morris Jobke
|
4677af1a91
|
Merge pull request #6631 from nextcloud/fix_6170
Add indexes to cards and cards_properties tables
|
2017-09-25 12:01:25 +02:00 |
|
Roeland Jago Douma
|
4ac32223da
|
Add indexes to cards and cards_properties tables
Fixes #6170
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
|
2017-09-25 10:27:46 +02:00 |
Stephan Müller
|
f7790c2960
|
expect call of getSlogan() exactly twice
Signed-off-by: Stephan Müller <mail@stephanmueller.eu>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
|
2017-09-25 09:20:46 +02:00 |
|
Stephan Müller
|
86265320b8
|
do not show hyphen after instance name in emails if slogan does not exist
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
|
2017-09-25 09:20:46 +02:00 |
Thomas Citharel
|
f1bfd4433e
|
Don't add a LIKE condition when it's not needed
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
|
2017-09-25 09:10:44 +02:00 |
Nextcloud bot
|
199c4b2ff9
|
[tx-robot] updated from transifex
|
2017-09-25 00:08:01 +00:00 |
|
Roeland Jago Douma
|
c257cd57d4
|
Handle SameSiteCookie check for index.php in AppFramework Middleware
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
|
2017-09-24 21:07:16 +02:00 |
|
Roeland Jago Douma
|
4ee731c1ab
|
Merge pull request #6591 from nextcloud/unify-appearance-of-avatars-for-undefined-and-unknown-users
Unify appearance of avatars for undefined and unknown users
|
2017-09-24 13:12:58 +02:00 |
|
Roeland Jago Douma
|
24a881f75e
|
Merge pull request #6623 from nextcloud/fix-app-nav-img
Fix app nav img margin
|
2017-09-24 13:07:21 +02:00 |
|
John Molakvoæ (skjnldsv)
|
308e1c0ed2
|
Icons & default classes
Changed categories order same as app store
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
|
2017-09-24 08:59:09 +02:00 |
|
John Molakvoæ (skjnldsv)
|
7cee919f57
|
Fix busy state loading animation in files
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
|
2017-09-23 18:18:14 +02:00 |
|
John Molakvoæ (skjnldsv)
|
d169e3fd59
|
Removed unused filter for opacity, fix #6408
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
|
2017-09-23 18:18:14 +02:00 |
|
John Molakvoæ (skjnldsv)
|
f41f4f1932
|
Settings button as nav entry
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
|
2017-09-23 18:18:14 +02:00 |
|
John Molakvoæ (skjnldsv)
|
65353af374
|
Replaced colours by variables
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
|
2017-09-23 18:17:44 +02:00 |
|
John Molakvoæ (skjnldsv)
|
a07299476b
|
Settings scss
Scss conversion
Cleanup settings scss
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
|
2017-09-23 18:17:26 +02:00 |
|
John Molakvoæ (skjnldsv)
|
9fafe737bc
|
Removed unneeded bgs and borders. Replaced hard coded colours by
variables.
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
|
2017-09-23 18:15:56 +02:00 |
|
John Molakvoæ (skjnldsv)
|
2fe6e3d4df
|
fix width of editing & deleted form
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
|
2017-09-23 15:12:22 +02:00 |
|
John Molakvoæ (skjnldsv)
|
c7f75f5620
|
Img margin left
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
|
2017-09-23 12:06:18 +02:00 |
|
John Molakvoæ (skjnldsv)
|
ee58c7fcf2
|
Fix settings navigation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
|
2017-09-23 11:58:25 +02:00 |
|
Nextcloud bot
|
d4bf301a78
|
[tx-robot] updated from transifex
|
2017-09-23 00:07:56 +00:00 |
|
Roeland Jago Douma
|
d1a430dbd8
|
Merge pull request #6611 from nextcloud/fix-webroot-detection
Fixed webroot detection
|
2017-09-22 12:14:25 +02:00 |
|
John Molakvoæ (skjnldsv)
|
4a5eeb2ce7
|
Fixed webroot detection
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
|
2017-09-22 07:20:31 +02:00 |
|
Nextcloud bot
|
887229b7b8
|
[tx-robot] updated from transifex
|
2017-09-22 00:08:22 +00:00 |
|
Morris Jobke
|
38568c362b
|
Merge pull request #6605 from nextcloud/oc_ocs_response_is_dep
OC_OCS_Response is deprecated
|
2017-09-21 20:38:18 +02:00 |
|
Morris Jobke
|
7eba0a2720
|
Fix comment
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
|
2017-09-21 20:10:36 +02:00 |
|
John Molakvoæ
|
e336283a48
|
Merge pull request #6399 from nextcloud/app-navigation-flex
App navigation flex
|
2017-09-21 18:50:28 +02:00 |
|
Roeland Jago Douma
|
eb00dbb593
|
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
|
2017-09-21 18:30:20 +02:00 |
|
Roeland Jago Douma
|
2207fdcd8c
|
Remove private legacy OC_OCS_Response
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
|
2017-09-21 17:56:56 +02:00 |
|
Roeland Jago Douma
|
87e10f9e6a
|
OC_OCS_Response is deprecated
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
|
2017-09-21 17:56:00 +02:00 |
Robin Appelman
|
385d6f098c
|
Add tests for multipart upload
Signed-off-by: Robin Appelman <robin@icewind.nl>
|
2017-09-21 14:47:34 +02:00 |
|
Robin Appelman
|
4ae46d8876
|
only do multipart upload for large files
Signed-off-by: Robin Appelman <robin@icewind.nl>
|
2017-09-21 14:06:59 +02:00 |
|
John Molakvoæ (skjnldsv)
|
0e17b65bcf
|
Avoid error undefined index classes in log
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
|
2017-09-21 14:00:39 +02:00 |
|
John Molakvoæ (skjnldsv)
|
8ac8773233
|
damn you firefox default values
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
|
2017-09-21 14:00:39 +02:00 |
|
John Molakvoæ (skjnldsv)
|
3e6b93e68d
|
Fix editing field animation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
|
2017-09-21 14:00:39 +02:00 |
|
John Molakvoæ (skjnldsv)
|
c66f16a201
|
Relative positionning to li
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
|
2017-09-21 14:00:39 +02:00 |
|
John Molakvoæ (skjnldsv)
|
85300ab50a
|
Quota icon by @jancborchardt
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
|
2017-09-21 14:00:38 +02:00 |
|
Morris Jobke
|
4b57f68b81
|
Fix unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
|
2017-09-21 14:00:38 +02:00 |
|
John Molakvoæ (skjnldsv)
|
3ff60c3af8
|
create special class forst first pinned class occurrence
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
|
2017-09-21 14:00:38 +02:00 |