Michael Vogel
|
8b276e53c3
|
Merge remote-tracking branch 'upstream/develop' into 1507-redmatrix-network-name
|
2015-07-16 10:18:07 +02:00 |
|
Michael Vogel
|
fca8aecc9b
|
Show "Redmatrix" as network name.
|
2015-07-16 10:09:59 +02:00 |
|
|
|
207b6f36bb
|
Merge pull request #1764 from annando/1507-ostatus-verb
OStatus: Incoming favorites
|
2015-07-15 19:06:19 +02:00 |
|
Michael Vogel
|
05f8abcfa6
|
OStatus: Handling of unsupported verbs
|
2015-07-15 18:27:44 +02:00 |
|
Michael Vogel
|
52c4b8684b
|
OStatus: Support for "Favorite" (like)
|
2015-07-15 08:16:41 +02:00 |
|
|
|
74a2f58efb
|
Merge pull request #1761 from annando/1507-update-name
Update the name in the "self" contact when it is changed.
|
2015-07-15 07:53:36 +02:00 |
|
Michael Vogel
|
6800b07fc5
|
Update the name in the "self" contact when it is changed.
|
2015-07-14 22:24:43 +02:00 |
|
|
|
4689f44819
|
Merge pull request #1760 from tobiasd/20150714-nl
NL update to the strings
|
2015-07-14 16:33:05 +02:00 |
|
|
|
ba790def22
|
NL update to the strings
|
2015-07-14 16:31:45 +02:00 |
|
|
|
9e138a42f2
|
Merge pull request #1758 from annando/1507-salmon
OStatus Salmon improvements (Follow, Unfollow works)
|
2015-07-14 16:24:54 +02:00 |
|
Michael Vogel
|
0de1926113
|
removed logger entry
|
2015-07-14 08:52:54 +02:00 |
|
Michael Vogel
|
ca9e50764b
|
Merge pull request #1757 from tobiasd/20150713-de
DE: update to the strings
|
2015-07-14 00:01:23 +02:00 |
|
Michael Vogel
|
9ebaa45670
|
Removed unused template
|
2015-07-13 23:56:45 +02:00 |
|
Michael Vogel
|
2b3ebb9c3e
|
Follow/Unfollow now works from OStatus.
|
2015-07-13 23:50:33 +02:00 |
|
Michael Vogel
|
3457f85833
|
Salmon: Don't store contact data before the message was authenticated.
|
2015-07-13 14:34:28 +02:00 |
|
|
|
a54dd8a9db
|
DE: update to the strings
|
2015-07-13 08:14:00 +02:00 |
|
Michael Vogel
|
0398bb67be
|
Reworked salmon import
|
2015-07-13 08:06:51 +02:00 |
|
|
|
2c488863b8
|
Merge pull request #1756 from annando/1507-autofollow
The autofollow option is moved from the addons to the core
|
2015-07-12 22:02:24 +02:00 |
|
Michael Vogel
|
5f89cb0923
|
The autofollow option is moved from the addons to the core.
|
2015-07-12 21:37:49 +02:00 |
|
|
|
1efda90498
|
Merge pull request #1755 from annando/1507-template-update
Vier: Some template updates
|
2015-07-12 21:08:11 +02:00 |
|
Michael Vogel
|
5f86d3d325
|
removed the picture width, since it is already in the style sheet.
|
2015-07-12 20:31:49 +02:00 |
|
Michael Vogel
|
6a646d68c5
|
Updated templates for "vier" (See issue 1733)
|
2015-07-12 20:27:54 +02:00 |
|
Michael Vogel
|
e22ce8403e
|
Merge pull request #1752 from tobiasd/20150712-issue1747
issue 1747
|
2015-07-12 18:12:19 +02:00 |
|
|
|
f7597d42ad
|
Merge pull request #1754 from rabuzarus/share-jotnets
add jotnets for sharing posts
|
2015-07-12 18:06:11 +02:00 |
|
|
|
17793453a0
|
Merge pull request #1753 from rabuzarus/savedsearch-fix
fix for saving searches
|
2015-07-12 18:05:41 +02:00 |
|
rabuzarus
|
e5809dce79
|
add jotnets for sharing posts
|
2015-07-12 17:52:25 +02:00 |
|
rabuzarus
|
2c39387e44
|
fix for saving searches
|
2015-07-12 17:43:50 +02:00 |
|
|
|
d920cf25b0
|
dont use an empty li, but make a new list for visual separation
|
2015-07-12 16:16:54 +02:00 |
|
|
|
179201d2bf
|
Merge pull request #1750 from annando/1507-contact-update
Automatic contact update
|
2015-07-12 15:32:29 +02:00 |
|
Michael Vogel
|
c8fdff32b3
|
Likes do federate ...
|
2015-07-12 14:57:09 +02:00 |
|
|
|
7134c01cb2
|
Merge pull request #1751 from annando/1507-diaspora-contact-links
Diaspora: Shared posts looking better, mentions are now links
|
2015-07-12 13:54:41 +02:00 |
|
Michael Vogel
|
f6352aa9c6
|
Remove a useless comment
|
2015-07-12 12:17:12 +02:00 |
|
Michael Vogel
|
65468bf202
|
Moved the needed include to a better place.
|
2015-07-12 12:03:39 +02:00 |
|
Michael Vogel
|
f48f7394e9
|
Only update communication relevant data. And only update if needed.
|
2015-07-12 11:46:08 +02:00 |
|
Michael Vogel
|
9106baf10f
|
Some more test code removed
|
2015-07-12 11:24:01 +02:00 |
|
Michael Vogel
|
cf663df69f
|
Testing code removed
|
2015-07-12 11:22:36 +02:00 |
|
Michael Vogel
|
0ac75deee1
|
Some precaution to avoid overwriting of existing data with blanks
|
2015-07-12 11:19:40 +02:00 |
|
Michael Vogel
|
d55275f211
|
GUID should be urlencoded in template since it is urlencoded in uri as well.
|
2015-07-11 14:37:02 +02:00 |
|
Michael Vogel
|
fe137a92ef
|
Automatically update contact data.
|
2015-07-11 14:36:04 +02:00 |
|
|
|
3c4ac0d616
|
Merge pull request #1742 from tobiasd/20150708-typo
typo
|
2015-07-08 18:39:55 +02:00 |
|
|
|
eb79f109d4
|
update to the master strings
|
2015-07-08 13:20:43 +02:00 |
|
|
|
a22581e86c
|
typo
|
2015-07-08 13:15:14 +02:00 |
|
Michael Vogel
|
bc6e5a4f2d
|
Merge remote-tracking branch 'upstream/develop' into 1507-diaspora-contact-links
|
2015-07-06 17:35:48 +02:00 |
|
Fabrixxm
|
95945ecae6
|
Merge branch 'master' into develop
|
2015-07-06 16:56:49 +02:00 |
|
fabrixxm
|
5a1bb9866d
|
Merge branch '3.4.1'
|
2015-07-06 14:52:23 +02:00 |
|
|
|
13bbfd188f
|
Merge pull request #1737 from fabrixxm/changelog
small updates to CHANGELOG
|
2015-07-06 14:36:08 +02:00 |
|
fabrixxm
|
fb966a7d1a
|
small updates to CHANGELOG
|
2015-07-06 14:32:40 +02:00 |
|
Michael Vogel
|
bd3f877721
|
Merge pull request #1736 from fabrixxm/changelog
Update Changelog and version
|
2015-07-06 14:28:20 +02:00 |
|
fabrixxm
|
bc4b374f04
|
fix typos in changelog
|
2015-07-06 14:19:21 +02:00 |
|
Fabrixxm
|
c03c06cf30
|
Update version
|
2015-07-06 12:49:43 +02:00 |
|
