Hypolite Petovan
|
f92918f471
|
Normalize App parameter declaration (mod folder, 2 out of 3)
|
2017-01-09 23:14:25 +11:00 |
|
Michael Vogel
|
ee39aba490
|
Merge pull request #3043 from Quix0r/rewrites/dbm_is_result
More usage of dbm::is_result + coding convention applied
|
2017-01-07 17:09:23 +01:00 |
|
|
Michael Vogel
|
b7d675dbb0
|
Merge pull request #3071 from Hypolite/issue/#1034-2
Updated SSL english docs
|
2017-01-07 15:40:24 +01:00 |
|
|
Hypolite Petovan
|
3caf3bccd9
|
Updated SSL english docs
Fixes #1034
|
2017-01-07 23:27:50 +11:00 |
|
|
Hypolite Petovan
|
8d195dc499
|
Merge remote-tracking branch 'friendica/develop' into develop
|
2017-01-07 23:23:50 +11:00 |
|
Roland Häder
|
f1dc36978a
|
Merge branch 'develop' into rewrites/dbm_is_result
|
2017-01-07 09:24:07 +01:00 |
|
|
Roland Häder
|
4f25396fae
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2017-01-07 09:23:58 +01:00 |
|
|
Michael Vogel
|
98c5eb1d95
|
Merge pull request #3068 from rabuzarus/20170105_-_frio_mobile_theme_selection
Frio: Show mobile theme selection only if mobile themes are available
|
2017-01-07 03:00:38 +01:00 |
|
rabuzarus
|
898761b4a0
|
Show mobile theme selection only if mobile themes are available (default template)
|
2017-01-07 00:22:22 +01:00 |
|
|
Roland Häder
|
770816a62a
|
Merge branch 'develop' into rewrites/dbm_is_result
|
2017-01-06 17:11:07 +01:00 |
|
|
Roland Häder
|
4530f4ac9d
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2017-01-06 17:10:40 +01:00 |
|
|
Michael Vogel
|
0d32fce2df
|
Merge pull request #3067 from rabuzarus/20170105_-_fix_dfrn_doxygen_todos
Bugfix: make some todos usable for doxygen in dfrn.php
|
2017-01-06 07:52:34 +01:00 |
|
|
Roland Häder
|
624c5fd190
|
Merge branch 'develop' into rewrites/dbm_is_result
|
2017-01-05 08:56:39 +01:00 |
|
|
Roland Häder
|
cbc32143d7
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2017-01-05 08:56:05 +01:00 |
|
|
rabuzarus
|
0994a0ced5
|
Frio: Show mobile theme selection only if mobile themes are available
|
2017-01-05 02:52:39 +01:00 |
|
|
rabuzarus
|
686a7dbe01
|
Bugfix: make some todos usable for doxygen in dfrn.php
|
2017-01-05 02:23:34 +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
|
91d9ac0d1e
|
Merge branch 'develop' into rewrites/dbm_is_result
|
2017-01-04 09:04: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 |
|
|
Hypolite Petovan
|
93ea37e016
|
Merge remote-tracking branch 'friendica/develop' into develop
|
2017-01-03 09:11:05 +11: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 Haeder
|
551aca5b85
|
Merge branch 'develop' into rewrites/dbm_is_result
Signed-off-by: Roland Haeder <roland@mxchange.org>
|
2016-12-31 17:59:42 +01:00 |
|
|
Roland Haeder
|
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 Haeder
|
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 Haeder
|
bc9cb5e5f6
|
added curly braces + fixed indenting according to code review by Hypolite
Signed-off-by: Roland Haeder <roland@mxchange.org>
|
2016-12-30 21:48:09 +01:00 |
|
|
Roland Haeder
|
c30647e15e
|
Merge branch 'develop' into rewrites/dbm_is_result
|
2016-12-30 21:35:37 +01:00 |
|