Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into notify | friendica | 2012-02-22 | 8 | -190/+470 |
|\ | |||||
| * | nested quote check fails to account for strpos returning position 0 | friendica | 2012-02-22 | 1 | -2/+2 |
| | | |||||
| * | restore poller normal operation | friendica | 2012-02-22 | 1 | -2/+2 |
| | | |||||
| * | Merge pull request #45 from annando/master | friendica | 2012-02-22 | 5 | -182/+381 |
| |\ | | | | | | | New HTML to BBCode converter, changes to BBCode, nginx support, ... | ||||
| | * | German translation more gender friendly. Some more logging in poller.php | Michael | 2012-02-22 | 1 | -5/+20 |
| | | | |||||
| | * | Some testing stuff | Michael | 2012-02-20 | 2 | -1/+2 |
| | | | |||||
| | * | API is now working on my nginx server. | Michael | 2012-02-20 | 2 | -11/+19 |
| | | | |||||
| | * | New version of markdown. Playing with stylesheet. Testing line breaks. | root | 2012-02-19 | 1 | -7/+6 |
| | | | |||||
| | * | Handling nested bbcodes. Some small design changes in html2bbcode. Change in ↵ | Michael | 2012-02-19 | 3 | -23/+35 |
| | | | | | | | | | | | | poller.php is just for testing purposes. | ||||
| | * | Brand new html2bbcode. Some other changes in diaspora to bbcode handling | Michael | 2012-02-19 | 3 | -158/+322 |
| | | | |||||
| * | | allow forum posts by followers on Diaspora | friendica | 2012-02-22 | 1 | -7/+19 |
| | | | |||||
| * | | never enough documentation | friendica | 2012-02-22 | 1 | -0/+9 |
| | | | |||||
| * | | waitman gobble media upload via api patch | friendica | 2012-02-21 | 1 | -1/+43 |
| | | | |||||
| * | | escape smiley conversion in code and pre blocks | friendica | 2012-02-21 | 1 | -0/+17 |
| | | | |||||
| * | | mark all notifications read | friendica | 2012-02-21 | 1 | -2/+3 |
| | | | |||||
* | | | add full email link to notification | friendica | 2012-02-21 | 1 | -3/+3 |
|/ / | |||||
* | | template: add support for variable filters | Fabio Comuni | 2012-02-21 | 1 | -2/+26 |
| | | |||||
* | | fill in notify msg with redirect link after we get the id | friendica | 2012-02-21 | 1 | -9/+16 |
| | | |||||
* | | more cleanup of community followup detection. Remote worked well but local ↵ | friendica | 2012-02-20 | 1 | -4/+13 |
| | | | | | | | | didn't. | ||||
* | | email notify now redirected through mod_notify, weirdness in local deliver ↵ | friendica | 2012-02-20 | 2 | -5/+35 |
| | | | | | | | | caused by community page changes | ||||
* | | Merge branch 'pull' | friendica | 2012-02-20 | 6 | -8/+8 |
|\ \ | |||||
| * | | include/nav.php - Friendika -> Friendica | Abinoam P. Marques Jr | 2012-02-20 | 1 | -1/+1 |
| | | | |||||
| * | | include/api.php - Friendika -> Friendica | Abinoam P. Marques Jr | 2012-02-20 | 1 | -3/+3 |
| | | | |||||
| * | | poller.php - Friendika -> Friendica | Abinoam P. Marques Jr | 2012-02-20 | 1 | -1/+1 |
| | | | |||||
| * | | acl_selectors.php - Friendika -> Friendica | Abinoam P. Marques Jr | 2012-02-20 | 1 | -1/+1 |
| | | | |||||
| * | | text.php - Friendika -> Friendica (just to prepare for deprecate the ↵ | Abinoam P. Marques Jr | 2012-02-20 | 1 | -1/+1 |
| | | | | | | | | | | | | friendika.png at the future) | ||||
| * | | Scrape.php - Friendika -> Friendica | Abinoam P. Marques Jr | 2012-02-20 | 1 | -1/+1 |
| |/ | |||||
* | | fix twitter title showing up occasionally | friendica | 2012-02-20 | 2 | -5/+3 |
| | | |||||
* | | include item links in web notification messages | friendica | 2012-02-19 | 1 | -7/+8 |
|/ | |||||
* | add :headdesk and fix doc/Pages.md to remove the absolute URL to / | Simon L'nu | 2012-02-19 | 1 | -0/+2 |
| | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | change notify messages for web | friendica | 2012-02-18 | 1 | -3/+12 |
| | |||||
* | new notifications - implement storage | friendica | 2012-02-18 | 3 | -6/+31 |
| | |||||
* | deprecating two-char smilies | friendica | 2012-02-17 | 1 | -10/+10 |
| | |||||
* | oembed: revert changes from 48f5bd492d | Fabio Comuni | 2012-02-17 | 1 | -5/+0 |
| | |||||
* | naked link with no protocol being passed from Diaspora | friendica | 2012-02-16 | 1 | -0/+5 |
| | |||||
* | a few fixes for offsite community members | friendica | 2012-02-16 | 3 | -6/+35 |
| | |||||
* | facepalm smiley | friendica | 2012-02-16 | 1 | -0/+2 |
| | |||||
* | another sql typo | friendica | 2012-02-16 | 1 | -1/+1 |
| | |||||
* | sql typo in auto-friend with D* | friendica | 2012-02-15 | 2 | -2/+2 |
| | |||||
* | quick comments | friendica | 2012-02-15 | 1 | -2/+3 |
| | |||||
* | encode email headers on message deliveries | friendica | 2012-02-15 | 2 | -7/+8 |
| | |||||
* | Merge pull request #36 from fabrixxm/master | fabrixxm | 2012-02-15 | 1 | -2/+2 |
|\ | | | | | Missing icons in 'quattro' and ajax events calendar | ||||
| * | quattro: icons for attachments | Fabio Comuni | 2012-02-15 | 1 | -2/+2 |
| | | |||||
* | | preliminary qcomment support, [nosmile] tag to disable smiley processing | friendica | 2012-02-14 | 4 | -4/+13 |
| | | |||||
* | | localise links to private photos inside messages | friendica | 2012-02-14 | 1 | -0/+22 |
| | | |||||
* | | refactor smilie code to allow for extensions and generation of a table of ↵ | friendica | 2012-02-14 | 1 | -13/+58 |
| | | | | | | | | the entire list | ||||
* | | cry, foot in mouth, cool, undecided and embarassed smiley's are mapped | Vasudev Kamath | 2012-02-14 | 1 | -2/+7 |
| | | |||||
* | | make hr bbtag shareable, stray quote in duepuntozero wall_item | friendica | 2012-02-13 | 1 | -1/+0 |
| | | |||||
* | | Merge branch 'pull' | friendica | 2012-02-13 | 1 | -3/+9 |
|\| | |||||
| * | Merge remote-tracking branch 'friendica/master' into mobile | Fabio Comuni | 2012-02-13 | 9 | -85/+201 |
| |\ |