13758 Commits (236c7805a4ebb1beca89211454644cd6d0f50da1)
 

Author SHA1 Message Date
Tobias Diekershoff 236c7805a4 for the fed stats it is better to have a >= then a = in the query 5 years ago
Michael Vogel 94027f19b4 Merge pull request #3045 from rabuzarus/20161225_-_frio_colorbox_workaround 5 years ago
rabuzarus 0d76796f30 Bugfix: fix handling with colorbox popups in frio 5 years ago
Michael Vogel 80ec0398d8 Merge pull request #3044 from rabuzarus/20161224_-_update_perfect_scrollbar 5 years ago
Michael Vogel 498d265934 Merge pull request #3042 from rabuzarus/20161223_-_todo_doxygen 5 years ago
rabuzarus 3677467cef update perfect-scrollbar to version 0.6.15 5 years ago
rabuzarus e95337e9ae correct doxygen @todo 5 years ago
Michael Vogel ca734f168c Merge pull request #3036 from Quix0r/rewrites/app_get_baseurl_static 5 years ago
Roland Häder 31cd3fb33c Coding convention continued: 5 years ago
Roland Häder 9c81b4948e Coding convention applied: 5 years ago
Roland Häder 2325d81048 Code style changed: 5 years ago
Roland Häder d82ed5d1b4 Continued with code convention: 5 years ago
Roland Häder ad20c5504d Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 5 years ago
Roland Häder 5d0db51fdf Beatification/coding convention: 5 years ago
Michael Vogel 9e689e8b9b Merge pull request #3031 from Hypolite/bug/fix-diaspora-people-links 5 years ago
Roland Häder a314dbc562 removed conflict solving remains, took from upstream/develop 5 years ago
Roland Häder ef5838bbd2 was not missing in develop branch, but here. :-( 5 years ago
Roland Häder 99c8fd36c0 applied coding convention rule 5 years ago
Roland Häder 8b7d5d0efc Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 5 years ago
Michael Vogel 584cf75af3 Merge pull request #3041 from rabuzarus/20161221_-_frio_notifications 5 years ago
rabuzarus 747e97a7b2 frio: revert img.intro-photo to 80pxx80px 5 years ago
rabuzarus 2fcbba9410 provide local time for notifications 5 years ago
rabuzarus 125d2f24dd frio: add profile link to the notifications url 5 years ago
Roland Haeder b3d33ee1e6
More curly braces added, left some TODOs behind 5 years ago
Roland Haeder d97b6a2eba
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?) 5 years ago
Roland Haeder d80b82c55d no need for this else block 5 years ago
rabuzarus 51c9a66fc3 frio: add notifications templates to frio 5 years ago
Roland Haeder 0436782e70
Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 5 years ago
Michael Vogel 5a72d7527d Merge pull request #3040 from rabuzarus/20161221_-_frio_tooltip 5 years ago
rabuzarus 8a9143023d frio: append hovercard to body element 5 years ago
rabuzarus 24a58ab2e6 frio: append bs tooltip to body element 5 years ago
Roland Häder bb37cac772 added curly braces + space 5 years ago
Hypolite Petovan 47f88bd625 proxy mod: Standards bearer 5 years ago
Hypolite Petovan 1f94cb9aac proxy: Simplify url extension extraction 5 years ago
Hypolite Petovan c0ec9c5907 proxy_url: Fix extension extraction for URLs containing a . after a ? 5 years ago
Hypolite Petovan 769b849665 url_from_contact_guid: move network constant to arg list 5 years ago
Michael Vogel 875110ab27 Merge pull request #3038 from Hypolite/bug/proxy_url_extension 5 years ago
Roland Haeder 3befdc6920
used more App::get_baseurl() instead of get_app()->get_baseurl(). 5 years ago
Roland Haeder b4bc07fdcc
Continued with coding convention: 5 years ago
Hypolite Petovan e54ee2e509 Merge remote-tracking branch 'friendica/develop' into bug/proxy_url_extension 5 years ago
Hypolite Petovan b2768d8f1c proxy mod: Standards bearer 5 years ago
Roland Haeder bb06d9ce32
Continued with coding convention: 5 years ago
Roland Haeder 52f14ffa5f
Continued with coding convention: 5 years ago
Roland Haeder 6c0c9d542a
Continued with coding convention: 5 years ago
Hypolite Petovan 6e929934c5 proxy: Simplify url extension extraction 5 years ago
Hypolite Petovan b631442760 Misc changes to url_from_contact_guid 5 years ago
Hypolite Petovan a99532707b Resolve conflict 5 years ago
Hypolite Petovan e8e1f9253d Merge remote-tracking branch 'friendica/develop' into bug/fix-diaspora-people-links 5 years ago
Hypolite Petovan 177f93f9a5 diaspora.php: Standards, standards everywhere 5 years ago
Hypolite Petovan 155e777d19 replace_people_guid: Break down nested calls 5 years ago