]> git.mxchange.org Git - friendica.git/history - mod/salmon.php
Merge branch 'develop' into rewrites/dbm_is_result
[friendica.git] / mod / salmon.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äderCoding convention applied:
2016-12-20 Roland HäderCoding convention applied:
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äderMerge branch 'rewrites/dbm_is_result' of github.com...
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-07-02 Michael VogelMerge branch 'rewrites/is_filled_array_introduced'...
2016-06-17 Silke MeyerMerge branch 'develop' of https://github.com/friendica...
2016-06-10 fabrixxmMerge pull request #2353 from shtrom/issue757-https...
2016-05-25 rabuzarusMerge branch 'master' of ../save/merge/frio into frio_merge
2016-05-01 Roland HaederContinued rewriting:
2016-05-01 Michael VogelNew OStatus implementation
2016-04-14 rabuzarusMerge develop into 1404_reworked_autocomplete
2016-04-07 Tobias DiekershoffMerge pull request #2441 from rabuzarus/0704_doxygen_forum
2016-04-02 Tobias DiekershoffMerge pull request #2424 from annando/1603-scrape-alias
2016-04-01 Tobias DiekershoffMerge pull request #2425 from annando/1603-ostatus
2016-03-30 Michael VogelNew OStatus implementation
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...
2015-09-29 FabrixxmMerge branch '3.4.2'
2015-07-14 Tobias DiekershoffMerge pull request #1758 from annando/1507-salmon
2015-07-13 Michael VogelSalmon: Don't store contact data before the message...
2015-07-13 Michael VogelReworked salmon import
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-21 fabrixxmMerge pull request #1300 from annando/1501-better-ostatus
2015-01-21 Michael VogelMerge remote-tracking branch 'upstream/develop' into...
2015-01-20 Michael VogelCaching for scrape, keywords for remote_self, notificat...
2012-11-05 FabrixxmMerge remote-tracking branch 'remotes/friendica/master...
2012-11-04 rootMerge remote-tracking branch 'upstream/master'
2012-11-04 friendicaMerge https://github.com/friendica/friendica into pull
2012-11-04 friendicaMerge pull request #522 from zzottel/master
2012-11-04 zottelMerge remote branch 'upstream/master'
2012-11-02 zottelChanges to make contacts delete all content from the...
2012-06-12 friendicaMerge pull request #331 from mexon/upstream
2012-06-11 Vasudev KamathMerge branch 'master' of git://github.com/friendica...
2012-06-09 Simon L'nuMerge remote-tracking branch 'remotes/upstream/master'
2012-06-08 friendicaprovide ability to autofriend ostatus accounts
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-01-19 friendicaadd remove_user hook (it looks like dreamhost changed...
2011-10-04 Olivier MigeotMerge remote branch 'upstream/master'
2011-09-26 Fabio ComuniMerge branch 'master' into newui
2011-09-19 fabrixxmMerge pull request #173 from fabrixxm/master
2011-09-19 Friendikacripple account when expired
2011-08-17 fabrixxmMerge remote-tracking branch 'friendika/master' into...
2011-08-10 FriendikaMerge branch 'pull'
2011-08-10 Friendikacrypto stuff
2011-08-07 Friendikacleanup
2011-08-05 Friendikasalmon protocol changes magicsig draft-experimental...
2011-07-22 FriendikaMerge pull request #144 from fabrixxm/newacl
2011-07-22 Tobias DiekershoffMerge github.com:tobiasd/friendika
2011-07-21 FriendikaMerge pull request #143 from fabrixxm/newacl
2011-07-21 Friendikawrong path for salmon verify
2011-07-05 fabrixxmMerge branch 'dispy' of github.com:fabrixxm/friendika...
2011-07-02 Friendikaalso check for blocked
2011-07-02 Friendikastatusnet improvements
2011-06-29 Friendikabug #96 move libraries to library - better alignment...
2011-06-09 Tobias DiekershoffMerge branch 'master' of git://github.com/friendika...
2011-06-09 Friendikamore calendar work, undo strict_privacy flag to use...
2011-06-07 Tobias DiekershoffMerge branch 'master' of git://github.com/friendika...
2011-06-06 Friendikastrict privacy mode (Friendika-Z) - refuse to talk...
next