3ad96a4c57
SSL menu is now shown for files_external
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-10 16:08:40 -05:00
affa8d07ca
Merge pull request #4762 from nextcloud/add-unsafe-global-eval-fn
...
Add fallback to jQuery.fn.globalEval
2017-05-10 11:37:06 -05:00
f95f1b20f1
Merge pull request #4787 from nextcloud/missing-parameter
...
Fix missing placeholder for doc link
2017-05-10 14:44:24 +02:00
486bfa5c78
Merge pull request #4788 from nextcloud/issue-4756-cron-error
...
Fix errors with LookupServerConnector background job
2017-05-10 13:22:40 +02:00
93994b1320
Eval script elemtents in HTML body response
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-10 13:03:15 +02:00
d84a6ec3f3
Merge pull request #4771 from nextcloud/error-page-logo-css
...
use the same logo css for the error page as the login page
2017-05-10 12:10:38 +02:00
5c20d2ca8c
Use the configured lookup server
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-10 12:06:09 +02:00
266a1e88fa
Define method shouldRun
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-10 12:06:09 +02:00
253057355c
Fix missing placeholder for doc link
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-10 11:45:08 +02:00
209b05489d
Merge pull request #4770 from nextcloud/bugfix/4749/properties_table_propertyvalue_clob
...
we can't predict the size of propertyvalue. text -> clob
2017-05-10 00:20:57 -05:00
fb78774eb8
[tx-robot] updated from transifex
2017-05-10 00:08:31 +00:00
ec69980154
Merge pull request #4772 from nextcloud/fix-theming-background-preview
...
Fix theming preview for background image
2017-05-10 00:31:55 +02:00
6a4734d78e
Merge pull request #4702 from nextcloud/handle-user-folder-not-available
...
Stop if user folder is not available
2017-05-09 22:50:52 +02:00
b2c96d0c23
Stop if user folder is not available
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-09 11:26:08 -05:00
fb204de7f6
Fix theming preview for background image
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-09 18:21:41 +02:00
6a0f2fe52d
Merge pull request #4737 from nextcloud/logo-icon-container
...
fix sizing of logo in header
2017-05-09 18:21:01 +02:00
694c9ad49c
use the same logo css for the error page as the login page
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-09 18:14:33 +02:00
80eb3064e2
we can't predict the size of propertyvalue. text -> clob
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-05-09 18:12:50 +02:00
b9bcc819bd
Merge pull request #4758 from nextcloud/fix_3470
...
Do not write and read rootcerts.crt at the same time
2017-05-09 15:00:35 +02:00
04a5c34cac
Merge pull request #4746 from nextcloud/fix-mentioned-user-not-clickable-after-posting-or-editing-a-comment
...
Fix mentioned user not clickable after posting or editing a comment
2017-05-09 14:23:29 +02:00
5a61a794d4
Do not write and read rootcerts.crt at the same time
...
(Possibly) fixes #3470
When updating the main file /files_external/rootcerts.crt we should not
read from /files_external/rootcerts.crt at the same time.
For 2 reasons: writing to a file and reading from it at the same time
can have non deterministic results
And we don't want all the certificates to appear 2 times in there.
This isn't caught by our standard file locking (that does not allow this
actually) because it is in a non locked path....
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-09 13:00:07 +02:00
46f7e8202f
Merge pull request #4752 from nextcloud/fix-personal-settings-popover
...
Fix privacy settings drop downs on personal settings page
2017-05-09 12:15:20 +02:00
62f2610129
Merge pull request #4736 from nextcloud/richdef-opengraph
...
open-graph
2017-05-09 11:15:55 +02:00
a089e08411
Add circle as well
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-09 10:45:10 +02:00
07fe15eea5
Merge pull request #4705 from nextcloud/htaccess-upload
...
Proper exception for upload of .htaccess file via WebDAV
2017-05-09 10:35:38 +02:00
a06ef70c8f
Merge pull request #4757 from nextcloud/fix/system-users-enumeration-contacts-menu
...
Do not list system users in contacts menu if sharing autocompletion i…
2017-05-09 10:34:37 +02:00
defb153ce3
Fix privacy settings drop downs on personal settings page
...
* fixes #4672
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-09 10:16:23 +02:00
90b1c73e81
my name as author
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-05-09 07:14:52 -01:00
93e4bd3495
using title as name
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-05-09 07:10:16 -01:00
56a9084dd2
Do not list system users in contacts menu if sharing autocompletion is disabled
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-09 08:45:36 +02:00
dfa3aaa0c6
Merge pull request #4753 from nextcloud/fix-links-on-error-page
...
Fix escaped HTML on error pages
2017-05-09 08:45:11 +02:00
684997f79c
Merge pull request #4751 from nextcloud/wait-for-postgres
...
Wait for Postgres to be available
2017-05-09 08:44:28 +02:00
888e719671
Merge pull request #4750 from nextcloud/allow-requests-to-manifest-json
...
Don't redirect requests to /core/img/manifest.json
2017-05-09 08:43:35 +02:00
37b847ec48
[tx-robot] updated from transifex
2017-05-09 05:08:07 +00:00
43275b1000
[tx-robot] updated from transifex
2017-05-09 04:32:51 +00:00
d6c25748be
Merge pull request #4755 from nextcloud/l10n-extraction
...
Extract app name and navigation entries for l10n
2017-05-08 23:25:20 -05:00
692e056df9
Extract app name and navigation entries for l10n
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-08 23:24:28 -05:00
9309217ecb
Fix escaped HTML on error pages
...
* fixes #4655
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-08 21:16:08 -05:00
f8044cbbce
Proper exception for upload of .htaccess file via WebDAV
...
* fixes #2860
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-08 20:03:41 -05:00
f6a4028fad
[tx-robot] updated from transifex
2017-05-09 00:07:51 +00:00
e696b92297
Wait for Postgres to be available
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-08 17:57:49 -05:00
ccd0ded812
Don't redirect requests to /core/img/manifest.json
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-09 00:02:37 +02:00
9d8e9b1efb
[tx-robot] updated from transifex
2017-05-08 20:49:06 +00:00
3a22f9dfe5
Merge pull request #4745 from nextcloud/improve-text
...
Improve readability of verify text
2017-05-08 22:29:04 +02:00
0db3a413b3
Fix mentioned user not clickable after posting or editing a comment
...
The contactsMenu plugin was called on avatar elements from
_postRenderItem, which is called when a new comment is added to the
collection. Due to this contactsMenu was not called when messages were
edited; when a new comment is posted _postRenderItem is called, but at
that time the "mentions" attribute is not filled yet, so "@username" is
not replaced by avatars in the message and thus contactsMenu has no
avatars to be called on.
Calling contactsMenu was moved to a new method, _postRenderMessage,
which is called from _postRenderItem and from the success callback when
fetching the model in _onSubmitSuccess (which replaces "@username" by
avatars in the message after posting or editing a comment).
Fixes #4555
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-08 22:24:33 +02:00
e77ea713b2
Improve readability of verify text
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-08 15:03:25 -05:00
002018d8ad
Add missing unit tests for comments with mentions
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-08 21:55:22 +02:00
fe13f214fd
Merge pull request #4692 from nextcloud/unify-sharing-messages
...
don't mention the owner of a file in case of a re-share by mail.
2017-05-08 13:32:04 -05:00
1a83f11925
Merge pull request #4718 from nextcloud/handle-stalled-or-invisible-elements-automatically-in-acceptance-tests
...
Handle stale or invisible elements automatically in acceptance tests
2017-05-08 12:52:30 -05:00
2d707fdfb5
Merge pull request #4621 from nextcloud/fix_readonly_shared_calendar_proppatch
...
fix PROPPATCH requests to read-only shared calendars
2017-05-08 12:42:30 -05:00
Morris Jobke
Roeland Jago Douma
Lukas Reschke
Joas Schilling
Nextcloud bot
Julius Härtl
Robin Appelman
Georg Ehrke
Roeland Jago Douma
Maxence Lange
Christoph Wurst
Daniel Calviño Sánchez