|
a01bdbbe2d
|
Fix wrong merge + nofilter in contact_edit
|
2018-12-18 08:39:26 -05:00 |
|
|
21a055f670
|
Merge branch '2018.12-rc' into task/6208-escape-html-true
|
2018-12-18 08:36:36 -05:00 |
|
|
091193ad64
|
Merge pull request #6278 from annando/fix-contact-edit
Fix: Contacts can now be edited again
|
2018-12-18 08:02:49 -05:00 |
|
|
99e69e30a3
|
Fix: Contacts can now be edited again
|
2018-12-18 06:52:09 +00:00 |
|
|
9aee4cb174
|
Merge pull request #6251 from JonnyTischbein/issue_bg_for_pages
[frio] Background wrapper + bootstrap buttons for newmember, un/follow
|
2018-12-17 23:26:43 -05:00 |
|
Jonny Tischbein
|
5d81738034
|
Add page-wrapper for probe + webfinder
|
2018-12-17 23:15:14 +01:00 |
|
Jonny Tischbein
|
dc7e6edca9
|
Add page-wrapper to oauth/edit in frio
|
2018-12-17 23:09:08 +01:00 |
|
Jonny Tischbein
|
443210b4f0
|
move templates to frio theme
|
2018-12-17 23:09:08 +01:00 |
|
Jonny Tischbein
|
58067cdfbf
|
Add generic content wrapper + frio btn primary buttons class to newmemeber, unfollow, follow (auto + dfrn)
|
2018-12-17 23:09:08 +01:00 |
|
|
f413abb82b
|
Merge pull request #6277 from annando/nextcloud-ap
Fix ActivityPub with Nextcloud
|
2018-12-17 15:28:22 -05:00 |
|
|
c485ca6f06
|
Fix ActivityPub with Nextcloud
|
2018-12-17 20:13:56 +00:00 |
|
|
faff105f86
|
Fix feed display in browser when using emojis
|
2018-12-16 22:58:43 -05:00 |
|
|
fe3470d7c1
|
Remove erroring template comment
|
2018-12-16 22:38:33 -05:00 |
|
|
e1b3bcc77d
|
Unescape yet more values with a focus on the vier theme
|
2018-12-16 22:38:32 -05:00 |
|
|
d0fa7f74c5
|
Unescape value of generic input field
|
2018-12-16 22:38:32 -05:00 |
|
|
698d12af79
|
Unescape variables in events and descriptions
|
2018-12-16 22:38:32 -05:00 |
|
|
c407fb7963
|
Avoid escaping relevant template variables
|
2018-12-16 22:38:32 -05:00 |
|
|
6d90d35d25
|
Enable Smarty default HTML escaping
|
2018-12-16 22:38:30 -05:00 |
|
|
38109665c7
|
Various improvements/fixes
- Fix potential missing variable
- Improve replaceMacros doc
- Fix CSS value in smoothly
|
2018-12-16 22:38:30 -05:00 |
|
|
2241ba4540
|
Remove uses of HTML escaping in Smarty templates
|
2018-12-16 22:38:30 -05:00 |
|
Michael Vogel
|
b6623216f0
|
Merge pull request #6270 from MrPetovan/bug/5932-fix-notices
Fix various notices
|
2018-12-16 08:41:28 +01:00 |
|
|
b6e1571b1e
|
Fix various notices
|
2018-12-15 04:32:47 -05:00 |
|
|
607f7daf51
|
Add PHP 5 compatible recursive dirname()
|
2018-12-15 02:46:08 -05:00 |
|
|
b08e5ab41b
|
Issue 6259: Suppress contact group widget only on network page
|
2018-12-14 06:33:57 +00:00 |
|
|
5a802bc474
|
Merge pull request #6261 from annando/fix-magic
Fix for magic auth
|
2018-12-13 17:03:44 -05:00 |
|
|
9ea0864394
|
Some added to-do
|
2018-12-13 21:41:19 +00:00 |
|
|
705211100b
|
Fix for magic auth
|
2018-12-13 21:19:57 +00:00 |
|
Michael Vogel
|
e2f1fd1efb
|
Merge pull request #6256 from MrPetovan/bug/6255-hide-connect-remote
Add check for relationship with remote user for connect display
|
2018-12-13 22:18:24 +01:00 |
|
|
f6917dd8f4
|
Merge pull request #6260 from annando/issue-6257
Issue 6257: Make notes visible again
|
2018-12-13 15:41:56 -05:00 |
|
|
f6c3974c8f
|
Issue 6257: Make notes visible again
|
2018-12-13 20:09:19 +00:00 |
|
|
7c11194a2c
|
Use Contact::isFollower instead
|
2018-12-13 11:53:15 -05:00 |
|
|
096093766a
|
Add check for relationship with remote user for connect display
|
2018-12-12 22:22:43 -05:00 |
|
|
2d9e1b8ec2
|
Merge pull request #6253 from annando/too-much-escaped
The "about" field shouldn't be escaped
|
2018-12-11 15:15:56 -05:00 |
|
|
5147d05c53
|
Merge pull request #6252 from annando/memory
Possibly fix a memory issue with large posts
|
2018-12-11 15:13:40 -05:00 |
|
|
b53a6c5154
|
The "about" field shouldn't be escaped
|
2018-12-11 19:24:24 +00:00 |
|
|
cced018825
|
Possibly fix a memory issue with large posts
|
2018-12-11 18:48:33 +00:00 |
|
|
f9bda66e29
|
Welcome 2018.12-rc
|
2018-12-11 14:38:11 +01:00 |
|
|
8a185a0346
|
Merge pull request #6244 from annando/auth-fix
Fix for remote authentication when visiting contact's pages
|
2018-12-09 09:05:46 -05:00 |
|
|
f2e2066d33
|
Non public content is now displayed again to visitors.
|
2018-12-09 13:09:49 +00:00 |
|
|
8fbe0d46e9
|
Fix for remote authentication when visiting contact's pages
|
2018-12-08 20:28:01 +00:00 |
|
|
5e79ad277a
|
Merge pull request #6237 from annando/issue-6236
Issue 6236: Handle account removal messages with very low priority
|
2018-12-06 10:32:11 -05:00 |
|
|
a041c7c0fa
|
Issue 6236: Handle account removal messages with very low priority
|
2018-12-06 10:04:16 +00:00 |
|
|
8416dea3cd
|
Merge pull request #6235 from annando/curl-notice
Avoids the notice "array_merge(): Argument #1 is not an array"
|
2018-12-05 01:41:22 -05:00 |
|
|
d52d4ca355
|
Avoids the notice "array_merge(): Argument #1 is not an array"
|
2018-12-05 06:01:58 +00:00 |
|
|
6510df410d
|
Merge pull request #6234 from annando/issue-6168
Issue 6168: "redir" now mostly use OWA
|
2018-12-04 12:08:48 -05:00 |
|
|
95c150ef28
|
Added to-do
|
2018-12-04 14:20:25 +00:00 |
|
|
5c20f21dd8
|
Improved fallback when the probing fails
|
2018-12-04 14:17:55 +00:00 |
|
|
491fc5f78a
|
Issue 6168: "redir" now mostly use OWA
|
2018-12-04 07:12:55 +00:00 |
|
|
e0a0302397
|
Merge pull request #6233 from rebeka-catalina/rct/d/logrotation
Added a hint to help/Settings "Logs/logrotate" section in install.md
|
2018-12-03 16:36:55 -05:00 |
|
rebeka-catalina
|
1a8ca791cd
|
Added a hint to help/Settings "Logs/logrotate" section in install.md
|
2018-12-03 22:18:26 +01:00 |
|