clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
16,231 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

16231 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael 596bb36151 Bugfix: The selection between posts from forums and other users had a problem 2017-10-22 09:02:54 +00:00
Michael Vogel 6367439e8a Merge pull request #3814 from rabuzarus/20171019_-_fix_event_display_in_stream 
fix #3812 - some brocken parts in the display of events (default template)
 2017-10-19 14:54:33 +02:00
rabuzarus 184bfc722d fix #3812 - some brocken parts in the display of events (default template) 2017-10-19 14:16:39 +02:00
Tobias Diekershoff 704aef67fb Merge pull request #3811 from annando/remove-service-class 
Removed "service class" functionality
 2017-10-19 12:44:45 +02:00
Michael Vogel b78996416c Merge pull request #3809 from rabuzarus/20171018_-_fix_posted_date_widget 
Bugfix: useless li end tag in posted_date_widget.tpl
 2017-10-19 07:50:45 +02:00
rabuzarus 8cc17bdde6 fix coding style 2017-10-19 00:52:01 +02:00
Michael Vogel e7f64dde55 Merge pull request #3810 from rabuzarus/20171018_-_fix_duplcate_id 
Bugfix: fix some duplicate ID in frio
 2017-10-18 23:47:40 +02:00
Michael 0695fa699c Removed "service class" functionality 2017-10-18 21:44:27 +00:00
rabuzarus dd8ff1f097 remove unused 'aria-labelledby' in frios modal 2017-10-18 23:38:51 +02:00
rabuzarus a6e8734a37 Bugfix: fix some duplicate ID 2017-10-18 23:22:05 +02:00
rabuzarus 6630e50ecf Bugfix:useless li end tag in posted_date_widget.tpl 2017-10-18 22:49:16 +02:00
rabuzarus 1b53b8cae9 Merge pull request #3808 from annando/nets-cid 
Bugfix: Switch to all networks when posts for a single contact are selected
 2017-10-18 21:30:39 +02:00
Michael Vogel a6d6d2c482 Merge pull request #3807 from rabuzarus/20171018_-_frio_fix_some_event_stream_stuff 
fix some small css in frio for displaying events in the stream
 2017-10-18 20:59:46 +02:00
Michael c92ed9bc5e Bugfix: Switch to all networks when posts for a single contact are selected. 2017-10-18 18:54:06 +00:00
rabuzarus 7ddc5339fd frio: fix event seperator 2017-10-18 20:44:29 +02:00
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