aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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
| | * ping: return all introductions detail when there are more than oneFabio Comuni2012-02-201-5/+4
| |/
* | fix twitter title showing up occasionallyfriendica2012-02-202-5/+3
* | revupfriendica2012-02-201-1/+1
* | include item links in web notification messagesfriendica2012-02-191-7/+8
|/
* revupfriendica2012-02-191-1/+1
* Merge pull request #40 from simonlnu/newsmiliesAbinoam P. Marques Jr.2012-02-193-1/+3
|\
| * add :headdesk and fix doc/Pages.md to remove the absolute URL to /Simon L'nu2012-02-193-1/+3
* | Merge pull request #39 from abinoam/logfileAbinoam P. Marques Jr.2012-02-191-14/+27
|\ \ | |/ |/|
| * Fixed log file issues on a freshly installed Friendica.Abinoam P. Marques Jr2012-02-181-14/+27
|/
* change notify messages for webfriendica2012-02-181-3/+12
* new notifications - implement storagefriendica2012-02-185-6/+34
* deprecating two-char smiliesfriendica2012-02-171-10/+10
* support plaintext on editpost, editorinit called before all buttons laid outfriendica2012-02-177-8/+11
* Merge branch 'pull'friendica2012-02-171-5/+0
|\
| * Merge pull request #38 from fabrixxm/masterfabrixxm2012-02-171-5/+0
| |\
| | * oembed: revert changes from 48f5bd492dFabio Comuni2012-02-171-5/+0
| |/
* / revupfriendica2012-02-171-1/+1
|/
* 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