aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'mike/master'olivierm2011-02-2451-290/+175
|\
| * don't truncate names across multi-byte char sequencesFriendika2011-02-241-2/+2
| |
| * yet another templateFriendika2011-02-249-21/+6
| |
| * generalise wallwall template and fix "via wall-to-wall" floatFriendika2011-02-2412-135/+37
| |
| * another template downFriendika2011-02-235-19/+2
| |
| * more consistency to pluginsFriendika2011-02-234-2/+13
| |
| * another template made language neutralFriendika2011-02-237-6/+11
| |
| * added hook but forgot to registerFriendika2011-02-231-0/+3
| |
| * cleanup plugin and post settingsFriendika2011-02-237-30/+61
| |
| * provide privacy policy url as mandated for Facebook apps (how bloody ironic)Friendika2011-02-231-3/+10
| |
| * move php path setting inside proc_runFriendika2011-02-2316-67/+25
| |
| * move directory registration block before redirectFriendika2011-02-231-7/+7
| |
* | Changed greetings in frencholivierm2011-02-231-1/+1
| |
* | More french templates.olivierm2011-02-235-28/+29
| |
* | Merge commit 'mike/master'olivierm2011-02-234-4/+22
|\|
| * minor proc_run issues encountered during mass directory update.Friendika2011-02-231-3/+3
| | | | | | | | Unclear if it affects "normal" operation but suspect it does.
| * push directory on register - if permittedFriendika2011-02-233-1/+19
| |
* | Merge commit 'mike/master'olivierm2011-02-2312-45/+143
|\|
| * add some calendaring functionsFriendika2011-02-223-0/+125
| |
| * pulled strings from one more templateFriendika2011-02-229-45/+18
| |
* | A little more french translation.olivierm2011-02-225-20/+20
|/
* clear float after title for items having titleFriendika2011-02-216-0/+9
|
* resolve file inclusion conflicts w/ multiple plugins, improve the typo checkerFriendika2011-02-2117-1845/+60
|
* remove note about accounts being hidden in register emailFriendika2011-02-214-16/+1
|
* default publish to directory, but offer registration privacy setting.Friendika2011-02-216-34/+130
| | | | | generalise publish option template - so once translated we can merge them all. Update strings.
* Merge branch 'themetests' of https://github.com/fabrixxm/friendika into ↵Friendika2011-02-219-123/+209
|\ | | | | | | fabrixxm-themetests
| * Updates to theme dupuntozeroFabio Comuni2011-02-177-115/+171
| |
| * Merge branch 'master' into themetestsFabio Comuni2011-02-1730-197/+318
| |\
| | * Merge branch 'friendika-master'fabrixxm2011-02-1730-197/+318
| | |\
| | * \ Merge branch 'master' of github.com:fabrixxm/friendikafabrixxm2011-02-171-15/+24
| | |\ \
| | * \ \ Merge branch 'friendika-master'fabrixxm2011-02-162-2/+2
| | |\ \ \
| | * \ \ \ Merge branch 'master' of github.com:fabrixxm/friendikafabrixxm2011-02-1631-166/+430
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'friendika-master'fabrixxm2011-02-1250-772/+3830
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'friendika-master'fabrixxm2011-02-0832-227/+397
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'friendika-master'fabrixxm2011-02-0614-57/+146
| | |\ \ \ \ \ \ \
| * | | | | | | | | duepuntozero: show desc on image in albumsFabio Comuni2011-02-163-9/+39
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | convert html entities on conversational emailsFriendika2011-02-211-2/+2
| | | | | | | | |
* | | | | | | | | localise tictacFriendika2011-02-201-19/+17
| | | | | | | | |
* | | | | | | | | more punctuation characters added to linkify patternsFriendika2011-02-202-2/+2
| | | | | | | | |
* | | | | | | | | facebook plugin: convert html entitiesFriendika2011-02-201-0/+1
| | | | | | | | |
* | | | | | | | | support lrdd priorityFriendika2011-02-201-28/+131
| | | | | | | | |
* | | | | | | | | add calculator addon appFriendika2011-02-201-0/+356
| | | | | | | | |
* | | | | | | | | link to Facebook enable from plugin settings pageFriendika2011-02-201-2/+11
| | | | | | | | |
* | | | | | | | | Merge branch 'chriscase-master'Friendika2011-02-202-34/+72
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mod/dfrn_notify.php
| * | | | | | | | | updated private message code to use the new EmailNotification libraryChris Case2011-02-191-37/+11
| | | | | | | | | |
| * | | | | | | | | added reusable EmailNotification library to facilitate more efficient ↵Chris Case2011-02-191-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maintenance of email related code
* | | | | | | | | | apps menu fileFriendika2011-02-191-0/+14
| | | | | | | | | |
* | | | | | | | | | app menu - and a demo application 'tictac'Friendika2011-02-194-3/+677
| | | | | | | | | |
* | | | | | | | | | Merge branch 'chriscase-master'Friendika2011-02-175-72/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mod/dfrn_notify.php
| * | | | | | | | | removed localized multipart email templates, now the multipart settings are ↵Chris Case2011-02-175-68/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configured directly in the code