aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge pull request #45 from annando/masterfriendica2012-02-2216-689/+1257
| |\
| | * German translation more gender friendly. Some more logging in poller.phpMichael2012-02-227-11/+26
| | * Fetched some missing styles from testbubble.Michael2012-02-202-0/+395
| | * Some testing stuffMichael2012-02-202-1/+2
| | * API is now working on my nginx server.Michael2012-02-203-12/+24
| | * New version of markdown. Playing with stylesheet. Testing line breaks.root2012-02-193-504/+404
| | * Handling nested bbcodes. Some small design changes in html2bbcode. Change in ...Michael2012-02-193-23/+35
| | * README addedMichael2012-02-191-0/+3
| | * Brand new html2bbcode. Some other changes in diaspora to bbcode handlingMichael2012-02-193-158/+322
| | * Many small changesMichael2012-02-191-23/+0
| | * Merge remote branch 'upstream/master'Michael2012-02-19161-7793/+23085
| | |\
| | * | New theme "vier" derives from "quattro"ike2012-02-1911-0/+4270
| * | | Merge branch 'pull'friendica2012-02-221-1/+1
| |\ \ \
| | * \ \ Merge pull request #44 from simonlnu/masterfriendica2012-02-221-1/+1
| | |\ \ \
| | | * | | clean up Groups help file. there was a stray 'Freindika' in itSimon L'nu2012-02-221-1/+1
| | |/ / /
| * | | | allow forum posts by followers on Diasporafriendica2012-02-222-8/+20
| * | | | never enough documentationfriendica2012-02-221-0/+9
| |/ / /
| * | | waitman gobble media upload via api patchfriendica2012-02-212-5/+61
| * | | escape smiley conversion in code and pre blocksfriendica2012-02-211-0/+17
| * | | mark all notifications readfriendica2012-02-213-3/+14
* | | | some cleanup of tb notificationsfriendica2012-02-212-1/+6
* | | | new notificationsfriendica2012-02-211-0/+25
* | | | add full email link to notificationfriendica2012-02-211-3/+3
|/ / /
* | | Merge branch 'pull'friendica2012-02-211-2/+26
|\ \ \
| * \ \ Merge pull request #43 from fabrixxm/masterfabrixxm2012-02-211-2/+26
| |\ \ \
| | * | | template: add support for variable filtersFabio Comuni2012-02-211-2/+26
| |/ / /
* / / / logger_debug was used as string instead of constantfriendica2012-02-212-6/+6
|/ / /
* | | fill in notify msg with redirect link after we get the idfriendica2012-02-211-9/+16
* | | more cleanup of community followup detection. Remote worked well but local di...friendica2012-02-201-4/+13
* | | email notify now redirected through mod_notify, weirdness in local deliver ca...friendica2012-02-206-7/+72
* | | Merge branch 'pull'friendica2012-02-2027-51/+50
|\ \ \
| * \ \ Merge pull request #42 from friendica/ka2ca-rebasedfriendica2012-02-2025-45/+45
| |\ \ \
| | * | | view/admin_remoteupdate.tpl - Friendika -> FriendicaAbinoam P. Marques Jr2012-02-201-2/+2
| | * | | util/README - Friendika -> FriendicaAbinoam P. Marques Jr2012-02-201-1/+1
| | * | | htconfig.tpl - Friendika -> FriendicaAbinoam P. Marques Jr2012-02-208-15/+15
| | * | | mod/match.php - Friendika -> FriendicaAbinoam P. Marques Jr2012-02-201-1/+1
| | * | | mod/dirfind.php - Friendika -> FriendicaAbinoam P. Marques Jr2012-02-201-1/+1
| | * | | mod/dfrn_request.php and templates - Friendika -> FriendicaAbinoam P. Marques Jr2012-02-203-3/+3
| | * | | library/OAuth1 - Friendika -> FriendicaAbinoam P. Marques Jr2012-02-201-1/+1
| | * | | js/fk.autocomplete.js - Friendika -> FriendicaAbinoam P. Marques Jr2012-02-201-1/+1
| | * | | INSTALL.txt - Friendika -> FriendicaAbinoam P. Marques Jr2012-02-201-10/+10
| | * | | include/nav.php - Friendika -> FriendicaAbinoam P. Marques Jr2012-02-201-1/+1
| | * | | include/api.php - Friendika -> FriendicaAbinoam P. Marques Jr2012-02-201-3/+3
| | * | | poller.php - Friendika -> FriendicaAbinoam P. Marques Jr2012-02-201-1/+1
| | * | | acl_selectors.php - Friendika -> FriendicaAbinoam P. Marques Jr2012-02-201-1/+1
| | * | | text.php - Friendika -> Friendica (just to prepare for deprecate the friendik...Abinoam P. Marques Jr2012-02-201-1/+1
| | * | | Scrape.php - Friendika -> FriendicaAbinoam P. Marques Jr2012-02-201-1/+1
| | * | | friendica.svg - Friendika -> FriendicaAbinoam P. Marques Jr2012-02-201-2/+2
| |/ / /
| * | | Merge pull request #41 from fabrixxm/masterfabrixxm2012-02-202-6/+5
| |\ \ \
| | * | | use info() for successfull dfrn confirmation instead of notice()Fabio Comuni2012-02-201-1/+1