Merge pull request #2190 from annando/1512-getload
[friendica.git] / .htaccess
2014-12-27 haukeMerge branch 'develop' of https://github.com/friendica...
2014-11-18 Michael VogelMerge branch 'develop' of github.com:annando/friendica...
2014-09-07 fabrixxmMerge remote-tracking branch 'friendica/master' into...
2014-09-07 haukeMerge branch 'master' of https://github.com/friendica...
2014-09-07 fabrixxmMerge pull request #1119 from annando/1409-issue-881
2014-09-07 fabrixxmMerge pull request #1118 from tugelbend/master
2014-09-07 fabrixxmMerge pull request #1117 from annando/1409-suppress...
2014-09-07 fabrixxmMerge pull request #1114 from annando/1409-api-search...
2014-09-07 Michael VogelAPI: The command "users/search" is now supported.
2014-04-29 Michael VogelMerge remote-tracking branch 'upstream/master'
2014-04-26 tobiasdMerge pull request #944 from annando/master
2014-04-24 fabrixxmMerge pull request #941 from annando/master
2014-04-23 fabrixxmMerge pull request #940 from annando/master
2014-04-22 fabrixxmMerge pull request #938 from annando/master
2014-04-12 tobiasdMerge pull request #935 from annando/master
2014-04-07 fabrixxmMerge pull request #932 from annando/master
2014-04-04 fabrixxmMerge pull request #927 from annando/master
2014-03-02 tobiasdMerge pull request #919 from annando/master
2014-02-24 tobiasdMerge pull request #914 from annando/master
2014-02-22 tobiasdMerge pull request #913 from friendica/20140222
2014-02-17 tobiasdMerge pull request #912 from annando/master
2014-02-16 tobiasdMerge pull request #911 from annando/master
2014-02-05 tobiasdMerge pull request #909 from annando/master
2014-02-04 tobiasdMerge pull request #907 from annando/master
2014-02-02 tobiasdMerge pull request #906 from annando/master
2014-01-29 tobiasdMerge pull request #904 from annando/master
2014-01-28 tobiasdMerge pull request #902 from annando/master
2014-01-27 pixelroot modified: view/theme/smoothly/style.css
2012-11-04 Thomas WillinghamMerge remote-tracking branch 'upstream/master'
2012-09-19 FabrixxmMerge branch 'master' into blog-like
2012-09-17 AlexMerge pull request #482 from pixelroot/master
2012-09-17 AlexMerge pull request #481 from pixelroot/master
2012-09-17 AlexMerge pull request #480 from pixelroot/master
2012-09-14 AlexMerge pull request #476 from pixelroot/master
2012-09-14 AlexMerge pull request #475 from pixelroot/master
2012-09-14 AlexMerge pull request #474 from pixelroot/master
2012-09-14 AlexMerge pull request #473 from pixelroot/master
2012-09-14 AlexMerge pull request #472 from pixelroot/master
2012-09-14 AlexMerge pull request #471 from pixelroot/master
2012-09-13 Thomas WillinghamMerge pull request #469 from pixelroot/master
2012-09-13 friendicaMerge pull request #468 from pixelroot/master
2012-09-12 tobiasdMerge pull request #466 from pixelroot/master
2012-09-11 fermionicMerge pull request #464 from pixelroot/master
2012-09-10 Michael VogelMerge remote branch 'upstream/master'
2012-09-10 fermionicMerge pull request #463 from pixelroot/master
2012-09-10 DomovoyMerge branch 'master' of https://github.com/friendica...
2012-09-08 fermionicMerge pull request #461 from pixelroot/master
2012-09-07 friendicaMerge https://github.com/friendica/friendica into pull
2012-09-06 Thomas WillinghamMerge branch 'master' of https://github.com/friendica...
2012-09-06 fermionicMerge pull request #459 from fermionic/individual-choic...
2012-09-06 fermionicMerge pull request #458 from fermionic/twitter-profile...
2012-09-06 Zach Prezkutasmall twitter improvements
2012-09-06 fermionicMerge pull request #456 from pixelroot/master
2012-09-04 Michael VogelMerge remote branch 'upstream/master'
2012-09-04 friendicaMerge https://github.com/friendica/friendica into pull
2012-09-02 fermionicMerge pull request #454 from CyberDomovoy/mass_vhost
2012-09-02 DomovoyAdded comments in .htacces to help configuring installa...
2012-05-16 friendicaMerge https://github.com/friendica/dir into dpull
2012-04-24 Thomas WillinghamMerge remote-tracking branch 'upstream/master'
2012-04-11 MichaelMerge branch 'master' of github.com:annando/friendica
2012-04-08 zottelMerge remote branch 'upstream/master'
2012-04-07 Michael VogelMerge commit 'upstream/master'
2012-04-06 Simon L'nuMerge branch 'master', remote-tracking branch 'remotes...
2012-04-06 friendicaMerge branch 'pull'
2012-04-05 Alexander KampmannMerge branch 'master' of https://github.com/friendica...
2012-03-28 Michael VogelMerge commit 'upstream/master'
2012-03-26 Thomas WillinghamMerge remote-tracking branch 'main/master'
2012-03-23 Simon L'nuMerge branch 'master', remote-tracking branch 'remotes...
2012-03-22 zottelMerge remote branch 'upstream/master'
2012-03-22 Fabio ComuniMerge remote-tracking branch 'friendica/master'
2012-03-22 Tobias DiekershoffMerge branch 'master' of https://github.com/friendica...
2012-03-22 friendicaMerge pull request #157 from campino/master
2012-03-22 Alexander KampmannMerge branch 'master' of git://github.com/friendica...
2012-03-22 Alexander Kampmannremoved problem from previous commit
2012-03-21 tony baldwinMerge remote branch 'upstream/master'
2012-03-19 ThomasMerge remote-tracking branch 'main/master'
2012-03-19 Fabio ComuniMerge remote-tracking branch 'friendica/master'
2012-03-16 zottelMerge remote branch 'upstream/master'
2012-03-16 Tobias DiekershoffMerge branch 'master' of https://github.com/friendica...
2012-03-16 friendicaturn indexes back off (this is from an errant checkin...
2012-03-15 Michael VogelMerge commit 'upstream/master'
2012-03-15 zottelMerge remote branch 'upstream/master'
2012-03-15 friendicaMerge https://github.com/friendica/friendica into pull
2012-03-15 Tobias DiekershoffMerge branch 'master' of https://github.com/friendica...
2012-03-15 Simon L'nuMerge branch 'master', remote-tracking branch 'remotes...
2012-03-14 friendicaMerge pull request #132 from campino/master
2012-03-14 Alexander KampmannMerge branch 'master' of git://github.com/friendica...
2012-03-09 Alexander KampmannMerge branch 'master' of git://github.com/friendica...
2012-03-08 Alexander Kampmannadded library and include to .htaccess
2012-01-19 friendicaadd remove_user hook (it looks like dreamhost changed...
2011-10-18 fabrixxmMerge pull request #33 from fabrixxm/master
2011-10-17 FriendikaMerge branch 'pull'
2011-10-17 tobiasdMerge pull request #31 from tobiasd/master
2011-10-17 Tobias Diekershoffreverted rewrite base
2011-10-17 fabrixxmMerge pull request #30 from fabrixxm/master
2011-10-17 Fabio Comuniworks on login form
2011-07-06 Fabio ComuniMerge remote-tracking branch 'friendika/master'
2011-07-06 Friendikaremoved another local line
2011-07-06 Friendikaremoved local testing statement from .htaccess
2011-07-06 FriendikaMerge pull request #136 from fabrixxm/master
next