rabuzarus
|
e7914ecc95
|
add $contact.change_member to the js template. At the present time we don't make use of it, but the js smarty template should be the same as the php smarty template
|
2017-04-23 14:58:23 +02:00 |
|
rabuzarus
|
46291b2e2b
|
fix smarty PHP warnings
|
2017-04-23 14:51:41 +02:00 |
|
rabuzarus
|
b273165873
|
Remove unused function
|
2017-04-21 16:13:16 +02:00 |
|
rabuzarus
|
f99bb958f6
|
Merge develop into 20170407_-_group_edit
Conflicts:
mod/group.php
|
2017-04-21 16:09:48 +02:00 |
|
rabuzarus
|
40e5436604
|
some restructuring in groups.php + Frio: provide own group template
|
2017-04-21 16:04:29 +02:00 |
|
Hypolite Petovan
|
3da0436f01
|
Merge pull request #3369 from Quix0r/rewrites/coding-convention-split2-2-2
Coding convention applied split 2-2-2 (of 2-14-2)
|
2017-04-20 18:28:16 -04:00 |
|
|
|
b7c21e1b65
|
fixed parser error
Signed-off-by: Roland Häder <roland@mxchange.org>
|
2017-04-20 22:59:43 +02:00 |
|
|
|
ec57babf89
|
added spaces + some curly braces + some usage of dbm::is_result()
Signed-off-by: Roland Haeder <roland@mxchange.org>
|
2017-04-20 22:59:08 +02:00 |
|
Hypolite Petovan
|
b936fb8da9
|
Merge pull request #3371 from Alkarex/photos_any_value
mod photos compatibility only_full_group_by
|
2017-04-20 15:26:31 -04:00 |
|
Alexandre Alapetite
|
5b80a1fcaa
|
mod photos compatibility only_full_group_by
Related to https://github.com/friendica/friendica/pull/3323
|
2017-04-20 21:23:45 +02:00 |
|
Hypolite Petovan
|
792ed55ae6
|
Merge pull request #3367 from annando/1704-mastodon
Reworked OStatus communication part to better support Mastodon.
|
2017-04-20 02:12:41 -04:00 |
|
Michael Vogel
|
6e04e44776
|
Merge pull request #3368 from tobiasd/develop
regen credits
|
2017-04-20 08:12:01 +02:00 |
|
Hypolite Petovan
|
01dab95d60
|
Merge pull request #3366 from annando/issue-3358
Issue 3358; Avoid key length problems when changing collation
|
2017-04-20 02:03:30 -04:00 |
|
|
|
e178f04a0e
|
regen credits
|
2017-04-20 07:59:54 +02:00 |
|
|
|
3592f90910
|
Merge remote-tracking branch 'upstream/develop' into 1704-mastodon
Conflicts:
include/bbcode.php
|
2017-04-20 05:44:31 +00:00 |
|
|
|
2354cc243e
|
Issue 3358; Avoid key length problems when changing collation
|
2017-04-20 05:24:08 +00:00 |
|
|
|
c6e7f6306c
|
Some standards
|
2017-04-20 05:17:00 +00:00 |
|
Michael Vogel
|
d3cdfa6108
|
Merge pull request #3365 from Hypolite/issue/remove-wrong-profile-link-for-contacts
Remove vcard Edit link pointing to profiles for contacts
|
2017-04-20 05:38:38 +02:00 |
|
Hypolite Petovan
|
37efb5725e
|
Remove debug
|
2017-04-19 23:31:38 -04:00 |
|
Michael Vogel
|
83cc56e713
|
Merge pull request #3326 from Alkarex/utf8mb4
Default to utf8mb4
|
2017-04-20 05:28:16 +02:00 |
|
Hypolite Petovan
|
8680068037
|
Remove vcard Edit link pointing to profiles for contacts
|
2017-04-19 21:58:33 -04:00 |
|
Hypolite Petovan
|
0811f9257e
|
Merge pull request #3287 from Quix0r/rewrites/coding-convention-split2-1-2
Coding convention applied split 2-1-2 (of 2-14-2)
|
2017-04-19 20:39:07 -04:00 |
|
rabuzarus
|
f2154a206e
|
Merge pull request #3364 from Rudloff/feature/external-links
In standalone mode, open links to source in a new tab (fixes #3359)
|
2017-04-20 01:37:28 +02:00 |
|
Pierre Rudloff
|
8549da4f7b
|
Make standalone tweaks work with infinite scrolling
|
2017-04-19 23:51:18 +02:00 |
|
|
|
e16fb74b0c
|
Reworked OStatus communication part to better support Mastodon.
|
2017-04-19 21:37:00 +00:00 |
|
Pierre Rudloff
|
2ea2c4b87b
|
In standalone mode, open links to source in a new tab (fixes #3359)
|
2017-04-19 23:27:11 +02:00 |
|
|
|
9739758c42
|
added curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
|
2017-04-19 23:07:59 +02:00 |
|
Roland Häder
|
b9d8587f41
|
Merge branch 'develop' into rewrites/coding-convention-split2-1-2
|
2017-04-19 23:06:01 +02:00 |
|
|
|
98edbde05c
|
added braces, opps
Signed-off-by: Roland Häder <roland@mxchange.org>
|
2017-04-19 23:03:44 +02:00 |
|
Hypolite Petovan
|
5432af3414
|
Merge pull request #3363 from sesom42/develop
displays the correct profile for contacts that have set the default profile
|
2017-04-19 15:45:38 -04:00 |
|
Alexandre Alapetite
|
6cc4f8b0a9
|
Delete frio dynamic.php
https://github.com/friendica/friendica/pull/3326#discussion_r112116929
|
2017-04-19 21:44:13 +02:00 |
|
Jens Tautenhahn
|
a8c20013c4
|
displays the correct profile for contacts that have set the default profile
|
2017-04-19 20:25:25 +01:00 |
|
Michael Vogel
|
da9bbc25cf
|
Merge pull request #3361 from Hypolite/issue/#3053
Change default directory URL
|
2017-04-19 19:00:42 +02:00 |
|
Hypolite Petovan
|
02a5d3fdb7
|
Change default directory URL
|
2017-04-19 12:27:51 -04:00 |
|
Michael Vogel
|
d95acdeab8
|
Merge pull request #3355 from Hypolite/issue/fix-language-guess
Skip lang file search if lang=en
|
2017-04-19 16:24:30 +02:00 |
|
Hypolite Petovan
|
bf1199f2ea
|
Standards
|
2017-04-19 10:14:43 -04:00 |
|
rabuzarus
|
2785b9d5e2
|
Merge pull request #3357 from Hypolite/issue/fix-frio-comment-box
Fix Issues with frio comment box
|
2017-04-19 14:14:35 +02:00 |
|
Hypolite Petovan
|
941dd48b53
|
Add explicit parentheses in condition
|
2017-04-19 07:05:48 -04:00 |
|
Michael Vogel
|
901c757069
|
Merge pull request #3356 from Hypolite/issue/fix-notifications-display
Remove extra htmlentities in notifications
|
2017-04-19 07:10:31 +02:00 |
|
Hypolite Petovan
|
f15bb6c516
|
Add autosize call for all external textarea value changes
|
2017-04-18 22:04:23 -04:00 |
|
Hypolite Petovan
|
5c3abe0ca6
|
Prevent comment UI from closing when using BBCode buttons with empty textarea
|
2017-04-18 22:03:49 -04:00 |
|
Hypolite Petovan
|
2c69d36886
|
Remove extra htmlentities in notifications
|
2017-04-18 19:34:46 -04:00 |
|
Hypolite Petovan
|
83ab3e3307
|
Skip lang file search if lang=en
|
2017-04-18 19:21:26 -04:00 |
|
Hypolite Petovan
|
d94e930065
|
Merge pull request #3354 from annando/issue-3157
Issue 3157: No fulltext anymore
|
2017-04-18 16:31:15 -04:00 |
|
Hypolite Petovan
|
f1aed292db
|
Merge pull request #3353 from annando/1704-empty-contacts
Handle the case when the given contact url or address is empty
|
2017-04-18 16:20:33 -04:00 |
|
|
|
33d5e5b818
|
Issue 3157: No fulltext anymore
|
2017-04-18 20:09:05 +00:00 |
|
Alexandre Alapetite
|
08924b9c59
|
Revert unneeded changes in third-party libraries
https://github.com/friendica/friendica/pull/3326#discussion_r112039526
https://github.com/friendica/friendica/pull/3326#discussion_r112039589
|
2017-04-18 21:21:29 +02:00 |
|
|
|
828ae671f0
|
Handle the case when the given contact url or address is empty
|
2017-04-18 18:50:01 +00:00 |
|
Hypolite Petovan
|
08209419aa
|
Merge pull request #3352 from annando/issue-3351
Issue 3351: Check if resource was created
|
2017-04-18 13:48:47 -04:00 |
|
|
|
806f395724
|
Issue 3351: Check if resource was created
|
2017-04-18 17:17:15 +00:00 |
|
