summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* 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-081-1/+1
|\ \ | | | | | | | | | | | | nextcloud/replace-loading-icon-gif-with-pure-css-in-login-button Replace loading icon GIF with pure CSS in login button
| * | Replace loading icon GIF with pure CSS loading iconDaniel Calviño Sánchez2017-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0810-2/+22
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-08-062-0/+4
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-08-0524-6/+70
| |/ |/|
* | 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 #5967 from nextcloud/revert-5682-inline-svg-iconMorris Jobke2017-08-041-2/+2
|\ \ | | | | | | 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-031-2/+2
| |/
* / [tx-robot] updated from transifexNextcloud bot2017-08-0462-176/+246
|/
* Merge pull request #5738 from nextcloud/comradekingu-patch-3Morris Jobke2017-08-031-3/+3
|\ | | | | Spelling: UID
| * Improve spelling in LDAPAllan Nordhøy2017-08-021-3/+3
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #5959 from nextcloud/drop-logo-claimMorris Jobke2017-08-031-1/+0
|\ \ | | | | | | Logo claim is not used anymore
| * | Logo claim is not used anymoreMorris Jobke2017-08-021-1/+0
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2017-08-038-2/+46
| | |
* | | Merge pull request #5953 from nextcloud/theming-lightness-correctionLukas Reschke2017-08-021-4/+7
|\ \ \ | |/ / |/| | Use same lightness calculation as the SCSS compiler for theming
| * | Use same lightness calculation as the SCSS compiler for themingJulius Härtl2017-08-011-4/+7
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Proof of concept #5593 - inline SVG icon for icon-contactsMarin Treselj2017-08-021-2/+2
| |/ |/| | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
* | Merge pull request #5920 from nextcloud/gallery-share-view-fixMorris Jobke2017-08-021-2/+2
|\ \ | | | | | | Top bar buttons in share view are wrong positioned
| * | Change id to class in the main share templateMarin Treselj2017-07-311-2/+2
| | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
* | | Merge pull request #4790 from nextcloud/fix-comparisons-in-appsMorris Jobke2017-08-0231-143/+139
|\ \ \ | | | | | | | | Fix comparisons in apps
| * | | Remove undocumented configJoas Schilling2017-08-011-77/+73
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix versions appJoas Schilling2017-08-011-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix file size comparisonJoas Schilling2017-08-011-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix comparisions in the trashbin appJoas Schilling2017-08-012-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix comparisons in the sharing appJoas Schilling2017-08-015-10/+10
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix comparisons in the files external appJoas Schilling2017-08-019-26/+26
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix comparisons in the files appJoas Schilling2017-08-013-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix comparison in the ldap appJoas Schilling2017-08-011-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix comparisons in the versions appJoas Schilling2017-08-012-12/+12
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix comparisons in the dav appJoas Schilling2017-08-017-9/+9
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix comparisons in encryption appJoas Schilling2017-08-012-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #5956 from nextcloud/proper-update-notification-layoutMorris Jobke2017-08-024-20/+52
|\ \ \ \ | | | | | | | | | | Improve update notification layout and show non-default update server
| * | | | Improve update notification layout and show non-default update serverMorris Jobke2017-08-024-20/+52
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #5923 from nextcloud/expire-federation-jobsRoeland Jago Douma2017-08-0215-219/+400
|\ \ \ \ \ | |/ / / / |/| | | | Expire federation jobs
| * | | | Close all the cursorsJoas Schilling2017-08-021-12/+26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Use automatic injection whenever possibleJoas Schilling2017-08-026-80/+38
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Use ITimeFactoryRoeland Jago Douma2017-08-019-103/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Inject the timefacotry so we can mock it properly in the tests. * Extended unit tests to cover the new paths Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | we don't need to remove the job manually here, even if we ask once more the ↵Bjoern Schiessle2017-08-012-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | other server will decline and the background job will be removed Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | update unit testsBjoern Schiessle2017-08-012-12/+34
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | cleanup constructorsBjoern Schiessle2017-08-012-53/+33
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | expire requestSharedSecret job after 30 daysBjoern Schiessle2017-08-013-5/+48
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>