Commit Graph

16376 Commits

Author SHA1 Message Date
Nextcloud bot aa51202d98
[tx-robot] updated from transifex 2017-08-11 00:08:30 +00:00
Daniel Calviño Sánchez 0b1dab14ca Fix preview of theming
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>
2017-08-10 13:45:31 +02:00
Daniel Calviño Sánchez 364b1b4a20 Refactor reloadStylesheets to receive absolute URLs
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>
2017-08-10 13:45:31 +02:00
Daniel Calviño Sánchez 5b0d7056e8 Provide "server.css" URL in ThemingController response
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>
2017-08-10 13:44:49 +02:00
Daniel Calviño Sánchez e883061f58 Split updateStylesheet tests for success and error
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>
2017-08-10 13:42:42 +02:00
Daniel Calviño Sánchez 8d93a0db8a Unify DataResponse format with its uses in the rest of the file
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-10 13:42:42 +02:00
Nextcloud bot 79f4b8566b
[tx-robot] updated from transifex 2017-08-10 00:08:24 +00:00
Nextcloud bot 72029627fc
[tx-robot] updated from transifex 2017-08-09 00:08:30 +00:00
Morris Jobke c78a209e72 Merge pull request #5979 from nextcloud/12-5738
[stable12] Improve spelling in LDAP
2017-08-08 19:23:12 +02:00
Morris Jobke 39d1428ab3 Merge pull request #6008 from 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
2017-08-08 18:42:31 +02:00
Morris Jobke 3f8e3fbb6b Merge pull request #5946 from nextcloud/12-5897
[stable12] Send an email once a file/folder is shared with a user
2017-08-08 16:36:46 +02:00
Morris Jobke 2abc49968e Merge pull request #5914 from nextcloud/12-5913
[stable12] Fix anchor name for federated sharing settings
2017-08-08 10:41:47 +02:00
Morris Jobke bcea6a041f Merge pull request #5984 from nextcloud/stable12-reopen-stable12-theming-lightness-correction
[stable12] Use same lightness calculation as the SCSS compiler for theming
2017-08-08 10:40:37 +02:00
Nextcloud bot 75d5989a8b
[tx-robot] updated from transifex 2017-08-08 00:08:19 +00:00
Daniel Calviño Sánchez c91e39a4ca Fix code style
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-07 15:01:06 +02:00
Daniel Calviño Sánchez bb96c79bc7 Remove superfluous selector part
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-07 15:01:05 +02:00
Daniel Calviño Sánchez 6fe6c0545e 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-07 15:01:05 +02:00
Daniel Calviño Sánchez 21ad25465d Do not use the same rules for loading icon than for upload icon
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>
2017-08-07 14:58:05 +02:00
Daniel Calviño Sánchez 4dd8c4b538 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-07 14:43:57 +02:00
Nextcloud bot 06a9357a49
[tx-robot] updated from transifex 2017-08-06 00:08:33 +00:00
Nextcloud bot b521ef1bf0
[tx-robot] updated from transifex 2017-08-05 00:08:19 +00:00
Julius Härtl e0ce8a7640
Use same lightness calculation as the SCSS compiler for theming
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-08-04 15:39:56 +02:00
Lukas Reschke 3474d73cae Revert "[stable12] theming lightness correction" 2017-08-04 15:38:56 +02:00
Allan Nordhøy ac977dd3a1 Improve spelling in LDAP
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-04 12:17:04 +02:00
Julius Härtl 796f0f9333
Use same lightness calculation as the SCSS compiler for theming
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-08-04 12:13:33 +02:00
Nextcloud bot 91b6d903f7
[tx-robot] updated from transifex 2017-08-04 00:08:27 +00:00
Nextcloud bot 690ef25928
[tx-robot] updated from transifex 2017-08-03 00:08:15 +00:00
Morris Jobke cf16087585 Disable default activity email for incoming shares
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-02 20:57:12 +02:00
Nextcloud bot ecc82fc1e6
[tx-robot] updated from transifex 2017-08-02 00:08:21 +00:00
Nextcloud bot 9f346fecf1
[tx-robot] updated from transifex 2017-08-01 00:08:35 +00:00
Nextcloud bot b3e2f57f98
[tx-robot] updated from transifex 2017-07-31 00:08:12 +00:00
Nextcloud bot a6499afb5b
[tx-robot] updated from transifex 2017-07-30 00:08:13 +00:00
Nextcloud bot 820a74e71b
[tx-robot] updated from transifex 2017-07-29 00:08:40 +00:00
Morris Jobke 635dc7e08c Fix anchor name for federated sharing settings
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-28 08:23:06 +02:00
Nextcloud bot ee4804b1da
[tx-robot] updated from transifex 2017-07-28 00:08:14 +00:00
Nextcloud bot 569892d3c0
[tx-robot] updated from transifex 2017-07-27 00:08:13 +00:00
Nextcloud bot 2902677ccf
[tx-robot] updated from transifex 2017-07-26 00:08:14 +00:00
Nextcloud bot 79522f4078
[tx-robot] updated from transifex 2017-07-25 00:08:13 +00:00
Nextcloud bot 65dba8a558
[tx-robot] updated from transifex 2017-07-24 00:08:13 +00:00
Georg Ehrke 7b113bb18a
Sabre/VObject returns DateTimeImmutable, not a simple DateTime
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-07-23 09:36:35 +02:00
Georg Ehrke 702d13cc79
don't send invitation emails for past events
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-07-23 09:36:24 +02:00
Nextcloud bot 12590bf3d8
[tx-robot] updated from transifex 2017-07-23 00:08:07 +00:00
Nextcloud bot f91d6624cd
[tx-robot] updated from transifex 2017-07-22 00:08:16 +00:00
Roeland Jago Douma 73b293fa6a Merge pull request #5754 from nextcloud/fed-unshare-fail-remote-12
[12] still remove the federated share even if we cant notify the remote
2017-07-21 12:46:31 +02:00
Roeland Jago Douma d338869257 Merge pull request #5805 from nextcloud/fix-public-links-stable12
[stable12] fix preview for public links
2017-07-21 11:02:02 +02:00
Nextcloud bot 9fe53e2649
[tx-robot] updated from transifex 2017-07-21 00:08:16 +00:00
Björn Schießle c9624d2695 Merge pull request #5630 from nextcloud/add-recovery-key-on-public-upload-stable12
[stable12] Add recovery key on public upload
2017-07-20 14:27:57 +02:00
Roeland Jago Douma 07ebc7b1c3 Merge pull request #5759 from nextcloud/backport-translations-stuff-12
[stable12] Backport translation fixes
2017-07-20 14:25:11 +02:00
Bjoern Schiessle fff804c39e
make sure that we always have a owner
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-20 11:43:39 +02:00
Bjoern Schiessle f7a2b96507
Add recovery key on public upload
In order to decide if a recovery key needs to be added we always
need to check the files owner settings and not the settings of
the currently logged in user.

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-20 11:43:39 +02:00
Bjoern Schiessle 2634f77741
fix preview for public links
in case a user is already logged in on the same server from
which the public link comes from, we need to setup the owners
file system in order to show the preview

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-20 11:31:31 +02:00
Nextcloud bot 9cbdca60d2
[tx-robot] updated from transifex 2017-07-20 00:08:13 +00:00
Morris Jobke ff9c5072f0 Add Android and iOS URLs to theming app
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-19 10:57:38 +02:00
Roeland Jago Douma 235f4d614a Allow overwriting of IOS theming values
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-19 10:57:25 +02:00
Nextcloud bot fad8b275f1
[tx-robot] updated from transifex 2017-07-19 00:08:32 +00:00
Allan Nordhøy f29d8bda3e - your
This avoids it being «"access to your "the cloud"» or similar. Italicizing %s might be a middleground here.
2017-07-18 09:12:31 +02:00
Allan Nordhøy 8bc18a1b4d sent, an invitation, - successful 2017-07-18 09:12:24 +02:00
Allan Nordhøy ee3c7fc8cb log out, : Bigversal 2017-07-18 09:12:07 +02:00
Allan Nordhøy 9eb5eebfad : Bigversal and LDAP 2017-07-18 09:11:56 +02:00
Allan Nordhøy 79e9f0a15b command-line, Consider narrowing 2017-07-18 09:11:45 +02:00
Allan Nordhøy 40eeaf4bb8 Spelling: Shortening and binding 2017-07-18 09:11:30 +02:00
Nextcloud bot 041e327a6c
[tx-robot] updated from transifex 2017-07-18 00:08:12 +00:00
Robin Appelman e49b8959c4
still remove the federated share even if we cant notify the remote
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-17 14:21:22 +02:00
Nextcloud bot 3fefa01709
[tx-robot] updated from transifex 2017-07-17 00:08:12 +00:00
Nextcloud bot 0463ef7e3b
[tx-robot] updated from transifex 2017-07-15 00:09:06 +00:00
Nextcloud bot 281e5eb8bc
[tx-robot] updated from transifex 2017-07-14 00:08:47 +00:00
Morris Jobke 701a865db7 Merge pull request #5692 from nextcloud/upload-hidden-filelist-12
[12] properly block file upload to non-active filelist
2017-07-13 11:47:46 +02:00
Nextcloud bot a9b38c025f
[tx-robot] updated from transifex 2017-07-13 00:08:42 +00:00
Robin Appelman 9e675dd8b1
fix test
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-12 12:20:14 +02:00
Robin Appelman d05f67b2f3
properly block file upload to non-active filelist
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-12 12:20:10 +02:00
Roeland Jago Douma 38ee24d56b Merge pull request #5687 from nextcloud/jail-propagator-12
[12] Fix propagating changes within jail wrapper
2017-07-12 11:50:10 +02:00
Roeland Jago Douma 405d3ccbd7 Merge pull request #5463 from nextcloud/shared-cache-during-init-12
[12] dont die if we try to access the shared cache while setting up the shared storage
2017-07-12 11:18:49 +02:00
Nextcloud bot 05b03c173e
[tx-robot] updated from transifex 2017-07-12 00:08:54 +00:00
Maxence Lange 02baa45898 wrong call
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-07-11 20:21:06 +02:00
Maxence Lange 7464996c56 verify that circles is installed
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-07-11 20:21:06 +02:00
Robin Appelman 2f7d0bbb18
Fix propagating changes within jail wrapper
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-11 19:20:51 +02:00
Lukas Reschke ce59546344 Merge pull request #5435 from nextcloud/backport-5124-allow-dirlisting-with-unreadable-items
[stable12] Allow dir-listing also when one child is blocked by access control
2017-07-11 16:08:43 +02:00
Morris Jobke e768426b11 Merge pull request #5679 from nextcloud/stable12-5656-fix-unselecting-items-on-multi-select-dropdowns
[stable12] Fix unselecting items on multi select dropdowns
2017-07-11 15:34:30 +02:00
Daniel Calviño Sánchez 3a660a1b89 Enable the toggleSelect extension in multi-select dropdowns
The toggleSelect extension for Select2 makes possible to unselect items
in a multi-select dropdown by clicking on them; this behaviour should be
enabled in all the multi-select dropdowns used in the server.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-11 13:02:09 +02:00
Morris Jobke ad7e6cfc9c Merge pull request #5670 from nextcloud/backport-5669-fix-remote-share-activity-emails
[stable12] Fix remote share activity emails
2017-07-11 12:21:30 +02:00
Morris Jobke 8fdd9dbb04 Merge pull request #5667 from nextcloud/5649-stable12
[stable12] fix alignment of radio button and its label in encryption settings
2017-07-11 11:31:41 +02:00
Roger Szabo ff286cd131 Rectify variable $uid->$user
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-07-10 18:38:30 +08:00
Joas Schilling 1ed251c6a9
Fix owner cloud id in unshare activity
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-10 12:28:45 +02:00
Joas Schilling 509bc4f1eb
Fix activity emails for accept/decline of remote shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-10 12:28:32 +02:00
Arthur Schiwon 0a71c1ccd3
fix alignment of radio button and its label in encryption settings
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-07-10 11:02:16 +02:00
Roger Szabo 500d2a0e2e pass missing function parameter
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-07-10 15:17:05 +08:00
Roger Szabo b725738870 css for button adjustment for nc12
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-07-10 15:16:55 +08:00
Roger Szabo 3e7a49e009 set needsPasswordReset flag correctly
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-07-10 15:16:42 +08:00
Roger Szabo 28933322a2 suppress superflous php error on rejected password change
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-07-10 15:16:12 +08:00
Nextcloud bot 28a37f04dc
[tx-robot] updated from transifex 2017-07-10 00:08:51 +00:00
Nextcloud bot 0324993342
[tx-robot] updated from transifex 2017-07-09 00:08:41 +00:00
Nextcloud bot f80159f52a
[tx-robot] updated from transifex 2017-07-08 00:08:37 +00:00
Morris Jobke a5182ab7c1 Merge pull request #5648 from nextcloud/backport-5483-png-files-for-activity-emails
[stable12] Use PNG icons for activity emails and ios client
2017-07-07 14:04:01 +02:00
Björn Schießle 8ad1123d5d Merge pull request #5458 from nextcloud/backport-5375-shared-folder-for-remote-shares
[stable12] Use the share_folder config for remote shares
2017-07-07 11:54:11 +02:00
Joas Schilling a6bae8ac44
Fix tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-07 11:16:54 +02:00
Joas Schilling 87e69b5510
Use PNG version of the icons for shipped activities
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-07 11:16:44 +02:00
Nextcloud bot a1f3f1783e
[tx-robot] updated from transifex 2017-07-07 00:08:35 +00:00
Joas Schilling 596380a62f Merge pull request #5433 from nextcloud/backport-5185-admin-audit-chunking-spam
[stable12] Don't try to generate logs for chunking paths
2017-07-06 08:43:39 +02:00
Nextcloud bot f2ac9c6582
[tx-robot] updated from transifex 2017-07-06 00:08:53 +00:00
Joas Schilling 79f6773ef9
Don't log passwords on dav exceptions
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-05 15:10:38 +02:00