13778 Commits (c0df692f5fc4eaadb322614069b2c7ed40453fa1)
 

Author SHA1 Message Date
Roland Häder c0df692f5f Merge remote-tracking branch 'upstream/develop' into develop 5 years ago
Roland Häder 41da37ae67 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 d242e72c65 applied coding convention rule 5 years ago
Roland Häder 4c04a78d1b Merge remote-tracking branch 'upstream/develop' into develop 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 59404e4eaf
More curly braces added, left some TODOs behind 5 years ago
Roland Haeder d3e666f71a
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?) 5 years ago
Roland Haeder e6a4a736fc
no need for this else block 5 years ago
rabuzarus 51c9a66fc3 frio: add notifications templates to frio 5 years ago
Roland Haeder 2178feab30
Merge remote-tracking branch 'upstream/develop' into develop 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 7f98c8086c added curly braces + space 5 years ago
Roland Häder b580c23844 Merge remote-tracking branch 'upstream/develop' into develop 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 7c342600c3
used more App::get_baseurl() instead of get_app()->get_baseurl(). 5 years ago
Roland Haeder 9814414b6a
used dbm::is_result() instead of count() 5 years ago
Roland Haeder 536f078ed4
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 04d90d9780
Merge branch 'rewrites/dbm_is_result' into develop 5 years ago
Roland Haeder 013f8a4139
Continued with coding convention: 5 years ago
Roland Haeder d6e57f0348
Continued with coding convention: 5 years ago
Roland Haeder 4edc73486e
Continued with coding convention: 5 years ago
Roland Häder 70a042fd04
added more curly braces + space between "if" and brace 5 years ago
Hypolite Petovan f334f9e61f
proxy_url: Fix extension extraction for URLs containing a . after a ? 5 years ago
Roland Haeder 54615be22e
Continued with coding convention: 5 years ago
Roland Haeder 6e44acfed6
Continued with coding convention: 5 years ago
Hypolite Petovan 6e929934c5 proxy: Simplify url extension extraction 5 years ago
Roland Haeder af2909bf8f
Continued with coding convention: 5 years ago
Hypolite Petovan b631442760 Misc changes to url_from_contact_guid 5 years ago
Roland Haeder b6d11f2129
Merge remote-tracking branch 'upstream/develop' into develop 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
Hypolite Petovan 4a7c3b9eef Diaspora: Fix class name case + add self 5 years ago
Roland Häder 4b221d216e added more curly braces + space between "if" and brace 5 years ago
Michael Vogel 7141ce9163 Merge pull request #3030 from Hypolite/bug/proxy_url_extension 5 years ago
Roland Häder 8ec5b06e04 Merge remote-tracking branch 'upstream/develop' into rewrites/dbm_is_result 5 years ago
Roland Häder a020086128 Merge remote-tracking branch 'upstream/develop' into develop 5 years ago
Roland Häder 4dfea76434 Merge branch 'develop' into rewrites/dbm_is_result 5 years ago
Tobias Diekershoff d4c3dcf2fc Merge pull request #3032 from annando/1612-auth-ejabber 5 years ago
Roland Häder b9e4b9f274 Merge remote-tracking branch 'upstream/develop' into develop 5 years ago