Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-01 08:54:42 +00:00
Code Issues Projects Releases Packages Wiki Activity
28666 commits 3 branches 64 tags 241 MiB
Commit graph

28666 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tobias Diekershoff
48e471855e Merge pull request #3806 from annando/expire 
Bugfix: Item were stored before the expiration date
 2017-10-18 20:23:01 +02:00
rabuzarus
e5ce73b1f8 frio: fix margin and title for events 2017-10-18 20:18:50 +02:00
Michael
1cff94d476 Bugfix: Item were stored before the expiration date 2017-10-18 18:01:08 +00:00
Tobias Diekershoff
59ce6de50c Merge pull request #3805 from annando/nodeinfo-fix 
Bugfix: Local comments weren't calculated.
 2017-10-18 19:13:58 +02:00
Michael Vogel
d60f96f0e1 Merge pull request #3797 from rabuzarus/20171015_-_duplicate_event 
add event action: duplicate events
 2017-10-18 18:57:58 +02:00
Michael
3b783f6ac9 Bugfix: Local comments weren't calculated. 2017-10-18 16:54:12 +00:00
rabuzarus
10ba6df17f initilize $sh_disabled 2017-10-18 13:23:26 +02:00
Michael Vogel
7aca5d4819 Merge pull request #3804 from tobiasd/20171018-relocate 
relocation message is also send to D* contacts
 2017-10-18 11:40:14 +02:00
Tobias Diekershoff
a1099a021a relocation message is also send to D* contacts 2017-10-18 11:04:44 +02:00
Tobias Diekershoff
c5f2ea0de8 Merge pull request #3794 from hethi/fix-de-typos 
fix some german strings on /admin statistics page
 2017-10-18 08:36:58 +02:00
Tobias Diekershoff
e6f5717d89 Merge pull request #3800 from annando/better-callstack 
Improve the way the callstack is built
 2017-10-18 08:31:14 +02:00
Tobias Diekershoff
edb16f8dc8 Merge pull request #3803 from annando/conversation-feed 
we now provide a feed for the conversation
 2017-10-18 08:29:47 +02:00
Michael
4744d6bf84 we now provide a feed for the conversation 2017-10-18 06:25:22 +00:00
Tobias Diekershoff
e555a55be3 Merge pull request #3802 from annando/issue-3801 
Issue 3801: Personal notes hadn't been displayed
 2017-10-18 08:22:35 +02:00
Michael
d675c84051 Issue 3801: Personal notes hadn't been displayed 2017-10-18 04:55:03 +00:00
Michael Vogel
e4a2430967 Merge pull request #3799 from tobiasd/20171017-doc 
also mention Transifex as tool to use near the translation example
 2017-10-17 22:56:44 +02:00
Michael
c309c8bde4 Improve the way the callstack is built 2017-10-17 20:51:46 +00:00
Tobias Diekershoff
55e2f49268 also mention Transifex as tool to use near the translation example 2017-10-17 22:48:33 +02:00
Tobias Diekershoff
b06c4ab84c Merge pull request #3798 from annando/feed-information 
Enhance feed information for "fetch further information"
 2017-10-17 22:36:50 +02:00
Herbert Thielen
30cf94a209 changes as downloaded from transifex 2017-10-17 16:02:36 +02:00
Michael
e38da9a3a5 And some further refinements 2017-10-17 11:39:09 +00:00
Michael
9c5cd476dd Better rule to replace content 2017-10-17 09:58:29 +00:00
Michael
7c658439da Removed unneeded stuff 2017-10-17 09:14:10 +00:00
Michael
aa284a2ae6 Enhance feed information 2017-10-17 09:10:19 +00:00
Tobias Diekershoff
ae1afebe26 Merge pull request #3796 from annando/ostatus-forum 
OStatus: Auto subscribe to forum accounts
 2017-10-17 08:30:05 +02:00
Michael
5498f04ffa OStatus: Auto subscribe to forum accounts 2017-10-17 04:45:38 +00:00
Hypolite Petovan
6640e6ceef Merge pull request #3795 from annando/complete-url 
Complete incomplete URL during feed import
 2017-10-16 17:04:46 -04:00
Michael
3eed3316ea Some more camels 2017-10-16 20:59:16 +00:00
Michael
b521215383 Camels aren't studly 2017-10-16 20:57:53 +00:00
Michael
f127d65de9 Added spaces 2017-10-16 20:55:37 +00:00
Michael
2a28591415 Complete incomplete URL during feed import 2017-10-16 20:31:13 +00:00
Herbert Thielen
3c51febad2 revert accidentally inserted line breaks 2017-10-16 19:37:41 +02:00
Herbert Thielen
6957069fb7 avoid "Nutzer_innen" 2017-10-16 19:33:55 +02:00
Herbert Thielen
ff934c8a34 run po2php on de/messages.po to update strings.php 2017-10-16 16:19:05 +02:00
Herbert Thielen
66202ccf22 fix some german strings on /admin statistics page 2017-10-16 16:12:01 +02:00
Tobias Diekershoff
a0530d1066 Merge pull request #3789 from Alkarex/french_regions 
French regions spelling
 2017-10-16 11:32:11 +02:00
Tobias Diekershoff
541d6ab895 Merge pull request #3788 from Alkarex/denmark_regions 
Danish areas updated
 2017-10-16 11:30:35 +02:00
Tobias Diekershoff
cadc8aa6e8 Merge pull request #3787 from rabuzarus/20171013_-_format_event_in_stream 
event items are now more themeable in the networkstream
 2017-10-16 11:29:43 +02:00
Tobias Diekershoff
576cc383b9 Version 3.6-dev for develop again 2017-10-16 10:31:37 +02:00
Tobias Diekershoff
f4632319c0 Version 3.5.4 2017-10-16 10:27:24 +02:00
Tobias Diekershoff
023822b4e5 release date 2017-10-16 10:27:17 +02:00
Tobias Diekershoff
96501bda81 Merge pull request #3786 from tobiasd/3.5.4-CHANGELOG 
Updating the CHANGELOG
 2017-10-16 10:24:49 +02:00
Tobias Diekershoff
3fd0210681 Merge pull request #3793 from annando/parse-fix 
Special treatment for HTTP Code 416
 2017-10-16 07:34:41 +02:00
Michael
0a1554e08b Special treatment for HTTP Code 416 2017-10-16 03:14:32 +00:00
Tobias Diekershoff
74af893b87 Merge pull request #3791 from annando/parse-fix 
Bugfix: Range checking with ParseUrl made problems
 2017-10-16 00:37:05 +02:00
Tobias Diekershoff
26d7cf1d6a Merge pull request #3792 from annando/dead-contacts 
Bugfix: Revive dead contacts
 2017-10-16 00:36:08 +02:00
rabuzarus
67b9e57547 add event copy link to default event.tpl 2017-10-15 22:52:22 +02:00
rabuzarus
c1699364ae reload the acl if a new event edit or copy modal is opened 2017-10-15 22:34:31 +02:00
Michael
08f461f70c Bugfix: Revive dead contacts 2017-10-15 19:34:15 +00:00
Michael
1506886947 Bugfix: Range checking with ParseUrl made problems - we now use the standard 2017-10-15 19:29:58 +00:00