9707ef9ba7
Merge pull request #5982 from nextcloud/fix-loading-icon-inside-upload-button-in-theming-app
...
Fix loading icon inside upload button in Theming app
2017-08-08 18:41:57 +02:00
d7645ee928
Merge pull request #5972 from nextcloud/replace-loading-icon-gif-with-pure-css-in-login-button
...
Replace loading icon GIF with pure CSS in login button
2017-08-08 14:40:35 +02:00
481002a00b
[tx-robot] updated from transifex
2017-08-08 00:08:10 +00:00
2398e845c9
Fix loading icon inside upload button in Theming app
...
Pull request #5969 fixed the vertical alignment of loading icon and
status message in Theming app, but in doing so it broke the loading icon
inside the upload button.
When an image is being uploaded the upload icon is replaced by a loading
icon, so the loading icon and the upload icon have to share their CSS
rules, but only in that specific case.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-07 15:04:43 +02:00
92d28fdc68
Ignore clicks on login button icon so they are received by the button
...
Visually, the icon positioned on the login button is part of the login
button, so clicking on the icon should be the same as clicking on the
button. As the icon is a different element this commit sets the icon to
ignore mouse events so they are received and handled by the login button
instead.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-07 14:28:04 +02:00
de911f6e5c
Merge pull request #5998 from nextcloud/drone_mysqlmb4_71
...
Add mysqlmb4 php7.1 drone job
2017-08-07 08:48:23 +02:00
e64ba1d343
Add mysqlmb4 php7.1 drone job
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-06 20:13:04 +02:00
7a3d746d0d
Merge pull request #5997 from nextcloud/drone_mysqlmb4_70
...
Add myslqmb4 php 7.0 drone
2017-08-06 14:44:28 +02:00
68d6e788e4
Add myslqmb4 php 7.0 drone
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-06 13:07:34 +02:00
1247bd8755
Merge pull request #5995 from nextcloud/drone_mysql_71
...
Add PHP 7.1 mysql job to drone
2017-08-06 12:32:59 +02:00
5164f25a54
Add PHP 7.1 mysql job to drone
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-06 10:45:10 +02:00
2d7e7212fa
Merge pull request #5990 from nextcloud/drone_mysql_70
...
Also run mysql test on php7.0
2017-08-06 10:35:57 +02:00
eb2442b871
[tx-robot] updated from transifex
2017-08-06 00:08:24 +00:00
c0f9a397d7
Also run mysql test on php7.0
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-05 19:59:37 +02:00
21f2fe5cb9
[tx-robot] updated from transifex
2017-08-05 00:08:08 +00:00
3e091b5294
Merge pull request #5550 from andreasjacobsen93/clean-settings-layout
...
Cleaned up personal settings page
2017-08-04 23:30:52 +02:00
de94eefe97
Merge pull request #5969 from nextcloud/fix-vertical-alignment-of-loading-icon-and-status-message-in-theming-app
...
Fix vertical alignment of loading icon and status message in Theming app
2017-08-04 12:08:16 +02:00
3266e81577
Merge pull request #5954 from nextcloud/textpreview_range
...
Do not fetch the whole text file for the sidebar preview
2017-08-04 11:23:42 +02:00
a1d44a7206
Merge pull request #5963 from nextcloud/pre_post_share_events
...
Move pre_shared and post_shared events to EventDispatcher
2017-08-04 11:18:53 +02:00
90d8070da3
Merge branch 'master' into clean-settings-layout
2017-08-04 11:11:33 +02:00
d63beffe9e
Merge pull request #5967 from nextcloud/revert-5682-inline-svg-icon
...
Revert "Proof of concept #5593 - inline SVG icon for icon-contacts"
2017-08-04 10:53:21 +02:00
54444110d9
Merge branch 'clean-settings-layout' of github.com:andreasjacobsen93/nextcloud-server into clean-settings-layout
2017-08-04 10:23:52 +02:00
a4d9845326
Fix federation icon menu and container paddings.
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-04 10:22:03 +02:00
1f8a45bbd7
[tx-robot] updated from transifex
2017-08-04 00:08:18 +00:00
b237379fa1
Replace loading icon GIF with pure CSS loading icon
...
The pure CSS loading icon uses an ::after pseudo-element, and thus it
can only be used on container elements; the input element is not a
container element, so when the class "icon-loading-small" is set on an
input element it falls back to a loading icon GIF.
This commit modifies the markup of the login button to add a div element
that holds the confirm icon and the loading icon (depending on the
case). In order to position the icon in the same place as before the
input and the icon are both wrapped by another div making possible to
set the absolute position of the icon relative to the input.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-03 21:09:43 +02:00
09a8c4a5d4
Fix code style
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-03 21:09:25 +02:00
c723d093a8
Remove superfluous selector part
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-03 21:09:25 +02:00
4fbcbd3e6d
Align vertically loading icon and status message
...
As both elements are inline/inline-block and belong to the same line
they can be aligned vertically using "vertical-align: middle".
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-03 21:09:25 +02:00
fa7f4e5cae
Do not use the same rules for loading icon than for upload icon
...
The loading icon is used in a totally different way than the upload icon
and thus it should not share its CSS rules.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-03 21:09:25 +02:00
33c4a674a2
Remove ignored rules
...
The removed rules were either always overriden by other rules or never
used due to not matching any element.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-03 21:09:25 +02:00
3aa819c62c
Do not fetch the whole text file for the sidebar preview
...
Just fetch the first 10kb. This should be more than enough in 99% of the
cases. And avoid downloading a 10mb text file just to display a tiny
portion.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-03 20:32:59 +02:00
9abbd6ab13
Revert "Proof of concept #5593 - inline SVG icon for icon-contacts"
2017-08-03 17:27:24 +02:00
4633717f04
Move pre_shared and post_shared events to EventDispatcher
...
* Now listeners for those events get proper share objects.
* Legacy hooks still fired
* Updated tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-03 15:14:29 +02:00
ac4927809c
Merge branch 'master' into clean-settings-layout
2017-08-03 15:07:42 +02:00
bb865a55fe
Merge pull request #5738 from nextcloud/comradekingu-patch-3
...
Spelling: UID
2017-08-03 14:28:41 +02:00
7de9eb16d8
Reintroduce a more compact grid.
...
Overrides core `.section` values.
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-03 13:12:00 +02:00
7284458e24
Clean up HTML structure, fix labels.
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-03 12:51:27 +02:00
8fecc336ac
Merge pull request #5959 from nextcloud/drop-logo-claim
...
Logo claim is not used anymore
2017-08-03 08:20:56 +02:00
21dd85678f
[tx-robot] updated from transifex
2017-08-03 00:08:06 +00:00
ea2e629c6c
Merge pull request #5953 from nextcloud/theming-lightness-correction
...
Use same lightness calculation as the SCSS compiler for theming
2017-08-02 23:17:19 +02:00
585e5c6ea5
Logo claim is not used anymore
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-02 23:08:45 +02:00
c40352c030
Merge pull request #5816 from nextcloud/fix-oracle
...
Fix oracle
2017-08-02 20:54:58 +02:00
a0939f78b3
Merge pull request #5682 from nextcloud/inline-svg-icon
...
Proof of concept #5593 - inline SVG icon for icon-contacts
2017-08-02 20:49:45 +02:00
c658862052
Replace `include` with `file_get_contents`
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-02 18:27:24 +02:00
ffcdc96a0b
Proof of concept #5593 - inline SVG icon for icon-contacts
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-02 18:27:24 +02:00
2fcf4f2f29
Improve spelling in LDAP
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-02 18:12:31 +02:00
6ca4b9eee9
Merge pull request #5920 from nextcloud/gallery-share-view-fix
...
Top bar buttons in share view are wrong positioned
2017-08-02 16:59:24 +02:00
6290ba8299
Merge pull request #4790 from nextcloud/fix-comparisons-in-apps
...
Fix comparisons in apps
2017-08-02 16:28:33 +02:00
1a711b1e73
Merge pull request #5956 from nextcloud/proper-update-notification-layout
...
Improve update notification layout and show non-default update server
2017-08-02 16:26:57 +02:00
fbfd371493
Merge pull request #5923 from nextcloud/expire-federation-jobs
...
Expire federation jobs
2017-08-02 16:15:28 +02:00
Lukas Reschke
Morris Jobke
Nextcloud bot
Daniel Calviño Sánchez
Roeland Jago Douma
Roeland Jago Douma
Marin Treselj
Joas Schilling
Allan Nordhøy