summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update syntax to drone 0.8Morris Jobke2017-08-091-2/+4
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* [tx-robot] updated from transifexNextcloud bot2017-08-09574-862/+462
|
* Merge pull request #5982 from ↵Lukas Reschke2017-08-081-1/+2
|\ | | | | | | | | nextcloud/fix-loading-icon-inside-upload-button-in-theming-app Fix loading icon inside upload button in Theming app
| * Fix loading icon inside upload button in Theming appDaniel Calviño Sánchez2017-08-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge pull request #5972 from ↵Morris Jobke2017-08-085-4/+53
|\ \ | | | | | | | | | | | | nextcloud/replace-loading-icon-gif-with-pure-css-in-login-button Replace loading icon GIF with pure CSS in login button
| * | Ignore clicks on login button icon so they are received by the buttonDaniel Calviño Sánchez2017-08-072-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Replace loading icon GIF with pure CSS loading iconDaniel Calviño Sánchez2017-08-035-4/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | [tx-robot] updated from transifexNextcloud bot2017-08-0818-42/+740
| | |
* | | Merge pull request #5998 from nextcloud/drone_mysqlmb4_71Morris Jobke2017-08-071-0/+11
|\ \ \ | | | | | | | | Add mysqlmb4 php7.1 drone job
| * | | Add mysqlmb4 php7.1 drone jobRoeland Jago Douma2017-08-061-0/+11
|/ / / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #5997 from nextcloud/drone_mysqlmb4_70Morris Jobke2017-08-061-0/+11
|\ \ \ | | | | | | | | Add myslqmb4 php 7.0 drone
| * | | Add myslqmb4 php 7.0 droneRoeland Jago Douma2017-08-061-0/+11
|/ / / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #5995 from nextcloud/drone_mysql_71Morris Jobke2017-08-061-0/+11
|\ \ \ | | | | | | | | Add PHP 7.1 mysql job to drone
| * | | Add PHP 7.1 mysql job to droneRoeland Jago Douma2017-08-061-0/+11
|/ / / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #5990 from nextcloud/drone_mysql_70Roeland Jago Douma2017-08-061-0/+11
|\ \ \ | | | | | | | | Also run mysql test on php7.0
| * | | Also run mysql test on php7.0Roeland Jago Douma2017-08-051-0/+11
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2017-08-068-4/+16
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2017-08-05158-270/+350
| | |
* | | Merge pull request #5550 from andreasjacobsen93/clean-settings-layoutMorris Jobke2017-08-043-240/+265
|\ \ \ | |_|/ |/| | Cleaned up personal settings page
| * | Merge branch 'master' into clean-settings-layoutMorris Jobke2017-08-0468-198/+261
| |\ \
| * \ \ Merge branch 'clean-settings-layout' of ↵Marin Treselj2017-08-041011-7186/+12366
| |\ \ \ | | | | | | | | | | | | | | | github.com:andreasjacobsen93/nextcloud-server into clean-settings-layout
| | * \ \ Merge branch 'master' into clean-settings-layoutMorris Jobke2017-08-031011-7186/+12366
| | |\ \ \ | | | | |/ | | | |/|
| * | / | Fix federation icon menu and container paddings.Marin Treselj2017-08-042-48/+11
| |/ / / | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * | | Reintroduce a more compact grid.Marin Treselj2017-08-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Overrides core `.section` values. Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * | | Clean up HTML structure, fix labels.Marin Treselj2017-08-032-60/+26
| | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * | | Merge branch 'clean-settings-layout' of ↵Andreas Jacobsen2017-07-24672-8160/+15570
| |\ \ \ | | | | | | | | | | | | | | | https://github.com/andreasjacobsen93/server into clean-settings-layout
| | * \ \ Merge branch 'master' into clean-settings-layoutAndreas Jacobsen2017-07-15672-8160/+15570
| | |\ \ \
| * | | | | Fixed bug with sharing-settingsAndreas Jacobsen2017-07-242-1/+6
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com>
| * | | | Personal settings file changedAndreas Jacobsen2017-07-152-422/+347
| | | | |
| * | | | Updated layoutAndreas Jacobsen2017-07-142-17/+26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com>
| * | | | Moved settings to leftAndreas Jacobsen2017-07-142-9/+13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com>
| * | | | Update for settingsAndreas Jacobsen2017-06-292-16/+34
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com>
| * | | | Added space between avatar and settingsAndreas Jacobsen2017-06-281-6/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com>
| * | | | Fixed typosAndreas Jacobsen2017-06-282-6/+6
| | | | |
| * | | | Merge branch 'clean-settings-layout' of ↵Andreas Jacobsen2017-06-280-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | https://github.com/andreasjacobsen93/server into clean-settings-layout
| | * | | | Cleaned up personal settings pageAndreas Jacobsen2017-06-272-73/+106
| | | | | |
| * | | | | Cleaned up personal settings pageAndreas Jacobsen2017-06-282-73/+106
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com>
* | | | | Merge pull request #5969 from ↵Morris Jobke2017-08-041-20/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Fix code styleDaniel Calviño Sánchez2017-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Remove superfluous selector partDaniel Calviño Sánchez2017-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Align vertically loading icon and status messageDaniel Calviño Sánchez2017-08-031-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | Do not use the same rules for loading icon than for upload iconDaniel Calviño Sánchez2017-08-031-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | Remove ignored rulesDaniel Calviño Sánchez2017-08-031-11/+0
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Merge pull request #5954 from nextcloud/textpreview_rangeLukas Reschke2017-08-041-1/+6
|\ \ \ \ \ | | | | | | | | | | | | Do not fetch the whole text file for the sidebar preview
| * | | | | Do not fetch the whole text file for the sidebar previewRoeland Jago Douma2017-08-031-1/+6
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Merge pull request #5963 from nextcloud/pre_post_share_eventsLukas Reschke2017-08-044-124/+302
|\ \ \ \ \ | |_|_|_|/ |/| | | | Move pre_shared and post_shared events to EventDispatcher
| * | | | Move pre_shared and post_shared events to EventDispatcherRoeland Jago Douma2017-08-034-124/+302
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Now listeners for those events get proper share objects. * Legacy hooks still fired * Updated tests Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #5967 from nextcloud/revert-5682-inline-svg-iconMorris Jobke2017-08-046-22/+15
|\ \ \ \ \ | | | | | | | | | | | | Revert "Proof of concept #5593 - inline SVG icon for icon-contacts"
| * | | | | Revert "Proof of concept #5593 - inline SVG icon for icon-contacts"Joas Schilling2017-08-036-22/+15
| | |/ / / | |/| | |
* / | | | [tx-robot] updated from transifexNextcloud bot2017-08-0462-176/+246
|/ / / /
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-13 02:26:08 +0000