]> git.mxchange.org Git - friendica.git/history - mod/friendica.php
Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import
[friendica.git] / mod / friendica.php
2016-01-21 Michael VogelMerge remote-tracking branch 'upstream/develop' into...
2016-01-20 FabrixxmMerge branch 'hotfix_diaspora' into develop
2016-01-18 Tobias DiekershoffMerge pull request #2262 from annando/1601-http-timeouts
2016-01-17 Michael VogelMerge remote-tracking branch 'upstream/develop' into...
2016-01-17 Michael VogelMerge pull request #2257 from rabuzarus/locked_features...
2016-01-17 rabuzarusfeature management for admins: Merge branch 'devolop'
2015-09-29 FabrixxmMerge branch '3.4.2'
2015-07-12 Tobias DiekershoffMerge pull request #1750 from annando/1507-contact...
2015-07-12 Tobias DiekershoffMerge pull request #1751 from annando/1507-diaspora...
2015-07-08 Tobias DiekershoffMerge pull request #1742 from tobiasd/20150708-typo
2015-07-08 Tobias Diekershofftypo
2015-05-13 Tobias DiekershoffMerge pull request #1554 from FlxAlbroscheit/develop-1
2015-05-13 rabuzarusMerge pull request #1 from friendica/develop
2015-04-05 fabrixxmMerge branch 'release/3.4'
2015-03-29 Tobias DiekershoffMerge pull request #1455 from pztrn/master
2015-03-22 fabrixxmMerge pull request #1433 from tugelbend/develop
2015-02-24 FabrixxmMerge branch 'master' into develop
2015-02-23 fabrixxmMerge pull request #1356 from silke/develop
2015-02-18 FabrixxmMerge branch 'release-3.3.3' into develop
2015-02-10 FabrixxmMerge branch 'release-3.3.3' into develop
2015-02-10 FabrixxmMerge branch 'mat/mergerequest' of https://github.com...
2015-02-08 Michael VogelMerge remote-tracking branch 'upstream/develop' into...
2015-02-08 Tobias DiekershoffMerge pull request #1374 from annando/1502-noscrape...
2015-02-08 Michael VogelNoscrape is now enabled all the time.
2014-12-27 haukeMerge branch 'develop' of https://github.com/friendica...
2014-11-18 Michael VogelMerge branch 'develop' of github.com:annando/friendica...
2014-10-16 FabrixxmUpdate develop from 'master'
2014-10-13 fabrixxmMerge pull request #1187 from tobiasd/20141013
2014-10-13 Tobias Diekershoffuse noscrape by default, add opt-out option to disable it
2014-09-04 BeanowMerge branch 'feature/edit-profile-improvements' into...
2014-08-12 Michael VogelMerge remote-tracking branch 'upstream/master'
2014-08-12 tobiasdMerge pull request #1069 from annando/master
2014-08-10 tobiasdMerge pull request #1067 from Beanow/feature/noscrape
2014-08-10 BeanowAdded noscrape feature.
2013-12-02 fabrixxmMerge pull request #843 from annando/master
2013-12-01 Michael VogelMerge remote-tracking branch 'upstream/master'
2013-12-01 Michael Vogelmultiple admin mails. It is now possible to define...
2013-09-15 Michael VogelMerge remote-tracking branch 'upstream/master'
2013-09-06 fabrixxmMerge pull request #758 from annando/master
2013-08-23 fabrixxmMerge pull request #749 from mexon/fetch_url_cookies
2013-08-20 Tobias Diekershoffwe use the bugtracker on github now
2012-05-19 MichaelMerge branch 'master' of github.com:annando/friendica
2012-05-16 friendicaMerge https://github.com/friendica/dir into dpull
2012-05-09 Michael VogelMerge remote branch 'upstream/master'
2012-05-05 Vasudev KamathMerge branch 'master' of git://github.com/friendica...
2012-05-01 zottelMerge remote branch 'upstream/master'
2012-05-01 friendicaMerge https://github.com/friendica/friendica into pull
2012-05-01 friendicahidden plugins (add .hidden file to dir)
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-04-01 Thomas WillinghamMerge remote-tracking branch 'upstream/master'
2012-04-01 Michael VogelMerge commit 'upstream/master'
2012-03-30 zottelMerge remote branch 'upstream/master'
2012-03-30 friendicaMerge branch 'pull'
2012-03-30 friendicaprovide a way to specify an admin account for siteinfo...
2012-03-28 Michael VogelMerge commit 'upstream/master'
2012-03-27 zottelMerge remote branch 'upstream/master'
2012-03-26 Thomas WillinghamMerge remote-tracking branch 'main/master'
2012-03-25 Simon L'nuMerge branch 'master', remote-tracking branch 'remotes...
2012-03-25 friendicabug #329 - compress the plugin list on the friendica...
2012-01-19 friendicaadd remove_user hook (it looks like dreamhost changed...
2011-12-22 friendicaMerge branch 'master' into notify
2011-12-14 friendicaupdate link locations
2011-11-24 friendicalittle stuff - name change, live updates, new network...
2011-11-07 Fabio ComuniMerge branch 'oauthapi'
2011-10-30 Friendikarename