]> git.mxchange.org Git - friendica.git/history - mod/friendica.php
Merge branch 'develop' into rewrites/dbm_is_result
[friendica.git] / mod / friendica.php
2016-12-22 Roland HäderMerge remote-tracking branch 'upstream/develop' into...
2016-12-22 Roland HäderMerge remote-tracking branch 'upstream/develop' into...
2016-12-22 Roland HäderMerge remote-tracking branch 'upstream/develop' into...
2016-12-21 Roland HaederMerge remote-tracking branch 'upstream/develop' into...
2016-12-21 Roland HäderMerge remote-tracking branch 'upstream/develop' into...
2016-12-20 Hypolite PetovanMerge remote-tracking branch 'friendica/develop' into...
2016-12-20 Roland HaederMerge remote-tracking branch 'upstream/develop' into...
2016-12-20 Hypolite PetovanMerge remote-tracking branch 'friendica/develop' into...
2016-12-20 Michael VogelMerge pull request #3030 from Hypolite/bug/proxy_url_ex...
2016-12-20 Roland HäderMerge remote-tracking branch 'upstream/develop' into...
2016-12-20 Roland HäderMerge remote-tracking branch 'upstream/develop' into...
2016-12-20 Tobias DiekershoffMerge pull request #3032 from annando/1612-auth-ejabber
2016-12-20 Roland HäderMerge remote-tracking branch 'upstream/develop' into...
2016-12-20 Tobias DiekershoffMerge pull request #3033 from annando/1612-object-type
2016-12-20 Tobias DiekershoffMerge pull request #3034 from annando/1612-no-archive
2016-12-20 Roland HäderMerge branch 'develop' into rewrites/dbm_is_result
2016-12-20 Roland Häderchanged to this:
2016-12-20 Roland Häder*much* more usage of App::get_baseurl() instead of...
2016-12-19 Roland HäderMerge branch 'rewrites/dbm_is_result' into develop
2016-12-19 Roland Häder*much* more usage of App::get_baseurl() instead of...
2016-12-19 Michael VogelMerge pull request #3010 from Quix0r/rewrites/mixed...
2016-12-19 Roland HäderMerge remote-tracking branch 'upstream/develop' into...
2016-12-14 Roland HäderCleanup for #3010 - added spaces, thanks to @annando .
2016-12-13 Roland HäderMore usage of dbm::is_result($r) instead of count($r):
2016-09-18 Roland HaederThis merge brings back dbm::is_result() where I could...
2016-07-21 Michael VogelMerge remote-tracking branch 'upstream/master' into...
2016-05-25 rabuzarusMerge branch 'master' of ../save/merge/frio into frio_merge
2016-05-01 Roland HaederContinued rewriting:
2016-04-07 Tobias DiekershoffMerge pull request #2441 from rabuzarus/0704_doxygen_forum
2016-02-11 Tobias DiekershoffMerge pull request #2336 from stieben/move-div-pause
2016-02-09 FabrixxmMerge branch 'develop' into api_ping
2016-02-09 rabuzarusMerge develop into 0602_contact_profile
2016-02-09 Tobias DiekershoffMerge pull request #2329 from annando/1602-poller-db
2016-02-09 Michael VogelMerge pull request #2326 from fabrixxm/revert_db949bb8
2016-02-08 rabuzarusMerge develop into 0602_contact_profile
2016-02-08 fabrixxmMerge pull request #2323 from annando/1601-dfrn-import
2016-02-08 Michael VogelMerge pull request #2314 from rabuzarus/0302_datetime_c...
2016-02-07 fabrixxmRevert "Updated modules to allow for partial overrides...
2016-02-07 fabrixxmMerge pull request #2324 from rabuzarus/0502_vier_dark
2016-02-07 fabrixxmMerge pull request #2319 from stieben/develop
2016-02-05 Andrej StiebenUpdated modules to allow for partial overrides without...
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'
next