aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'pull'friendica2012-02-2027-51/+50
|\
| * Merge pull request #42 from friendica/ka2ca-rebasedfriendica2012-02-2025-45/+45
| |\ | | | | | | Replaced some ocurrences of Friendika --> Friendica
| | * 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 ↵Abinoam P. Marques Jr2012-02-201-1/+1
| | | | | | | | | | | | friendika.png at the future)
| | * 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
| |\ | | | | | | fix connection request in mod/ping
| | * 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 /
| * add :headdesk and fix doc/Pages.md to remove the absolute URL to /Simon L'nu2012-02-193-1/+3
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | Merge pull request #39 from abinoam/logfileAbinoam P. Marques Jr.2012-02-191-14/+27
|\ \ | |/ |/| Logfile
| * Fixed log file issues on a freshly installed Friendica.Abinoam P. Marques Jr2012-02-181-14/+27
|/ | | | | | * Check to see if log file exists. * After trying to open it, check to see if it went ok. * So, check to see if the file size != 0 (fread error with size = 0)
* 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
| |\ | | | | | | Revert changes to oembed
| | * 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 ↵friendica2012-02-162-1/+3
| | | | login is shared with the site admin account
* do not under any circumstances allow a delegated forum admin to access the ↵friendica2012-02-161-0/+7
| | | | site admin page.
* 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
| | * 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 ↵friendica2012-02-151-0/+12
| | | | in accordance with LGPL