]>
git.mxchange.org Git - friendica.git/log
Michael [Sun, 8 Jan 2017 20:35:41 +0000 (20:35 +0000)]
Bugfix: Answers to OStatus posts should never reach Diaspora
Michael Vogel [Sat, 7 Jan 2017 16:09:23 +0000 (17:09 +0100)]
Merge pull request #3043 from Quix0r/rewrites/dbm_is_result
More usage of dbm::is_result + coding convention applied
Michael Vogel [Sat, 7 Jan 2017 14:40:24 +0000 (15:40 +0100)]
Merge pull request #3071 from Hypolite/issue/#1034-2
Updated SSL english docs
Hypolite Petovan [Sat, 7 Jan 2017 12:27:50 +0000 (23:27 +1100)]
Updated SSL english docs
Fixes #1034
Hypolite Petovan [Sat, 7 Jan 2017 12:23:50 +0000 (23:23 +1100)]
Merge remote-tracking branch 'friendica/develop' into develop
Roland Häder [Sat, 7 Jan 2017 08:24:07 +0000 (09:24 +0100)]
Merge branch 'develop' into rewrites/dbm_is_result
Roland Häder [Sat, 7 Jan 2017 08:23:58 +0000 (09:23 +0100)]
Merge remote-tracking branch 'upstream/develop' into develop
Michael Vogel [Sat, 7 Jan 2017 02:00:38 +0000 (03:00 +0100)]
Merge pull request #3068 from rabuzarus/20170105_-_frio_mobile_theme_selection
Frio: Show mobile theme selection only if mobile themes are available
rabuzarus [Fri, 6 Jan 2017 23:22:22 +0000 (00:22 +0100)]
Show mobile theme selection only if mobile themes are available (default template)
Roland Häder [Fri, 6 Jan 2017 16:11:07 +0000 (17:11 +0100)]
Merge branch 'develop' into rewrites/dbm_is_result
Roland Häder [Fri, 6 Jan 2017 16:10:40 +0000 (17:10 +0100)]
Merge remote-tracking branch 'upstream/develop' into develop
Michael Vogel [Fri, 6 Jan 2017 06:52:34 +0000 (07:52 +0100)]
Merge pull request #3067 from rabuzarus/20170105_-_fix_dfrn_doxygen_todos
Bugfix: make some todos usable for doxygen in dfrn.php
Roland Häder [Thu, 5 Jan 2017 07:56:39 +0000 (08:56 +0100)]
Merge branch 'develop' into rewrites/dbm_is_result
Roland Häder [Thu, 5 Jan 2017 07:56:05 +0000 (08:56 +0100)]
Merge remote-tracking branch 'upstream/develop' into develop
rabuzarus [Thu, 5 Jan 2017 01:52:39 +0000 (02:52 +0100)]
Frio: Show mobile theme selection only if mobile themes are available
rabuzarus [Thu, 5 Jan 2017 01:23:34 +0000 (02:23 +0100)]
Bugfix: make some todos usable for doxygen in dfrn.php
Tobias Diekershoff [Wed, 4 Jan 2017 12:54:48 +0000 (13:54 +0100)]
Merge pull request #3064 from rabuzarus/20170102_-_add_switch_element_to_frio
Frio: implement On/Off switcher element
Tobias Diekershoff [Wed, 4 Jan 2017 12:52:51 +0000 (13:52 +0100)]
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
Roland Häder [Wed, 4 Jan 2017 08:04:51 +0000 (09:04 +0100)]
Merge branch 'develop' into rewrites/dbm_is_result
Roland Häder [Wed, 4 Jan 2017 08:03:00 +0000 (09:03 +0100)]
Merge remote-tracking branch 'upstream/develop' into develop
rabuzarus [Tue, 3 Jan 2017 16:53:17 +0000 (17:53 +0100)]
Merge pull request #3063 from tobiasd/
20170103 -de
DE translations THX Rabuzarus
rabuzarus [Tue, 3 Jan 2017 16:49:40 +0000 (17:49 +0100)]
Bugfix: Frio - use "Help" instead of "Help And Documentation" as label in the nav user menu
rabuzarus [Tue, 3 Jan 2017 16:38:08 +0000 (17:38 +0100)]
Frio: add "aria-describedby" to the field templates
rabuzarus [Tue, 3 Jan 2017 16:33:01 +0000 (17:33 +0100)]
Frio: implent switcher element
Tobias Diekershoff [Tue, 3 Jan 2017 09:42:11 +0000 (10:42 +0100)]
DE translations THX Rabuzarus
Hypolite Petovan [Mon, 2 Jan 2017 22:11:05 +0000 (09:11 +1100)]
Merge remote-tracking branch 'friendica/develop' into develop
Michael Vogel [Mon, 2 Jan 2017 17:16:49 +0000 (18:16 +0100)]
Merge pull request #3060 from rabuzarus/20170102_-_frio_badge_z-index
Bugfix: Frio css - add z-index to badges
rabuzarus [Mon, 2 Jan 2017 12:38:10 +0000 (13:38 +0100)]
Bugfix: Frio css - add z-index to badges
Michael Vogel [Mon, 2 Jan 2017 09:37:56 +0000 (10:37 +0100)]
Merge pull request #3059 from tobiasd/
20170102 -lang
DE / ES update of the translation
Tobias Diekershoff [Mon, 2 Jan 2017 07:22:52 +0000 (08:22 +0100)]
ES translation of the core
Tobias Diekershoff [Mon, 2 Jan 2017 07:22:39 +0000 (08:22 +0100)]
DE translation of the core
Tobias Diekershoff [Mon, 2 Jan 2017 07:15:54 +0000 (08:15 +0100)]
Merge pull request #3058 from annando/1701-diaspora-thread-reply
Diaspora mentions are now done correctly
Michael [Mon, 2 Jan 2017 07:00:44 +0000 (07:00 +0000)]
Don't be greedy.
Michael Vogel [Sun, 1 Jan 2017 23:46:25 +0000 (00:46 +0100)]
Merge pull request #3057 from rabuzarus/20170101_-_fix_frio_poke_tpl
Bugfix: fix the frio poke template
Michael [Sun, 1 Jan 2017 23:38:32 +0000 (23:38 +0000)]
removal of useless variable
Michael [Sun, 1 Jan 2017 23:37:29 +0000 (23:37 +0000)]
Some more reverts
Michael [Sun, 1 Jan 2017 23:35:34 +0000 (23:35 +0000)]
Deactivated the auto mention - we should do it differently.
Michael [Sun, 1 Jan 2017 23:18:42 +0000 (23:18 +0000)]
Automatically add a Diaspora mention
Michael [Sun, 1 Jan 2017 21:21:16 +0000 (21:21 +0000)]
Diaspora: Add a mention when doing a thread reply
rabuzarus [Sun, 1 Jan 2017 21:05:24 +0000 (22:05 +0100)]
Bugfix: fix the frio poke template
Roland Haeder [Sat, 31 Dec 2016 16:59:23 +0000 (17:59 +0100)]
Merge branch 'develop' into rewrites/dbm_is_result
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Haeder [Sat, 31 Dec 2016 16:59:14 +0000 (17:59 +0100)]
Merge remote-tracking branch 'upstream/develop' into develop
Signed-off-by: Roland Haeder <roland@mxchange.org>
Tobias Diekershoff [Sat, 31 Dec 2016 10:57:33 +0000 (11:57 +0100)]
Merge pull request #3054 from annando/1612-diaspora
Events are now shared with Diaspora in separate fields
Michael [Fri, 30 Dec 2016 23:18:31 +0000 (23:18 +0000)]
Enable caching wirh comments
Michael [Fri, 30 Dec 2016 22:54:16 +0000 (22:54 +0000)]
Disable some features
Michael [Fri, 30 Dec 2016 22:40:30 +0000 (22:40 +0000)]
We now also transmit Dislikes
Michael [Fri, 30 Dec 2016 22:31:21 +0000 (22:31 +0000)]
We now send the participation message as well.
Roland Haeder [Fri, 30 Dec 2016 20:48:09 +0000 (21:48 +0100)]
added curly braces + fixed indenting according to code review by Hypolite
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Haeder [Fri, 30 Dec 2016 20:48:09 +0000 (21:48 +0100)]
added curly braces + fixed indenting according to code review by Hypolite
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Haeder [Fri, 30 Dec 2016 20:35:37 +0000 (21:35 +0100)]
Merge branch 'develop' into rewrites/dbm_is_result
Roland Haeder [Fri, 30 Dec 2016 20:33:41 +0000 (21:33 +0100)]
Merge remote-tracking branch 'upstream/develop' into develop
dbm::is_result() calls needed merge
Signed-off-by: Roland Haeder <roland@mxchange.org>
Michael [Fri, 30 Dec 2016 10:03:02 +0000 (10:03 +0000)]
Standard stuff
Michael [Fri, 30 Dec 2016 03:31:38 +0000 (03:31 +0000)]
Events are now shared with Diaspora.
Michael [Thu, 29 Dec 2016 23:29:01 +0000 (23:29 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1612-diaspora
Michael [Thu, 29 Dec 2016 23:27:11 +0000 (23:27 +0000)]
Events are now done.
Tobias Diekershoff [Thu, 29 Dec 2016 18:11:54 +0000 (19:11 +0100)]
Merge pull request #3047 from annando/1612-indexlength
New binary data fields to avoid index length problems
Michael [Thu, 29 Dec 2016 17:13:07 +0000 (17:13 +0000)]
Merge branch '1612-diaspora' of github.com:annando/friendica into 1612-diaspora
Michael [Thu, 29 Dec 2016 17:11:59 +0000 (17:11 +0000)]
Improved loggin
Michael [Thu, 29 Dec 2016 10:16:10 +0000 (10:16 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1612-diaspora
Michael Vogel [Thu, 29 Dec 2016 10:14:14 +0000 (11:14 +0100)]
Merge pull request #3048 from ddorian1/develop
Fix test for static calls with PHP 7
Michael Vogel [Thu, 29 Dec 2016 10:11:47 +0000 (11:11 +0100)]
Merge pull request #3051 from ddorian1/const
Missing self befor class constants
Michael Vogel [Thu, 29 Dec 2016 10:08:16 +0000 (11:08 +0100)]
Merge pull request #3046 from rabuzarus/2016125_-_photo_albums_refresh
Update the photo albums cache on upload, album deletion or renaming
Michael [Thu, 29 Dec 2016 03:13:57 +0000 (03:13 +0000)]
We now transmit event data as well
Michael [Wed, 28 Dec 2016 13:30:55 +0000 (13:30 +0000)]
Relaying of Diaspora comments now work with the new fields as well.
Johannes Schwab [Tue, 27 Dec 2016 18:07:57 +0000 (19:07 +0100)]
Missing self befor class constants
Michael Vogel [Wed, 28 Dec 2016 03:25:46 +0000 (04:25 +0100)]
Merge pull request #3050 from tobiasd/
20161227 -adminpanel
for the fed stats it is better to have a >= then a = in the query
Tobias Diekershoff [Tue, 27 Dec 2016 16:53:59 +0000 (17:53 +0100)]
for the fed stats it is better to have a >= then a = in the query
Johannes Schwab [Tue, 27 Dec 2016 14:47:53 +0000 (15:47 +0100)]
Fix test for static calls with PHP 7
Michael [Tue, 27 Dec 2016 14:37:48 +0000 (14:37 +0000)]
Threaded comments will now be transmitted
Michael [Tue, 27 Dec 2016 12:59:15 +0000 (12:59 +0000)]
Support for threaded comments
Michael [Mon, 26 Dec 2016 23:44:21 +0000 (23:44 +0000)]
updated database.sql
Michael [Mon, 26 Dec 2016 06:02:14 +0000 (06:02 +0000)]
We should increase the database version as well ...
Hypolite Petovan [Mon, 26 Dec 2016 04:42:11 +0000 (23:42 -0500)]
Merge remote-tracking branch 'friendica/develop' into develop
rabuzarus [Mon, 26 Dec 2016 01:41:00 +0000 (02:41 +0100)]
Update cache on photo edit only when album name has changed
Michael [Sun, 25 Dec 2016 21:04:10 +0000 (21:04 +0000)]
New binary data fields to avoid index length problems
rabuzarus [Sun, 25 Dec 2016 15:58:38 +0000 (16:58 +0100)]
Update the photo albums cache on upload, album deletion or renaming
Michael Vogel [Sun, 25 Dec 2016 05:47:56 +0000 (06:47 +0100)]
Merge pull request #3045 from rabuzarus/20161225_-_frio_colorbox_workaround
Bugfix: fix handling with colorbox popups in frio
rabuzarus [Sun, 25 Dec 2016 00:47:18 +0000 (01:47 +0100)]
Bugfix: fix handling with colorbox popups in frio
Michael Vogel [Sat, 24 Dec 2016 11:49:05 +0000 (12:49 +0100)]
Merge pull request #3044 from rabuzarus/20161224_-_update_perfect_scrollbar
update perfect-scrollbar to version 0.6.15
Michael Vogel [Sat, 24 Dec 2016 11:48:23 +0000 (12:48 +0100)]
Merge pull request #3042 from rabuzarus/20161223_-_todo_doxygen
correct doxygen @todo
rabuzarus [Sat, 24 Dec 2016 01:27:17 +0000 (02:27 +0100)]
update perfect-scrollbar to version 0.6.15
Roland Haeder [Fri, 23 Dec 2016 19:21:38 +0000 (20:21 +0100)]
added some spaces
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Haeder [Fri, 23 Dec 2016 19:21:38 +0000 (20:21 +0100)]
added some spaces
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Haeder [Fri, 23 Dec 2016 19:09:10 +0000 (20:09 +0100)]
Fixed parser errors (opps) + changed # -> // Please do so also as # for comments is deprecated.
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Haeder [Fri, 23 Dec 2016 19:09:10 +0000 (20:09 +0100)]
Fixed parser errors (opps) + changed # -> // Please do so also as # for comments is deprecated.
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Haeder [Fri, 23 Dec 2016 18:51:43 +0000 (19:51 +0100)]
Merge branch 'develop' into rewrites/dbm_is_result
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Haeder [Wed, 21 Dec 2016 22:04:09 +0000 (23:04 +0100)]
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?)
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Haeder [Tue, 20 Dec 2016 20:31:05 +0000 (21:31 +0100)]
Continued with coding convention:
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- made some SQL keywords upper-cased and added back-ticks to columns/table names
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Haeder [Tue, 20 Dec 2016 20:15:53 +0000 (21:15 +0100)]
Continued with coding convention:
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Haeder [Tue, 20 Dec 2016 20:15:53 +0000 (21:15 +0100)]
Continued with coding convention:
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Haeder [Tue, 20 Dec 2016 20:13:50 +0000 (21:13 +0100)]
Continued with coding convention:
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Häder [Tue, 20 Dec 2016 16:43:46 +0000 (17:43 +0100)]
added more curly braces + space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 20 Dec 2016 11:45:16 +0000 (12:45 +0100)]
Changed $a->get_baseurl() to App::get_baseurl()
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 20 Dec 2016 11:45:16 +0000 (12:45 +0100)]
Changed $a->get_baseurl() to App::get_baseurl()
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 20 Dec 2016 10:27:40 +0000 (11:27 +0100)]
added curly braces + space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 20 Dec 2016 09:59:06 +0000 (10:59 +0100)]
changed to this:
---------------------
function bla (App &$a) {
$a->bla = 'stuff';
}
---------------------
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 20 Dec 2016 09:58:55 +0000 (10:58 +0100)]
changed to this:
---------------------
function bla (App &$a) {
$a->bla = 'stuff';
}
---------------------
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 20 Dec 2016 09:39:06 +0000 (10:39 +0100)]
Coding convention:
- added curly braces
- added space between "if" and brace
- also added TODO (old-lost code?)
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Mon, 19 Dec 2016 13:26:13 +0000 (14:26 +0100)]
*much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied)
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Tue, 20 Dec 2016 09:10:33 +0000 (10:10 +0100)]
Coding convention applied:
- space between "if" and brace
- curly braces on conditional blocks
Signed-off-by: Roland Häder <roland@mxchange.org>