strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
14158 commits 2 branches 55 tags 148 MiB
Commit graph

14158 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roland Häder 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 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 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 Häder c30647e15e
Merge branch 'develop' into rewrites/dbm_is_result 2016-12-30 21:35:37 +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
Michael 39c674f9a0 updated database.sql 2016-12-26 23:44:21 +00:00
Michael 38fed9a77b We should increase the database version as well ... 2016-12-26 06:02:14 +00:00
Hypolite Petovan 949507d688 Merge remote-tracking branch 'friendica/develop' into develop 2016-12-25 23:42:11 -05:00
rabuzarus a6d7ad0755 Update cache on photo edit only when album name has changed 2016-12-26 02:41:00 +01:00
Michael 3ba1ac595f New binary data fields to avoid index length problems 2016-12-25 21:04:10 +00:00
rabuzarus 08fb35838c Update the photo albums cache on upload, album deletion or renaming 2016-12-25 16:58:38 +01:00
Michael Vogel 94027f19b4 Merge pull request #3045 from rabuzarus/20161225_-_frio_colorbox_workaround 
Bugfix: fix handling with colorbox popups in frio
 2016-12-25 06:47:56 +01:00
rabuzarus 0d76796f30 Bugfix: fix handling with colorbox popups in frio 2016-12-25 01:47:18 +01:00
Michael Vogel 80ec0398d8 Merge pull request #3044 from rabuzarus/20161224_-_update_perfect_scrollbar 
update perfect-scrollbar to version 0.6.15
 2016-12-24 12:49:05 +01:00
Michael Vogel 498d265934 Merge pull request #3042 from rabuzarus/20161223_-_todo_doxygen 
correct doxygen @todo
 2016-12-24 12:48:23 +01:00
rabuzarus 3677467cef update perfect-scrollbar to version 0.6.15 2016-12-24 02:27:17 +01:00
Roland Häder 7131e45cb1
added some spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-23 20:21:52 +01:00
Roland Häder f844d96a7f
added some spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-23 20:21:38 +01:00
Roland Häder 7aa799a0ee
Fixed parser errors (opps) + changed # -> // Please do so also as # for comments is deprecated. 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-23 20:10:21 +01:00
Roland Häder b7c9d63b7a
Fixed parser errors (opps) + changed # -> // Please do so also as # for comments is deprecated. 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-23 20:09:10 +01:00
Roland Häder 370571845b
Merge branch 'develop' into rewrites/dbm_is_result 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-23 19:51:43 +01:00
Roland Häder 3dbb92c0dc
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?) 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-23 19:51:11 +01:00
Roland Häder 89319d9579
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>
 2016-12-23 19:51:09 +01:00
Roland Häder 45dd1ccc7b
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>
 2016-12-23 19:51:08 +01:00
Roland Häder c1b76e889e
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>
 2016-12-23 19:51:06 +01:00