Commit graph

39730 commits

Author SHA1 Message Date
Nextcloud bot
7e0c00b576
[tx-robot] updated from transifex 2017-08-18 00:08:25 +00:00
Roeland Jago Douma
73e7560655 Merge pull request #6127 from nextcloud/12-6126
[stable12] Trigger search after re-focus
2017-08-17 09:16:28 +02: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
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
Morris Jobke
669c82afea Merge pull request #6111 from nextcloud/backport-6098-12
[stable12] Fix federation scope dropdown
2017-08-16 11:25:11 +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
Morris Jobke
faa83c3250 Trigger search after re-focus
If the share input field is unfocused, the autocomplete list is closed. Once
the field was focused again it was not properly opened again. This adds a
trigger to redo the search and show the results again.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-15 13:40:35 +02:00
Nextcloud bot
cd2d5b0b27
[tx-robot] updated from transifex 2017-08-15 00:08:25 +00:00
Marin Treselj
83616aea4f Make sure this still works in other apps.
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-14 22:24:09 +02: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
Marin Treselj
84b0790b99 Fixes nextcloud/gallery#269
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-14 22:21:42 +02:00
Morris Jobke
b31dfec9b8 Fix federation scope dropdown
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-14 22:15:49 +02:00
Robin Appelman
5d2b6b8240 Merge pull request #6103 from nextcloud/swift-filter-dot-12
[12] Filter magic dot object when swift directory
2017-08-14 17:30:24 +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
Morris Jobke
27f44b4600 Merge pull request #6067 from nextcloud/stable12-5981-fix-preview-of-theming
[stable12] Fix preview of theming
2017-08-10 21:01:01 +02:00
Morris Jobke
36d6a24402 Merge pull request #6061 from nextcloud/stable12_6052
[stable12] Fix copy from jailed storage
2017-08-10 13:57:18 +02: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
Daniel Calviño Sánchez
0b00d770fe Add acceptance tests for setting the color in the Theming app
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-10 13:42:29 +02:00
Daniel Calviño Sánchez
340a774fe2 Add getter for the timeout multiplier
In some cases the acceptance tests have to explicitly wait for something
to happen without using the "find" method from the actor; in those cases
the timeout multiplier needs to be taken into account too, so the test
cases must be able to retrieve it from the actor.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-10 13:34:38 +02:00
Roeland Jago Douma
745ad2f323
Fix copy from jailed storage
If we have a jailed storage we must also fix the internal path on copy.
Else we pass in the wrong path.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-10 08:07:00 +02:00
Nextcloud bot
79f4b8566b
[tx-robot] updated from transifex 2017-08-10 00:08:24 +00:00
Morris Jobke
d9301a5b07 Fix redis-cluster support on drone
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-09 23:04:29 +02:00
Morris Jobke
2e115921a0 Update syntax to drone 0.8
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-09 12:30:25 +02:00
Nextcloud bot
72029627fc
[tx-robot] updated from transifex 2017-08-09 00:08:30 +00:00
Morris Jobke
cd095bb0b8 Merge pull request #5978 from nextcloud/12-5908
[stable12] Add css class for toogle preview icon
2017-08-08 19:23:35 +02: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
e11dcfcf9e Merge pull request #5966 from nextcloud/backport-oracle
[stable12] Fix oracle db
2017-08-08 16:34:25 +02:00
Morris Jobke
c119f66e75 Merge pull request #5937 from nextcloud/backend-can-be-wrong---sometimes
display error icon on non-success
2017-08-08 16:18:56 +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
bf4283bce8 Merge pull request #5945 from nextcloud/stable12_5836
[stable12] Empty search no longer works
2017-08-08 10:41:05 +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
Morris Jobke
3313c682bf Merge pull request #5925 from derkostka/patch-1
[stable12] Removed cast to integer in getSize
2017-08-08 10:40:09 +02:00
Joas Schilling
cb4c37498d Merge pull request #6001 from nextcloud/backport-5695-dont-throw-when-table-is-missing
[stable12] Don't throw an error when the table doesn't exist
2017-08-08 10:30:45 +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