Morris Jobke
4c2f194589
Merge pull request #6114 from nextcloud/stable12_5852
...
[stable12] Delete trash using node API to trigger preview deletion
2017-08-24 02:59:44 +02:00
Morris Jobke
5fab554bd2
Merge pull request #6108 from nextcloud/backport-6080-12
...
[stable12] Add buttom border for header
2017-08-24 02:58:03 +02:00
Nextcloud bot
9baf03d28c
[tx-robot] updated from transifex
2017-08-24 00:09:00 +00:00
Roeland Jago Douma
81acf70bca
Merge pull request #6240 from nextcloud/12-6239
...
[stable12] Show "Uploading..." in web UI for long uploads
2017-08-23 19:16:50 +02:00
Roeland Jago Douma
9b3e70f554
Merge pull request #6151 from nextcloud/backport-6099-no-exception-on-sharee-error
...
[stable12] Catch exceptions on error of cloud id resolution
2017-08-23 15:59:33 +02:00
Morris Jobke
47f87bbf8c
Show "Uploading..." in web UI for long uploads
...
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>
2017-08-23 15:53:48 +02:00
Nextcloud bot
8f20b4566a
[tx-robot] updated from transifex
2017-08-23 00:09:04 +00:00
Nextcloud bot
8e8af07e79
[tx-robot] updated from transifex
2017-08-22 00:08:29 +00:00
Nextcloud bot
de8fe9cbd9
[tx-robot] updated from transifex
2017-08-21 00:08:22 +00:00
Nextcloud bot
6ea56593a7
[tx-robot] updated from transifex
2017-08-20 00:08:24 +00:00
Nextcloud bot
366c73a185
[tx-robot] updated from transifex
2017-08-19 00:08:36 +00:00
Nextcloud bot
7e0c00b576
[tx-robot] updated from transifex
2017-08-18 00:08:25 +00:00
Nextcloud bot
948d6742ce
[tx-robot] updated from transifex
2017-08-17 00:08:23 +00:00
Morris Jobke
3326118bdc
Merge pull request #6150 from nextcloud/backport-6128-primary-font-color-in-capabilities
...
[stable12] Add the primary font color to the capabilities as well
2017-08-16 21:51:57 +02:00
Joas Schilling
bd80121fc6
Catch exceptions on error of cloud id resolution
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-16 13:57:30 +02:00
Joas Schilling
5474e298a1
Add the primary font color to the capabilities as well
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-16 11:51:15 +02:00
Joas Schilling
fa8e202e65
Merge pull request #6112 from nextcloud/backport-5920-12
...
[stable12] Top bar buttons in share view are wrong positioned
2017-08-16 11:12:53 +02:00
Nextcloud bot
7913d33de9
[tx-robot] updated from transifex
2017-08-16 00:08:42 +00:00
Roeland Jago Douma
32b69cd40b
Delete trash using node API to trigger preview deletion
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-15 08:52:13 +02:00
Nextcloud bot
cd2d5b0b27
[tx-robot] updated from transifex
2017-08-15 00:08:25 +00:00
Marin Treselj
eaa00ea2c8
Change id to class in the main share template
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-14 22:24:00 +02:00
Morris Jobke
cafce87a78
Add buttom border for header
...
* allows to distinct the header from the rest of the UI for bright colors
* ref #5654
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-14 18:00:36 +02:00
Robin Appelman
e3166a601d
Filter magic dot object when swift directory
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-08-14 15:40:25 +02:00
Nextcloud bot
99cef14c31
[tx-robot] updated from transifex
2017-08-14 00:08:31 +00:00
Nextcloud bot
4a140398a9
[tx-robot] updated from transifex
2017-08-13 00:08:23 +00:00
Nextcloud bot
ee73ddd8a9
[tx-robot] updated from transifex
2017-08-12 00:08:28 +00:00
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