Merge pull request #2190 from annando/1512-getload
[friendica.git] / .gitignore
2015-12-03 rabuzarusdoxygen: correct mistake - .gitignore shouldn't be...
2015-12-03 rabuzarusdoxygen: exclude some more folders
2015-05-13 rabuzarusMerge pull request #1 from friendica/develop
2015-04-05 fabrixxmMerge branch 'release/3.4'
2015-02-24 FabrixxmMerge branch 'release-3.3.3'
2015-02-10 FabrixxmMerge branch 'mat/mergerequest' of https://github.com...
2015-01-25 fabrixxmMerge pull request #1305 from tobiasd/20150123-quaddro
2015-01-25 fabrixxmMerge pull request #1317 from tobiasd/20150125cs
2015-01-25 Michael VogelMerge remote-tracking branch 'upstream/develop' into...
2015-01-25 Tobias DiekershoffMerge pull request #1314 from annando/1501-better-diasp...
2015-01-25 Tobias DiekershoffMerge pull request #1315 from annando/1501-issue-1283
2015-01-25 Tobias DiekershoffMerge pull request #1316 from annando/issue-1197
2015-01-25 Michael VogelMoved the "test" folder to "local"
2015-01-24 Michael VogelIssue 1197: New hook for "oembed_fetch_url"
2014-07-10 tobiasdMerge pull request #1042 from annando/master
2014-06-24 tobiasdMerge pull request #1033 from annando/master
2014-06-22 tobiasdMerge pull request #1028 from tugelbend/master
2014-06-20 Hauke Altmannadded vagrant configuration for running a friendica...
2014-05-12 fabrixxmMerge pull request #954 from fabrixxm/issue_936
2014-05-12 tobiasdMerge pull request #966 from annando/master
2014-05-11 Michael VogelRepeated messages to Diaspora now contain a link to...
2013-08-02 fabrixxmMerge pull request #745 from mexon/redirect_fix
2013-06-13 friendicaMerge https://github.com/friendica/friendica into pull
2013-06-08 Michael VogelMerge remote-tracking branch 'upstream/master'
2013-05-31 fabrixxmMerge pull request #688 from fabrixxm/quattro
2013-05-31 Fabrixxmquattro: show notification number in favicon
2013-02-22 friendicaMerge https://github.com/friendica/friendica into pull
2013-02-21 Tobias DiekershoffMerge branch 'master' of https://github.com/friendica...
2013-02-21 fermionicMerge pull request #621 from annando/master
2013-02-20 Michael VogelMerge remote-tracking branch 'upstream/master'
2013-02-17 Michael Vogeladded robots.txt to the igmnored files
2013-01-04 friendicaMerge https://github.com/friendica/friendica into pull
2013-01-04 friendicaMerge pull request #570 from annando/master
2012-12-30 Michael VogelVier: Some templates were missing
2012-11-08 Michael VogelMerge remote-tracking branch 'upstream/master'
2012-11-06 friendicaMerge https://github.com/friendica/friendica into pull
2012-11-06 zzottelMerge pull request #526 from zzottel/master
2012-11-06 friendicaMerge pull request #525 from fabrixxm/moveme
2012-11-05 FabrixxmMerge remote-tracking branch 'remotes/friendica/master...
2012-11-04 Thomas WillinghamMerge remote-tracking branch 'upstream/master'
2012-10-31 Fabrixxmmoveme: first successful relocated user
2012-09-28 FabrixxmMerge remote branch 'friendica/master' into quattro...
2012-09-20 Michael VogelMerge remote branch 'upstream/master'
2012-09-19 FabrixxmMerge branch 'master' into blog-like
2012-09-19 friendicaMerge https://github.com/friendica/friendica into pull
2012-09-18 friendicaMerge pull request #479 from fermionic/album-image...
2012-09-18 friendicaMerge pull request #483 from fabrixxm/bug471
2012-09-17 Thomas WillinghamMerge pull request #486 from cvogeley/master
2012-09-17 Christian Vogeleyignore OSX .DS_Store files
2012-09-17 Christian VogeleyRemove and ignore .DS_Store
2012-09-17 Thomas WillinghamGitignore seems to have been overwritten with somebody...
2012-09-10 Michael VogelMerge remote branch 'upstream/master'
2012-09-10 DomovoyMerge branch 'master' of https://github.com/friendica...
2012-09-09 friendicaMerge https://github.com/friendica/friendica into pull
2012-09-08 fermionicMerge pull request #461 from pixelroot/master
2012-09-07 pixelroot modified: view/theme/smoothly/style.css
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-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-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-09 Michael VogelMerge commit 'upstream/master'
2012-03-09 Tobias HößlMerge branch 'master' of git://github.com/friendica...
2012-03-08 Alexander Kampmannexcludes reports from git
2012-03-02 MichaelMerge remote branch 'upstream/master'
2012-03-02 Simon L'nuMerge branch 'master', remote-tracking branch 'remotes...
2012-03-02 fabrixxmMerge pull request #55 from fabrixxm/master
2012-03-02 tommy tomsonMerge remote-tracking branch 'upstream/master'
2012-03-02 friendicaMerge branch 'pull'
2012-03-02 friendicaMerge pull request #54 from campino/master
2012-03-01 Alexander KampmannMerge remote-tracking branch 'upstream/master'
2012-03-01 Alexander KampmannEnabled automated doc building. Changes:
2012-01-19 friendicaadd remove_user hook (it looks like dreamhost changed...
2011-10-04 Olivier MigeotMerge remote branch 'upstream/master'
2011-09-27 FriendikaMerge branch 'pull'
2011-09-27 fabrixxmMerge pull request #4 from fabrixxm/master
2011-09-27 Fabio Comuniport old themes
2011-09-26 Fabio ComuniMerge branch 'master' into newui
2011-09-26 FriendikaMerge branch 'pull'
2011-09-25 Friendikaaddon is not managed by our repository any more
2011-09-16 Fabio ComuniMerge remote-tracking branch 'friendika/master' into...
2011-09-08 fabrixxmMerge remote-tracking branch 'friendika/master' into...
2011-09-05 fabrixxmMerge branch 'newui' of github.com:fabrixxm/friendika...
2011-09-05 Fabio Comuniadd *~ to gitignore
2011-07-05 fabrixxmMerge branch 'dispy' of github.com:fabrixxm/friendika...
2011-06-29 Friendikahow the heck did favicon get into the repo? Gone now...
next