Michael Vogel
|
fe5705e547
|
Merge remote-tracking branch 'upstream/develop' into 1601-dfrn
|
2016-01-21 23:05:02 +01:00 |
|
Tobias Diekershoff
|
0ed7a2376a
|
Merge pull request #2276 from annando/1601-gs-discovery
Search for GNU Social users in the background
|
2016-01-21 19:32:33 +01:00 |
|
Michael Vogel
|
1d502116a8
|
Search for GNU Social users in the background
|
2016-01-21 19:00:08 +01:00 |
|
Tobias Diekershoff
|
6174017048
|
Merge pull request #2275 from rabuzarus/2101_event_reminder
fix events_reminder popup
|
2016-01-21 16:18:36 +01:00 |
|
Tobias Diekershoff
|
478053dafe
|
Merge pull request #2274 from annando/1601-hubzilla-comments
Hubzilla comments are now federated
|
2016-01-21 16:17:59 +01:00 |
|
Michael Vogel
|
e1bc0b4ff8
|
Likes are now federated again through Diaspora
|
2016-01-21 16:01:46 +01:00 |
|
Michael Vogel
|
e00c091540
|
Small fix for empty signatures
|
2016-01-21 13:57:21 +01:00 |
|
Michael Vogel
|
718949a0bf
|
Merge pull request #2273 from tobiasd/20160121-de
DE update to the strings
|
2016-01-21 13:45:38 +01:00 |
|
rabuzarus
|
03bef2c8f8
|
fix events_reminder popup
|
2016-01-21 13:44:38 +01:00 |
|
Michael Vogel
|
54f42cb706
|
removed some test code
|
2016-01-21 13:38:30 +01:00 |
|
Michael Vogel
|
d768074afd
|
Comments from Hubzilla weren't federated properly
|
2016-01-21 13:21:47 +01:00 |
|
Tobias Diekershoff
|
c012017023
|
DE update to the strings
|
2016-01-21 11:56:19 +01:00 |
|
Tobias Diekershoff
|
94dc1ef195
|
Merge pull request #2272 from annando/1601-queue
Queue delivery should be now more reliable
|
2016-01-21 07:15:39 +01:00 |
|
Michael Vogel
|
1c84054322
|
Queue delivery should be now more reliable
|
2016-01-21 03:21:33 +01:00 |
|
Michael Vogel
|
5953cb8c8a
|
Merge pull request #2271 from tobiasd/20160120
strings
|
2016-01-20 20:20:32 +01:00 |
|
Tobias Diekershoff
|
f635e81d94
|
NL update to the strings THX Dasrakel
|
2016-01-20 17:54:40 +01:00 |
|
Tobias Diekershoff
|
080319d82d
|
issue #2270
|
2016-01-20 17:52:58 +01:00 |
|
Tobias Diekershoff
|
2c410a93ff
|
Merge pull request #2269 from annando/1601-signatures2
Reworked check for double encoded Diaspora signatures
|
2016-01-20 16:39:19 +01:00 |
|
Michael Vogel
|
98ccefebcf
|
Reworked check for double encoded Diaspora signatures
|
2016-01-20 16:00:43 +01:00 |
|
Fabrixxm
|
7e83ba090f
|
Merge branch 'hotfix_diaspora' into develop
|
2016-01-20 08:50:18 +01:00 |
|
Michael Vogel
|
c6b0e57aa4
|
Bugfix: Comments weren't relayed anymore to Diaspora due to a Diaspora change
|
2016-01-20 08:40:04 +01:00 |
|
Tobias Diekershoff
|
1811ccc43d
|
Merge pull request #2267 from annando/1601-gs-discovery
Auto discovery of contacts from GNU Social
|
2016-01-20 06:26:41 +01:00 |
|
Michael Vogel
|
d3ea6c81c4
|
Merge pull request #2265 from tobiasd/20160119-docs
small additions to the docs, part of #2194
|
2016-01-20 04:32:45 +01:00 |
|
Michael Vogel
|
5a6950bace
|
Auto discovery of contacts from GNU Social
|
2016-01-19 15:12:18 +01:00 |
|
fabrixxm
|
a1eb7a8791
|
Merge pull request #2266 from tobiasd/20160119-de
DE update to the strings
|
2016-01-19 13:47:43 +01:00 |
|
Tobias Diekershoff
|
fe6d8ecd1c
|
DE update to the strings
|
2016-01-19 10:55:55 +01:00 |
|
Tobias Diekershoff
|
3eef0cea3d
|
small additions to the docs, part of #2194
|
2016-01-19 10:02:05 +01:00 |
|
fabrixxm
|
f51535f38e
|
Merge pull request #2264 from tobiasd/20160118-admin2
fed stats template beautification && doc strings for the mod/admin
|
2016-01-19 09:19:07 +01:00 |
|
Tobias Diekershoff
|
f4a65cf6ca
|
some more doc strings
|
2016-01-19 09:15:32 +01:00 |
|
Tobias Diekershoff
|
846153d388
|
some beautification to the template code
|
2016-01-19 07:20:07 +01:00 |
|
fabrixxm
|
9150ec59b5
|
Merge pull request #2263 from tobiasd/20160118-messages
regenerated messages.po
|
2016-01-18 22:01:59 +01:00 |
|
fabrixxm
|
2c69614950
|
Merge pull request #2253 from annando/1601-network-performance
Reducing network request, increasing page performance
|
2016-01-18 22:01:45 +01:00 |
|
Tobias Diekershoff
|
9b4f8b58c1
|
regenerated messages.po
|
2016-01-18 18:52:17 +01:00 |
|
Michael Vogel
|
32c7896c5d
|
Merge remote-tracking branch 'upstream/develop' into 1601-network-performance
|
2016-01-18 18:49:04 +01:00 |
|
Tobias Diekershoff
|
2ef63b6593
|
Merge pull request #2262 from annando/1601-http-timeouts
Timeout problems while fetching image data
|
2016-01-18 18:34:15 +01:00 |
|
Michael Vogel
|
0fa7ff623a
|
Merge pull request #2261 from tobiasd/20160118-admin
readd plugin features to admin aside
|
2016-01-18 15:46:42 +01:00 |
|
Michael Vogel
|
5ec2c7e965
|
When a server isn't reachable there were timeout problems with fetching image data
|
2016-01-18 15:38:38 +01:00 |
|
Tobias Diekershoff
|
c6f0333026
|
moved some CSS stuff from the template to global.css
|
2016-01-18 13:22:07 +01:00 |
|
Tobias Diekershoff
|
c243087b89
|
readd plugin features to admin aside
|
2016-01-18 13:04:25 +01:00 |
|
Michael Vogel
|
6c7cf2a766
|
Merge remote-tracking branch 'upstream/develop' into 1601-network-performance
|
2016-01-18 00:53:18 +01:00 |
|
Michael Vogel
|
36ba415df3
|
Merge pull request #2257 from rabuzarus/locked_features_united
feature management for admins
|
2016-01-18 00:51:50 +01:00 |
|
Michael Vogel
|
1230f186ad
|
Merge pull request #2259 from tobiasd/20160117-de
DE update to the strings
|
2016-01-17 23:32:03 +01:00 |
|
Tobias Diekershoff
|
98be92f48c
|
DE update to the strings
|
2016-01-17 22:25:05 +01:00 |
|
Tobias Diekershoff
|
f76a24607c
|
Merge pull request #2258 from rabuzarus/1701_forumlist_profile
vier: add missing forumlist_profile
|
2016-01-17 17:34:35 +01:00 |
|
rabuzarus
|
f428635682
|
vier: add missing forumlist_profile
|
2016-01-17 15:54:58 +01:00 |
|
rabuzarus
|
78e282734f
|
feature management for admins: delete double entries from merging process
|
2016-01-17 12:59:06 +01:00 |
|
rabuzarus
|
c1ed2bd975
|
feature management for admins: Merge branch 'devolop'
|
2016-01-17 03:25:17 +01:00 |
|
Michael Vogel
|
228ce9e27e
|
Merge remote-tracking branch 'upstream/develop' into 1601-network-performance
|
2016-01-16 17:39:45 +01:00 |
|
Michael Vogel
|
135052a5a0
|
Merge pull request #2256 from tobiasd/20160116-messagespo
regenerated messages.po file for translation work
|
2016-01-16 17:38:57 +01:00 |
|
Tobias Diekershoff
|
bcc8fa1971
|
regenerated messages.po file for translation work
|
2016-01-16 16:22:02 +01:00 |
|