Commit Graph

13790 Commits (79b5eb63db5020564d5d868f0a48d273001fd18a)
 

Author SHA1 Message Date
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
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
Michael 4928d00e22 Standard stuff 6 years ago
Michael 55ee80338f Events are now shared with Diaspora. 6 years ago
Michael 5222bd2264 Merge remote-tracking branch 'upstream/develop' into 1612-diaspora 6 years ago
Michael 94977cca18 Events are now done. 6 years ago
Tobias Diekershoff 51155d7716 Merge pull request #3047 from annando/1612-indexlength 6 years ago
Michael 666eb2ddbd Merge branch '1612-diaspora' of github.com:annando/friendica into 1612-diaspora 6 years ago
Michael 9af3f5b0da Improved loggin 6 years ago
Michael 1490f2d3b7 Merge remote-tracking branch 'upstream/develop' into 1612-diaspora 6 years ago
Michael Vogel 1d0cb0f7d2 Merge pull request #3048 from ddorian1/develop 6 years ago
Michael Vogel d830f506f2 Merge pull request #3051 from ddorian1/const 6 years ago
Michael Vogel c348dd6134 Merge pull request #3046 from rabuzarus/2016125_-_photo_albums_refresh 6 years ago
Michael 483f34c4ce We now transmit event data as well 6 years ago
Michael ca0e6cba02 Relaying of Diaspora comments now work with the new fields as well. 6 years ago
Johannes Schwab aab21838a4 Missing self befor class constants 6 years ago
Michael Vogel efd9623ff1 Merge pull request #3050 from tobiasd/20161227-adminpanel 6 years ago
Tobias Diekershoff 236c7805a4 for the fed stats it is better to have a >= then a = in the query 6 years ago
Johannes Schwab 8e2fc0f8a9 Fix test for static calls with PHP 7 6 years ago
Michael 6a511066c4 Threaded comments will now be transmitted 6 years ago
Michael ce4c542e37 Support for threaded comments 6 years ago
Michael 39c674f9a0 updated database.sql 6 years ago
Michael 38fed9a77b We should increase the database version as well ... 6 years ago
rabuzarus a6d7ad0755 Update cache on photo edit only when album name has changed 6 years ago
Michael 3ba1ac595f New binary data fields to avoid index length problems 6 years ago
rabuzarus 08fb35838c Update the photo albums cache on upload, album deletion or renaming 6 years ago
Michael Vogel 94027f19b4 Merge pull request #3045 from rabuzarus/20161225_-_frio_colorbox_workaround 6 years ago
rabuzarus 0d76796f30 Bugfix: fix handling with colorbox popups in frio 6 years ago
Michael Vogel 80ec0398d8 Merge pull request #3044 from rabuzarus/20161224_-_update_perfect_scrollbar 6 years ago
Michael Vogel 498d265934 Merge pull request #3042 from rabuzarus/20161223_-_todo_doxygen 6 years ago
rabuzarus 3677467cef update perfect-scrollbar to version 0.6.15 6 years ago
rabuzarus e95337e9ae correct doxygen @todo 6 years ago
Michael Vogel ca734f168c Merge pull request #3036 from Quix0r/rewrites/app_get_baseurl_static 6 years ago
Roland Häder 31cd3fb33c Coding convention continued: 6 years ago
Roland Häder 9c81b4948e Coding convention applied: 6 years ago
Roland Häder 2325d81048 Code style changed: 6 years ago
Roland Häder d82ed5d1b4 Continued with code convention: 6 years ago
Roland Häder ad20c5504d Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 6 years ago
Roland Häder 5d0db51fdf Beatification/coding convention: 6 years ago
Michael Vogel 9e689e8b9b Merge pull request #3031 from Hypolite/bug/fix-diaspora-people-links 6 years ago
Roland Häder a314dbc562 removed conflict solving remains, took from upstream/develop 6 years ago
Roland Häder ef5838bbd2 was not missing in develop branch, but here. :-( 6 years ago
Roland Häder 99c8fd36c0 applied coding convention rule 6 years ago