Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | "vier": The contacts are now working again. Line break before closing ↵ | Michael | 2012-02-25 | 5 | -22/+289 |
| | | | | bbcodes removed. | ||||
* | Bug fixed where mails where nearly empty. HTML mails can now be received. | Michael | 2012-02-25 | 1 | -62/+78 |
| | |||||
* | multipart messages complete, message-id conversion done. | Michael | 2012-02-25 | 4 | -20/+29 |
| | |||||
* | Sending mail as multipart/alternative (html and plain text) (very basic by now) | Michael | 2012-02-24 | 3 | -27/+51 |
| | |||||
* | Encoding for incoming mails. Fixed invalid message id (with side effect at ↵ | Michael | 2012-02-24 | 7 | -23/+411 |
| | | | | the moment). Sending mail as text mail. Encoding name when importing mail contact. | ||||
* | GIT problems ... | Michael | 2012-02-23 | 1 | -8/+1 |
| | |||||
* | Merge remote branch 'upstream/master' | Michael | 2012-02-23 | 67 | -286/+871 |
|\ | | | | | | | | | Conflicts: include/bbcode.php | ||||
| * | Merge pull request #47 from fabrixxm/master | Simon | 2012-02-23 | 2 | -4/+5 |
| |\ | | | | | | | quattro: fix typos | ||||
| | * | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-02-23 | 1 | -21/+0 |
| | |\ | | |/ | |/| | |||||
| * | | quattro-green: removed contact_template.tpl | Tobias Diekershoff | 2012-02-23 | 1 | -21/+0 |
| | | | |||||
| | * | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-02-23 | 3 | -23/+43 |
| | |\ | | |/ | |/| | |||||
| * | | green-quattro: applied a color for shiny class and preview | Tobias Diekershoff | 2012-02-23 | 2 | -22/+42 |
| | | | |||||
| * | | Merge pull request #46 from fabrixxm/master | fabrixxm | 2012-02-23 | 15 | -134/+273 |
| |\ \ | | | | | | | | | more work on quattro theme and less html in php | ||||
| * | | | fix img tag with size attribute | Tobias Diekershoff | 2012-02-23 | 1 | -1/+1 |
| | | | | |||||
| | | * | quattro: fix typos | Fabio Comuni | 2012-02-23 | 2 | -4/+5 |
| | |/ | |||||
| | * | quattro post preview, style contacts pages, style for "shiny" class, fix ↵ | Fabio Comuni | 2012-02-23 | 15 | -134/+273 |
| |/ | | | | | | | | | | | | | contacts list in profile aside. remove html from viewcontacts.php and contacts.php use contact_template.tpl to print contacts also in viewcontacts | ||||
| * | Merge branch 'master' into notify | friendica | 2012-02-23 | 5 | -5/+155 |
| |\ | |||||
| | * | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-02-23 | 2 | -5/+2 |
| | |\ | |||||
| | | * | README file shortened because this was for my branch only. | Michael Vogel | 2012-02-23 | 1 | -3/+0 |
| | | | | |||||
| | | * | Removed the export of markdown articles. That was for testing purposes only. | Michael Vogel | 2012-02-23 | 1 | -2/+2 |
| | | | | |||||
| | * | | quattro: added styling to pivate message view | Tobias Diekershoff | 2012-02-23 | 3 | -0/+153 |
| | |/ | |||||
| * | | more theme notify fixes | friendica | 2012-02-23 | 2 | -1/+2 |
| | | | |||||
| * | | new notify sort of working in testbubble | friendica | 2012-02-22 | 6 | -3/+52 |
| | | | |||||
| * | | Merge branch 'master' into notify | friendica | 2012-02-22 | 23 | -704/+1377 |
| |\| | |||||
| | * | 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 | 16 | -689/+1257 |
| | |\ | | | | | | | | | New HTML to BBCode converter, changes to BBCode, nginx support, ... | ||||
| | * \ | Merge branch 'pull' | friendica | 2012-02-22 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * \ | Merge pull request #44 from simonlnu/master | friendica | 2012-02-22 | 1 | -1/+1 |
| | | |\ \ | | | | | | | | | | | | | minor doc fix. there will be more ;) | ||||
| | | | * | | clean up Groups help file. there was a stray 'Freindika' in it | Simon L'nu | 2012-02-22 | 1 | -1/+1 |
| | | |/ / | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | | | allow forum posts by followers on Diaspora | friendica | 2012-02-22 | 2 | -8/+20 |
| | | | | | |||||
| | * | | | never enough documentation | friendica | 2012-02-22 | 1 | -0/+9 |
| | |/ / | |||||
| | * | | waitman gobble media upload via api patch | friendica | 2012-02-21 | 2 | -5/+61 |
| | | | | |||||
| | * | | escape smiley conversion in code and pre blocks | friendica | 2012-02-21 | 1 | -0/+17 |
| | | | | |||||
| | * | | mark all notifications read | friendica | 2012-02-21 | 3 | -3/+14 |
| | | | | |||||
| * | | | some cleanup of tb notifications | friendica | 2012-02-21 | 2 | -1/+6 |
| | | | | |||||
| * | | | new notifications | friendica | 2012-02-21 | 1 | -0/+25 |
| | | | | |||||
| * | | | add full email link to notification | friendica | 2012-02-21 | 1 | -3/+3 |
| |/ / | |||||
| * | | Merge branch 'pull' | friendica | 2012-02-21 | 1 | -2/+26 |
| |\ \ | |||||
| | * \ | Merge pull request #43 from fabrixxm/master | fabrixxm | 2012-02-21 | 1 | -2/+26 |
| | |\ \ | | | | | | | | | | | Add support for variable filters in template | ||||
| | | * | | template: add support for variable filters | Fabio Comuni | 2012-02-21 | 1 | -2/+26 |
| | |/ / | |||||
| * / / | logger_debug was used as string instead of constant | friendica | 2012-02-21 | 2 | -6/+6 |
| |/ / | |||||
| * | | 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 | 6 | -7/+72 |
| | | | | | | | | | | | | caused by community page changes | ||||
| * | | Merge branch 'pull' | friendica | 2012-02-20 | 27 | -51/+50 |
| |\ \ | |||||
| | * \ | Merge pull request #42 from friendica/ka2ca-rebased | friendica | 2012-02-20 | 25 | -45/+45 |
| | |\ \ | | | | | | | | | | | Replaced some ocurrences of Friendika --> Friendica | ||||
| | | * | | view/admin_remoteupdate.tpl - Friendika -> Friendica | Abinoam P. Marques Jr | 2012-02-20 | 1 | -2/+2 |
| | | | | | |||||
| | | * | | util/README - Friendika -> Friendica | Abinoam P. Marques Jr | 2012-02-20 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | htconfig.tpl - Friendika -> Friendica | Abinoam P. Marques Jr | 2012-02-20 | 8 | -15/+15 |
| | | | | |