aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #38 from fabrixxm/masterfabrixxm2012-02-171-5/+0
|\
| * oembed: revert changes from 48f5bd492dFabio Comuni2012-02-171-5/+0
|/
* a couple more items to make sure forum delegates can't access if the forum lo...friendica2012-02-162-1/+3
* do not under any circumstances allow a delegated forum admin to access the si...friendica2012-02-161-0/+7
* naked link with no protocol being passed from Diasporafriendica2012-02-162-18/+5
* a few fixes for offsite community membersfriendica2012-02-163-6/+35
* Merge branch 'pull'friendica2012-02-163-4553/+4528
|\
| * Merge pull request #37 from abinoam/oexAbinoam P. Marques Jr.2012-02-161-1/+1
| |\
| | * oexchange small fix [_POST -> _REQUEST]Abinoam P. Marques Jr2012-02-161-1/+1
| * | de stringsTobias Diekershoff2012-02-162-4552/+4527
* | | facepalm smileyfriendica2012-02-163-1/+3
|/ /
* / improvements in newmember pagefriendica2012-02-162-13/+17
|/
* another sql typofriendica2012-02-161-1/+1
* sql typo in auto-friend with D*friendica2012-02-152-2/+2
* Documentation on Friendica changes to B8 and notice of source availability in...friendica2012-02-151-0/+12
* quick commentsfriendica2012-02-1510-14/+109
* encode email headers on message deliveriesfriendica2012-02-153-9/+11
* Merge branch 'pull'friendica2012-02-1544-49/+7031
|\
| * Merge pull request #36 from fabrixxm/masterfabrixxm2012-02-1544-49/+7031
| |\
| | * enable ajax calendar with $a->config['experimentals']['new_calendar']=1Fabio Comuni2012-02-154-4/+35
| | * quattro: icons for attachmentsFabio Comuni2012-02-1529-3/+69
| | * events js: pass only first line of desc as title; item.desc and item.location...Fabio Comuni2012-02-141-6/+9
| | * events js: don't modify rendered item if not autor specifiedFabio Comuni2012-02-141-7/+8
| | * events: first test for full-javascript events calendarFabio Comuni2012-02-1413-44/+6925
* | | revupfriendica2012-02-151-1/+1
|/ /
* | starred/bookmark searches only returning conversation head without commentsfriendica2012-02-141-5/+1
* | preliminary qcomment support, [nosmile] tag to disable smiley processingfriendica2012-02-147-4/+45
* | localise links to private photos inside messagesfriendica2012-02-141-0/+22
* | refactor smilie code to allow for extensions and generation of a table of the...friendica2012-02-141-13/+58
* | Merge branch 'pull'friendica2012-02-141-2/+7
|\ \
| * \ Merge pull request #35 from copyninja/masterVasudev Kamath2012-02-141-2/+7
| |\ \
| | * | cry, foot in mouth, cool, undecided and embarassed smiley's are mappedVasudev Kamath2012-02-141-2/+7
| |/ /
* | | revupfriendica2012-02-141-1/+1
* | | delete mail message icon not brightening on hoverfriendica2012-02-141-1/+1
|/ /
* | more contacts categorisation, page cleanupfriendica2012-02-132-5/+21
* | proper tab selection when network or search is in effectfriendica2012-02-131-1/+1
* | tabs and total count for contacts pagefriendica2012-02-133-26/+63
* | updates to plugin docsfriendica2012-02-131-10/+30
* | more stray quotesfriendica2012-02-137-7/+7
* | make hr bbtag shareable, stray quote in duepuntozero wall_itemfriendica2012-02-133-2/+3
* | poll structuresfriendica2012-02-133-2/+58
* | Merge branch 'pull'friendica2012-02-1311-5/+1554
|\ \
| * | green variation of the quattro themeTobias Diekershoff2012-02-135-0/+1503
| * | Merge pull request #34 from fabrixxm/masterfabrixxm2012-02-136-5/+51
| |\|
| | * Fix 'item not found' messageFabio Comuni2012-02-131-1/+1
| | * Merge remote-tracking branch 'friendica/master' into mobileFabio Comuni2012-02-1346-2785/+7678
| | |\ | | |/ | |/|
| | * quattro: pause iconFabio Comuni2012-02-132-0/+12
| | * reshare in "display" viewFabio Comuni2012-02-132-3/+16
| | * hidden jot in "display" to allow reshareFabio Comuni2012-02-103-3/+16
| | * quattro: add "view in context" link in search resultsFabio Comuni2012-02-101-1/+9