summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6240 from nextcloud/12-6239Roeland Jago Douma2017-08-231-0/+4
|\ | | | | [stable12] Show "Uploading..." in web UI for long uploads
| * Show "Uploading..." in web UI for long uploadsMorris Jobke2017-08-231-0/+4
| | | | | | | | | | | | | | | | If the estimated upload time is bigger than 4 hours it shows the text "Uploading..." because the time then doesn't give any good hint to the user anyways. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #6151 from ↵Roeland Jago Douma2017-08-231-5/+21
|\ \ | |/ |/| | | | | nextcloud/backport-6099-no-exception-on-sharee-error [stable12] Catch exceptions on error of cloud id resolution
| * Catch exceptions on error of cloud id resolutionJoas Schilling2017-08-161-5/+21
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | [tx-robot] updated from transifexNextcloud bot2017-08-232-0/+4
| |
* | [tx-robot] updated from transifexNextcloud bot2017-08-2284-332/+400
| |
* | [tx-robot] updated from transifexNextcloud bot2017-08-2118-66/+192
| |
* | [tx-robot] updated from transifexNextcloud bot2017-08-2014-86/+224
| |
* | [tx-robot] updated from transifexNextcloud bot2017-08-1922-80/+200
| |
* | [tx-robot] updated from transifexNextcloud bot2017-08-1810-0/+16
| |
* | [tx-robot] updated from transifexNextcloud bot2017-08-1784-552/+586
| |
* | Merge pull request #6150 from ↵Morris Jobke2017-08-162-9/+22
|\ \ | | | | | | | | | | | | nextcloud/backport-6128-primary-font-color-in-capabilities [stable12] Add the primary font color to the capabilities as well
| * | Add the primary font color to the capabilities as wellJoas Schilling2017-08-162-9/+22
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #6112 from nextcloud/backport-5920-12Joas Schilling2017-08-161-2/+2
|\ \ | |/ |/| [stable12] Top bar buttons in share view are wrong positioned
| * Change id to class in the main share templateMarin Treselj2017-08-141-2/+2
| | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
* | [tx-robot] updated from transifexNextcloud bot2017-08-168-32/+136
| |
* | [tx-robot] updated from transifexNextcloud bot2017-08-154-0/+16
|/
* Filter magic dot object when swift directoryRobin Appelman2017-08-141-1/+1
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* [tx-robot] updated from transifexNextcloud bot2017-08-1412-4/+54
|
* [tx-robot] updated from transifexNextcloud bot2017-08-1310-20/+24
|
* [tx-robot] updated from transifexNextcloud bot2017-08-1212-8/+58
|
* [tx-robot] updated from transifexNextcloud bot2017-08-114-18/+38
|
* Fix preview of themingDaniel Calviño Sánchez2017-08-101-5/+9
| | | | | | | | | | | | | | | | Pull request #5584 made cached SCSS files depend on a hash of the base URL, so the "/css/core/server.css" file does no longer exist; as the file can not be loaded the "Loading preview" message is never removed and the "Saved" message is never shown. As it now depends on the hash of the base URL the file to be reloaded can no longer be hardcoded, so the full URL to the "server.css" file that has to be reloaded (if any) is now got from the DataResponse provided by the controller. Fixes #5975 Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* Refactor reloadStylesheets to receive absolute URLsDaniel Calviño Sánchez2017-08-101-3/+3
| | | | | | | This is a preparatory step for a following change in which reloadStylesheets will have to be able to receive absolute URLs. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* Provide "server.css" URL in ThemingController responseDaniel Calviño Sánchez2017-08-102-4/+48
| | | | | | | | | | | | | | Pull request #5584 made cached SCSS files depend on a hash of the base URL, so the "/css/core/server.css" file does no longer exist. The "server.css" URL must be known by the Theming app in order to update the stylesheets when previewing the changes to the theme, so the DataResponse from the controller now provides the full URL to the "server.css" file that has to be reloaded (if any). The "server.css" URL provided by the response will be taken into account by the JavaScript front-end in a following commit. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* Split updateStylesheet tests for success and errorDaniel Calviño Sánchez2017-08-101-17/+51
| | | | | | | | This is a preparatory step for a following commit in which the properties present in the response will change depending on whether the request was successful or not. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* Unify DataResponse format with its uses in the rest of the fileDaniel Calviño Sánchez2017-08-101-6/+9
| | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* [tx-robot] updated from transifexNextcloud bot2017-08-104-0/+8
|
* [tx-robot] updated from transifexNextcloud bot2017-08-09566-830/+306
|
* Merge pull request #5979 from nextcloud/12-5738Morris Jobke2017-08-081-3/+3
|\ | | | | [stable12] Improve spelling in LDAP
| * Improve spelling in LDAPAllan Nordhøy2017-08-041-3/+3
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #6008 from ↵Morris Jobke2017-08-081-19/+8
|\ \ | | | | | | | | | | | | nextcloud/stable12-5969-fix-vertical-alignment-of-loading-icon-and-status-message-in-theming-app [stable12] Fix vertical alignment of loading icon and status message in Theming app
| * | Fix code styleDaniel Calviño Sánchez2017-08-071-1/+1
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Remove superfluous selector partDaniel Calviño Sánchez2017-08-071-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-071-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-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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; in general 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-071-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 #5946 from nextcloud/12-5897Morris Jobke2017-08-082-2/+2
|\ \ \ | | | | | | | | [stable12] Send an email once a file/folder is shared with a user
| * | | Disable default activity email for incoming sharesMorris Jobke2017-08-022-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #5914 from nextcloud/12-5913Morris Jobke2017-08-081-1/+1
|\ \ \ \ | | | | | | | | | | [stable12] Fix anchor name for federated sharing settings
| * | | | Fix anchor name for federated sharing settingsMorris Jobke2017-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #5984 from ↵Morris Jobke2017-08-081-4/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/stable12-reopen-stable12-theming-lightness-correction [stable12] Use same lightness calculation as the SCSS compiler for theming
| * | | | | Use same lightness calculation as the SCSS compiler for themingJulius Härtl2017-08-041-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | [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
|/ / / /
* | | | Revert "[stable12] theming lightness correction"Lukas Reschke2017-08-041-7/+4
| | | |
* | | | Use same lightness calculation as the SCSS compiler for themingJulius Härtl2017-08-041-4/+7
| |_|/ |/| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | [tx-robot] updated from transifexNextcloud bot2017-08-0462-176/+246
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-08-038-2/+46
| | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-25 00:54:13 +0000