Commit Graph

14411 Commits (8decd15565a2372970bc48e05657bbe1f791c761)
 

Author SHA1 Message Date
Michael 8decd15565 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 6 years ago
rabuzarus b8e8c96386 Merge pull request #3236 from annando/bugfix-feed 6 years ago
Michael dc3fcf0487 Standard stuff 6 years ago
Michael 35ec1c8f26 Bugfix for pull request 3216 - feed items were mixed 6 years ago
Michael 187a81f159 Merge remote-tracking branch 'upstream/develop' into develop 6 years ago
Michael Vogel e57bd5fe55 Merge pull request #3233 from rabuzarus/20170314_-_pagination 6 years ago
rabuzarus 0143369e54 limit pagination page buttons to max 10 6 years ago
Michael Vogel a7e8e86800 Merge pull request #3221 from strk/remember-openid 6 years ago
rabuzarus 3061a37b4f Merge pull request #3232 from Hypolite/issue/#3194-2 6 years ago
fabrixxm fa3490ba5b Merge pull request #3224 from annando/1702-no-old_pager 6 years ago
Michael Vogel 199bba20d9 Merge pull request #3200 from Hypolite/issue/#3195 6 years ago
Sandro Santilli 0b46a5f935 Standards: add braces 6 years ago
Sandro Santilli 8517ba1fab Remove extra space after open parentheses 6 years ago
Michael Vogel 98945eb6fa Merge pull request #3213 from Hypolite/issue/#2792-2 6 years ago
Hypolite Petovan 327b00117d Improve dropItem() functionality 6 years ago
Hypolite Petovan f2a0c9fad1 Fix scrollToItem breaking dropItem functionality 6 years ago
Hypolite Petovan 054f43a332 Merge remote-tracking branch 'friendica/develop' into develop 6 years ago
rabuzarus e1eb9231f4 Merge pull request #3202 from Hypolite/issue/#3107 6 years ago
Sandro Santilli cbaf196f50 Only remove the "remember me" cookie at submitting the auth form 6 years ago
Michael f852f7aac0 Merge branch 'master' of github.com:annando/friendica 6 years ago
Michael 4d30f2b292 Merge remote-tracking branch 'upstream/master' 6 years ago
Michael bb59f105e7 Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server 6 years ago
Michael fbb84ee219 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 6 years ago
Michael 52a35f9884 Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server 6 years ago
Michael 611cbcfd06 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 6 years ago
Tobias Diekershoff dfc5dc2e9e Merge pull request #3223 from annando/1702-no-language 6 years ago
Tobias Diekershoff e2c515baa9 Merge pull request #3225 from annando/1702-no_old_share 6 years ago
Michael 44888590e5 One error, one documentation, one brace 6 years ago
Michael eb6a6228f7 more spaces 6 years ago
Michael 80e58964ce Standard stuff 6 years ago
Michael 97d3176754 Querying via nodeinfo 6 years ago
Michael d9da10975a Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server 6 years ago
Michael 259598e569 Merge remote-tracking branch 'upstream/develop' into 1702-no_old_share 6 years ago
Michael 044e9a6603 Merge remote-tracking branch 'upstream/develop' into 1702-no-old_pager 6 years ago
Michael b6a4a2ec7f Merge remote-tracking branch 'upstream/develop' into 1702-no-language 6 years ago
Michael 18d23ca443 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 6 years ago
Hypolite Petovan 5718e49e68 Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop 6 years ago
Tobias Diekershoff 7d1e54664a Merge pull request #3133 from mexon/mat/cidfix 6 years ago
Tobias Diekershoff 7275319eb6 Merge pull request #3214 from Hypolite/get_contact-rewrite 6 years ago
Tobias Diekershoff 1bf089e424 Merge pull request #3216 from annando/1701-performance 6 years ago
Tobias Diekershoff e29d7f19d1 Merge pull request #3222 from Hypolite/issue/#3220 6 years ago
Tobias Diekershoff 30d82f4391 mark the develop version in the version string 6 years ago
Tobias Diekershoff 4cddb74f27 Merge branch 'master' into develop 6 years ago
Tobias Diekershoff 2bfa870c47 Friendica Version 3.5.1 6 years ago
Michael bfad58a777 We don't need to show the id. 6 years ago
Michael 3a3fa017a6 Discovery of new servers 6 years ago
Hypolite Petovan 2310bf994a Normalize line endings instead of adding <br> before Markdown() 6 years ago
Sandro Santilli df6304cc42 Fix "remember me" cookie for OpenID logins 6 years ago
Michael 3249152ac3 Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server 6 years ago
Hypolite Petovan 3fa4605ace Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop 6 years ago