Commit Graph

13945 Commits (ee39aba490fb7e17ba9c01a9a4f4aedc51bee564)
 

Author SHA1 Message Date
Michael Vogel ee39aba490 Merge pull request #3043 from Quix0r/rewrites/dbm_is_result
6 years ago
Michael Vogel b7d675dbb0 Merge pull request #3071 from Hypolite/issue/#1034-2
6 years ago
Hypolite Petovan 3caf3bccd9 Updated SSL english docs
6 years ago
Hypolite Petovan 8d195dc499 Merge remote-tracking branch 'friendica/develop' into develop
6 years ago
Roland Häder f1dc36978a Merge branch 'develop' into rewrites/dbm_is_result
6 years ago
Roland Häder 4f25396fae Merge remote-tracking branch 'upstream/develop' into develop
6 years ago
Michael Vogel 98c5eb1d95 Merge pull request #3068 from rabuzarus/20170105_-_frio_mobile_theme_selection
6 years ago
rabuzarus 898761b4a0 Show mobile theme selection only if mobile themes are available (default template)
6 years ago
Roland Häder 770816a62a Merge branch 'develop' into rewrites/dbm_is_result
6 years ago
Roland Häder 4530f4ac9d Merge remote-tracking branch 'upstream/develop' into develop
6 years ago
Michael Vogel 0d32fce2df Merge pull request #3067 from rabuzarus/20170105_-_fix_dfrn_doxygen_todos
6 years ago
Roland Häder 624c5fd190 Merge branch 'develop' into rewrites/dbm_is_result
6 years ago
Roland Häder cbc32143d7 Merge remote-tracking branch 'upstream/develop' into develop
6 years ago
rabuzarus 0994a0ced5 Frio: Show mobile theme selection only if mobile themes are available
6 years ago
rabuzarus 686a7dbe01 Bugfix: make some todos usable for doxygen in dfrn.php
6 years ago
Tobias Diekershoff 0c65dbb8db Merge pull request #3064 from rabuzarus/20170102_-_add_switch_element_to_frio
6 years ago
Tobias Diekershoff 8f0ca51a55 Merge pull request #3065 from rabuzarus/20170103_-_frio_fix_nav_help_string
6 years ago
Roland Häder 91d9ac0d1e Merge branch 'develop' into rewrites/dbm_is_result
6 years ago
Roland Häder 42c2e09382 Merge remote-tracking branch 'upstream/develop' into develop
6 years ago
rabuzarus e31c4a62aa Merge pull request #3063 from tobiasd/20170103-de
6 years ago
rabuzarus 995e1fe690 Bugfix: Frio - use "Help" instead of "Help And Documentation" as label in the nav user menu
6 years ago
rabuzarus 860d6d51b9 Frio: add "aria-describedby" to the field templates
6 years ago
rabuzarus 96dfd22d9d Frio: implent switcher element
6 years ago
Tobias Diekershoff b783a98a9f DE translations THX Rabuzarus
6 years ago
Hypolite Petovan 93ea37e016 Merge remote-tracking branch 'friendica/develop' into develop
6 years ago
Michael Vogel 7f7fe1c332 Merge pull request #3060 from rabuzarus/20170102_-_frio_badge_z-index
6 years ago
rabuzarus 5bef39189b Bugfix: Frio css - add z-index to badges
6 years ago
Michael Vogel 77632ca3b0 Merge pull request #3059 from tobiasd/20170102-lang
6 years ago
Tobias Diekershoff e301dc7607 ES translation of the core
6 years ago
Tobias Diekershoff e74cee1e42 DE translation of the core
6 years ago
Tobias Diekershoff 72a0b8d3be Merge pull request #3058 from annando/1701-diaspora-thread-reply
6 years ago
Michael 9a6478b273 Don't be greedy.
6 years ago
Michael Vogel a285292d46 Merge pull request #3057 from rabuzarus/20170101_-_fix_frio_poke_tpl
6 years ago
Michael db2d0e0095 removal of useless variable
6 years ago
Michael 79b5eb63db Some more reverts
6 years ago
Michael 212f78386d Deactivated the auto mention - we should do it differently.
6 years ago
Michael 8aaf09f9ee Automatically add a Diaspora mention
6 years ago
Michael 8c579735f9 Diaspora: Add a mention when doing a thread reply
6 years ago
rabuzarus 885bd09598 Bugfix: fix the frio poke template
6 years ago
Roland Häder 551aca5b85
Merge branch 'develop' into rewrites/dbm_is_result
6 years ago
Roland Häder 9ca789b952
Merge remote-tracking branch 'upstream/develop' into develop
6 years ago
Tobias Diekershoff d671af2795 Merge pull request #3054 from annando/1612-diaspora
6 years ago
Michael 4053499c38 Enable caching wirh comments
6 years ago
Michael 93666b5a8d Disable some features
6 years ago
Michael 66902c7956 We now also transmit Dislikes
6 years ago
Michael 7cf70b64b8 We now send the participation message as well.
6 years ago
Roland Häder d2df464d8c
added curly braces + fixed indenting according to code review by Hypolite
6 years ago
Roland Häder bc9cb5e5f6
added curly braces + fixed indenting according to code review by Hypolite
6 years ago
Roland Häder c30647e15e
Merge branch 'develop' into rewrites/dbm_is_result
6 years ago
Roland Häder d2280d4120
Merge remote-tracking branch 'upstream/develop' into develop
6 years ago