4928d00e22
Standard stuff
2016-12-30 10:03:02 +00:00
55ee80338f
Events are now shared with Diaspora.
2016-12-30 03:31:38 +00:00
5222bd2264
Merge remote-tracking branch 'upstream/develop' into 1612-diaspora
2016-12-29 23:29:01 +00:00
94977cca18
Events are now done.
2016-12-29 23:27:11 +00:00
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
666eb2ddbd
Merge branch '1612-diaspora' of github.com:annando/friendica into 1612-diaspora
2016-12-29 17:13:07 +00:00
9af3f5b0da
Improved loggin
2016-12-29 17:11:59 +00:00
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
483f34c4ce
We now transmit event data as well
2016-12-29 03:13:57 +00:00
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
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
6a511066c4
Threaded comments will now be transmitted
2016-12-27 14:37:48 +00:00
ce4c542e37
Support for threaded comments
2016-12-27 12:59:15 +00:00
39c674f9a0
updated database.sql
2016-12-26 23:44:21 +00:00
38fed9a77b
We should increase the database version as well ...
2016-12-26 06:02:14 +00:00
rabuzarus
a6d7ad0755
Update cache on photo edit only when album name has changed
2016-12-26 02:41:00 +01:00
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
rabuzarus
e95337e9ae
correct doxygen @todo
2016-12-23 18:31:42 +01:00
Michael Vogel
ca734f168c
Merge pull request #3036 from Quix0r/rewrites/app_get_baseurl_static
...
$a->get_baseurl() rewritten to App::get_baseurl() - 2nd PR
2016-12-23 08:20:10 +01:00
31cd3fb33c
Coding convention continued:
...
- added curly braces
- added spaces between if/foreach and brace
- made code block look nicer (spaces added, tabs replaced by space)
- added TODO
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 17:13:34 +01:00
9c81b4948e
Coding convention applied:
...
- added curly braces
- added space between if/foreach and brace
- avoided 2 return statements (true/false) by replacing them with just one
- added TODO for applying above to all findings
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 16:59:43 +01:00
2325d81048
Code style changed:
...
- added more curly braces
- made SQL keywords all-uppercase
- added spaces between if/foreach and brace
- // Is for single-line comments *only*, please don't abuse it for multiple
line comments, use /* */ instead and a asterisk in front of every line.
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 16:52:28 +01:00
d82ed5d1b4
Continued with code convention:
...
- added more curly braces
- added space betweent if/foreach and brace
- added spaces for beautification
- converted some " to ' (mixed usage)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 15:31:23 +01:00
ad20c5504d
Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static
...
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
include/diaspora.php
object/Item.php
2016-12-22 11:33:00 +01:00
5d0db51fdf
Beatification/coding convention:
...
- added a lot spaces to make it look nicer
- added curly braces (coding convention)
- added needed spaces (coding convention)get_id
- removed obsolete $a = get_app() call
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 11:22:07 +01:00
Michael Vogel
9e689e8b9b
Merge pull request #3031 from Hypolite/bug/fix-diaspora-people-links
...
Diaspora: Complete /people/* links from fcontact or author domain
2016-12-22 10:17:44 +01:00
a314dbc562
removed conflict solving remains, took from upstream/develop
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 09:14:14 +01:00
ef5838bbd2
was not missing in develop branch, but here. :-(
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 09:10:17 +01:00
99c8fd36c0
applied coding convention rule
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 09:10:00 +01:00
8b7d5d0efc
Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static
2016-12-22 09:06:00 +01:00
Michael Vogel
584cf75af3
Merge pull request #3041 from rabuzarus/20161221_-_frio_notifications
...
frio notifications templates + local date & profile link for the notifications page
2016-12-22 07:31:07 +01:00
rabuzarus
747e97a7b2
frio: revert img.intro-photo to 80pxx80px
2016-12-22 01:54:41 +01:00
rabuzarus
2fcbba9410
provide local time for notifications
2016-12-22 00:28:52 +01:00
rabuzarus
125d2f24dd
frio: add profile link to the notifications url
2016-12-21 23:17:55 +01:00
b3d33ee1e6
More curly braces added, left some TODOs behind
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-21 23:17:47 +01:00
d97b6a2eba
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?)
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-21 23:04:09 +01:00
d80b82c55d
no need for this else block
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-21 22:53:32 +01:00
rabuzarus
51c9a66fc3
frio: add notifications templates to frio
2016-12-21 20:39:07 +01:00
