mexon/friendica
1
0
Fork 0
Code Pull requests Activity
13910 commits 5 branches 60 tags 188 MiB
Commit graph

13910 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roland Häder cbc32143d7 Merge remote-tracking branch 'upstream/develop' into develop 2017-01-05 08:56:05 +01:00
Tobias Diekershoff 0c65dbb8db Merge pull request #3064 from rabuzarus/20170102_-_add_switch_element_to_frio 
Frio: implement On/Off switcher element
 2017-01-04 13:54:48 +01:00
Tobias Diekershoff 8f0ca51a55 Merge pull request #3065 from rabuzarus/20170103_-_frio_fix_nav_help_string 
Bugfix: Frio - use "Help" instead of "Help And Documentation" as label in the nav user menu
 2017-01-04 13:52:51 +01:00
Roland Häder 42c2e09382 Merge remote-tracking branch 'upstream/develop' into develop 2017-01-04 09:03:00 +01:00
rabuzarus e31c4a62aa Merge pull request #3063 from tobiasd/20170103-de 
DE translations THX Rabuzarus
 2017-01-03 17:53:17 +01:00
rabuzarus 995e1fe690 Bugfix: Frio - use "Help" instead of "Help And Documentation" as label in the nav user menu 2017-01-03 17:49:40 +01:00
rabuzarus 860d6d51b9 Frio: add "aria-describedby" to the field templates 2017-01-03 17:38:08 +01:00
rabuzarus 96dfd22d9d Frio: implent switcher element 2017-01-03 17:33:01 +01:00
Tobias Diekershoff b783a98a9f DE translations THX Rabuzarus 2017-01-03 10:42:11 +01:00
Michael Vogel 7f7fe1c332 Merge pull request #3060 from rabuzarus/20170102_-_frio_badge_z-index 
Bugfix: Frio css - add z-index to badges
 2017-01-02 18:16:49 +01:00
rabuzarus 5bef39189b Bugfix: Frio css - add z-index to badges 2017-01-02 13:38:10 +01:00
Michael Vogel 77632ca3b0 Merge pull request #3059 from tobiasd/20170102-lang 
DE / ES update of the translation
 2017-01-02 10:37:56 +01:00
Tobias Diekershoff e301dc7607 ES translation of the core 2017-01-02 08:22:52 +01:00
Tobias Diekershoff e74cee1e42 DE translation of the core 2017-01-02 08:22:39 +01:00
Tobias Diekershoff 72a0b8d3be Merge pull request #3058 from annando/1701-diaspora-thread-reply 
Diaspora mentions are now done correctly
 2017-01-02 08:15:54 +01:00
Michael 9a6478b273 Don't be greedy. 2017-01-02 07:00:44 +00:00
Michael Vogel a285292d46 Merge pull request #3057 from rabuzarus/20170101_-_fix_frio_poke_tpl 
Bugfix: fix the frio poke template
 2017-01-02 00:46:25 +01:00
Michael db2d0e0095 removal of useless variable 2017-01-01 23:38:32 +00:00
Michael 79b5eb63db Some more reverts 2017-01-01 23:37:29 +00:00
Michael 212f78386d Deactivated the auto mention - we should do it differently. 2017-01-01 23:35:34 +00:00
Michael 8aaf09f9ee Automatically add a Diaspora mention 2017-01-01 23:18:42 +00:00
Michael 8c579735f9 Diaspora: Add a mention when doing a thread reply 2017-01-01 21:21:16 +00:00
rabuzarus 885bd09598 Bugfix: fix the frio poke template 2017-01-01 22:05:24 +01:00
Roland Häder 9ca789b952
Merge remote-tracking branch 'upstream/develop' into develop 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-31 17:59:14 +01:00
Tobias Diekershoff d671af2795 Merge pull request #3054 from annando/1612-diaspora 
Events are now shared with Diaspora in separate fields
 2016-12-31 11:57:33 +01:00
Michael 4053499c38 Enable caching wirh comments 2016-12-30 23:18:31 +00:00
Michael 93666b5a8d Disable some features 2016-12-30 22:54:16 +00:00
Michael 66902c7956 We now also transmit Dislikes 2016-12-30 22:40:30 +00:00
Michael 7cf70b64b8 We now send the participation message as well. 2016-12-30 22:31:21 +00:00
Roland Häder d2df464d8c
added curly braces + fixed indenting according to code review by Hypolite 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-30 21:49:08 +01:00
Roland Häder d2280d4120
Merge remote-tracking branch 'upstream/develop' into develop 
dbm::is_result() calls needed merge

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-30 21:33:41 +01:00
Michael 4928d00e22 Standard stuff 2016-12-30 10:03:02 +00:00
Michael 55ee80338f Events are now shared with Diaspora. 2016-12-30 03:31:38 +00:00
Michael 5222bd2264 Merge remote-tracking branch 'upstream/develop' into 1612-diaspora 2016-12-29 23:29:01 +00:00
Michael 94977cca18 Events are now done. 2016-12-29 23:27:11 +00:00
Tobias Diekershoff 51155d7716 Merge pull request #3047 from annando/1612-indexlength 
New binary data fields to avoid index length problems
 2016-12-29 19:11:54 +01:00
Michael 666eb2ddbd Merge branch '1612-diaspora' of github.com:annando/friendica into 1612-diaspora 2016-12-29 17:13:07 +00:00
Michael 9af3f5b0da Improved loggin 2016-12-29 17:11:59 +00:00
Michael 1490f2d3b7 Merge remote-tracking branch 'upstream/develop' into 1612-diaspora 2016-12-29 10:16:10 +00:00
Michael Vogel 1d0cb0f7d2 Merge pull request #3048 from ddorian1/develop 
Fix test for static calls with PHP 7
 2016-12-29 11:14:14 +01:00
Michael Vogel d830f506f2 Merge pull request #3051 from ddorian1/const 
Missing self befor class constants
 2016-12-29 11:11:47 +01:00
Michael Vogel c348dd6134 Merge pull request #3046 from rabuzarus/2016125_-_photo_albums_refresh 
Update the photo albums cache on upload, album deletion or renaming
 2016-12-29 11:08:16 +01:00
Michael 483f34c4ce We now transmit event data as well 2016-12-29 03:13:57 +00:00
Michael ca0e6cba02 Relaying of Diaspora comments now work with the new fields as well. 2016-12-28 13:30:55 +00:00
Johannes Schwab aab21838a4 Missing self befor class constants 2016-12-28 13:14:03 +01:00
Michael Vogel efd9623ff1 Merge pull request #3050 from tobiasd/20161227-adminpanel 
for the fed stats it is better to have a >= then a = in the query
 2016-12-28 04:25:46 +01:00
Tobias Diekershoff 236c7805a4 for the fed stats it is better to have a >= then a = in the query 2016-12-27 17:53:59 +01:00
Johannes Schwab 8e2fc0f8a9 Fix test for static calls with PHP 7 2016-12-27 15:51:38 +01:00
Michael 6a511066c4 Threaded comments will now be transmitted 2016-12-27 14:37:48 +00:00
Michael ce4c542e37 Support for threaded comments 2016-12-27 12:59:15 +00:00