13825 Commits (30642756e5a5fa30941e6e23e09b90d8092aef8c)
 

Author SHA1 Message Date
Roland Häder 30642756e5 Code style changed: 5 years ago
Roland Häder c9194b0381 Continued with code convention: 5 years ago
Roland Häder 20e71d21a6 Merge branch 'rewrites/app_get_baseurl_static' into develop 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 c0df692f5f Merge remote-tracking branch 'upstream/develop' into develop 5 years ago
Roland Häder 5d0db51fdf Beatification/coding convention: 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 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 d242e72c65 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
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 b3d33ee1e6
More curly braces added, left some TODOs behind 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 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
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 0436782e70
Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 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 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
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 3befdc6920
used more App::get_baseurl() instead of get_app()->get_baseurl(). 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 b4bc07fdcc
Continued with coding convention: 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