Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | yet more work on notifications | friendica | 2012-02-29 | 3 | -29/+54 |
| | |||||
* | notification enhancements | friendica | 2012-02-29 | 1 | -3/+30 |
| | |||||
* | call time pass by reference deprecated | friendica | 2012-02-28 | 1 | -1/+1 |
| | |||||
* | From Tobias H - catch some irregularities caused by cut/paste code | friendica | 2012-02-28 | 1 | -1/+1 |
| | |||||
* | Merge branch 'pull' | friendica | 2012-02-27 | 1 | -3/+5 |
|\ | |||||
| * | revert 01a2791e3a to avoid random preg internal errors. fix contact_template | Fabio Comuni | 2012-02-27 | 1 | -3/+5 |
| | | |||||
* | | cleanup notify subject lines | friendica | 2012-02-27 | 1 | -8/+17 |
|/ | |||||
* | add plugin hooks to enotify | friendica | 2012-02-26 | 1 | -42/+80 |
| | |||||
* | tagging missing from wallwall and a couple of themes, star missing from dispy | friendica | 2012-02-26 | 1 | -2/+12 |
| | |||||
* | Merge pull request #50 from annando/master | friendica | 2012-02-26 | 9 | -99/+573 |
|\ | | | | | massive changes in mail and design updates in "vier" | ||||
| * | Mail: New options for actions after importing mails. | Michael | 2012-02-26 | 1 | -10/+36 |
| | | |||||
| * | Merge remote branch 'upstream/master' | Michael | 2012-02-26 | 8 | -64/+222 |
| |\ | |||||
| * | | poller.php: Test for moving to archive, vier-style: notifications fixed | Michael | 2012-02-25 | 1 | -1/+11 |
| | | | |||||
| * | | "vier": The contacts are now working again. Line break before closing ↵ | Michael | 2012-02-25 | 1 | -2/+2 |
| | | | | | | | | | | | | 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 | 13 | -46/+205 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: include/bbcode.php | ||||
| * | | | bbcode.php: A list or quote at the beginning wasn't detected | Michael | 2012-02-23 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge pull request #49 from CatoTH/master | friendica | 2012-02-26 | 6 | -16/+17 |
|\ \ \ \ | | | | | | | | | | | Bugfix for del_config | ||||
| * | | | | Avoid some notices | Tobias Hößl | 2012-02-26 | 3 | -11/+12 |
| | | | | | |||||
| * | | | | Bugfix | Tobias Hößl | 2012-02-26 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | 1 Bugfix (missing $ character) and avoid some notices | Tobias Hößl | 2012-02-26 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Wrong variable name | root | 2012-02-26 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | relative link redirects | friendica | 2012-02-26 | 2 | -12/+24 |
| |_|_|/ |/| | | | |||||
* | | | | show experimental and unsupported theme status on theme admin page | friendica | 2012-02-26 | 1 | -1/+8 |
|/ / / | |||||
* | | | Comment notifications by e-mail now are threaded | Abinoam P. Marques Jr | 2012-02-25 | 1 | -6/+50 |
| | | | |||||
* | | | include/items.php pass 'parent' to notification | Abinoam P. Marques Jr | 2012-02-25 | 1 | -3/+7 |
| | | | |||||
* | | | scale external images | friendica | 2012-02-25 | 3 | -37/+47 |
| | | | |||||
* | | | theme info (like plugin info) | friendica | 2012-02-25 | 1 | -2/+66 |
| | | | |||||
* | | | string update for 2.38 | friendica | 2012-02-24 | 1 | -0/+3 |
| | | | |||||
* | | | update author name across items if changed. | friendica | 2012-02-24 | 1 | -1/+17 |
| | | | |||||
* | | | attribution issue - don't take author name from contact if available from item. | friendica | 2012-02-24 | 3 | -14/+24 |
| |/ |/| | |||||
* | | fix img tag with size attribute | Tobias Diekershoff | 2012-02-23 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into notify | friendica | 2012-02-23 | 1 | -2/+2 |
|\ \ | |||||
| * | | Removed the export of markdown articles. That was for testing purposes only. | Michael Vogel | 2012-02-23 | 1 | -2/+2 |
| | | | |||||
* | | | more theme notify fixes | friendica | 2012-02-23 | 1 | -1/+1 |
| | | | |||||
* | | | new notify sort of working in testbubble | friendica | 2012-02-22 | 2 | -2/+3 |
| | | | |||||
* | | | 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 |
| | | |