13736 Commits (5d0db51fdf560d9599af461664188451941d5295)
 

Author SHA1 Message Date
Roland Häder 5d0db51fdf Beatification/coding convention: 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
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
Roland Häder de689583e2 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 4805aa8fdb Don't cherry-pick: 5 years ago
Roland Häder 361a55155c Don't cherry-pick: reverted unrelated changes (dbm::is_result()) 5 years ago
Michael d72673b162 Only distribute items to active contacts 5 years ago
Michael 4aafbb09a5 The object type "photo" is deprecated and was replaced by "image" 5 years ago
Michael 1f93024ed6 Workaround for vanished database connections while authentication 5 years ago
Tobias Diekershoff d4c3dcf2fc Merge pull request #3032 from annando/1612-auth-ejabber 5 years ago
Tobias Diekershoff cc16369b6f Merge pull request #3033 from annando/1612-object-type 5 years ago
Tobias Diekershoff c1193c9c13 Merge pull request #3034 from annando/1612-no-archive 5 years ago
Roland Häder 4f26bee453 Changed $a->get_baseurl() to App::get_baseurl() 5 years ago
Roland Häder b69d82e64c Continued a bit: 5 years ago
Roland Häder a883514604 Opps, forgot this ... 5 years ago
Roland Häder a25b628286 added curly braces + space between "if" and brace 5 years ago
Roland Häder ace8f753ac added much more curly braces + space between "if" and brace 5 years ago
Roland Häder 5f41375ad3 Continued: 5 years ago
Roland Häder fc9dbc0899 added spaces + curly braces 5 years ago
Roland Häder f3529e7dbc added spaces + curly braces 5 years ago
Roland Häder 2e908ebbbf added more curly braces + fixed space->tab for code indentation. 5 years ago
Roland Häder 4780df394d added curly braces + space between "if" and brace 5 years ago