Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'upstream/master' | Michael | 2012-02-26 | 48 | -1659/+3227 |
|\ | |||||
| * | some revision to the German strings | Tobias Diekershoff | 2012-02-26 | 2 | -18/+20 |
| | | |||||
| * | German strings | Tobias Diekershoff | 2012-02-26 | 2 | -630/+895 |
| | | |||||
| * | show experimental and unsupported theme status on theme admin page | friendica | 2012-02-26 | 11 | -3/+14 |
| | | |||||
| * | jumping divs with no scrolling | friendica | 2012-02-26 | 1 | -1/+1 |
| | | |||||
| * | imrpove contrast on darkzero blockquotes | friendica | 2012-02-26 | 2 | -0/+8 |
| | | |||||
| * | darkzero-NS theme | friendica | 2012-02-26 | 7 | -1/+153 |
| | | |||||
| * | Merge pull request #48 from abinoam/thmail-5 | Simon | 2012-02-25 | 6 | -13/+101 |
| |\ | | | | | | | Comment Notifications by Email - Threading Them | ||||
| | * | 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 |
| | | | |||||
| | * | mod/item.php pass 'parent' to notification | Abinoam P. Marques Jr | 2012-02-25 | 1 | -1/+2 |
| | | | |||||
| | * | DB_UPDATE_VERSION incremented | Abinoam P. Marques Jr | 2012-02-25 | 1 | -1/+1 |
| | | | |||||
| | * | Added notify-threads to update.php | Abinoam P. Marques Jr | 2012-02-25 | 1 | -2/+15 |
| | | | |||||
| | * | Added notify-threads to database.sql. | Abinoam P. Marques Jr | 2012-02-25 | 1 | -0/+26 |
| | | | |||||
| * | | one more attempt | friendica | 2012-02-25 | 1 | -2/+2 |
| | | | |||||
| * | | missed a spot | friendica | 2012-02-25 | 1 | -1/+1 |
| | | | |||||
| * | | reverse order of links | friendica | 2012-02-25 | 1 | -1/+1 |
| | | | |||||
| * | | do not set notify popup empty anymore (though another solution is needed for ↵ | friendica | 2012-02-25 | 1 | -2/+2 |
| |/ | | | | | | | firehose mode) | ||||
| * | scale external images | friendica | 2012-02-25 | 4 | -37/+49 |
| | | |||||
| * | fixed link for toggling plugin from detail page | friendica | 2012-02-25 | 3 | -3/+3 |
| | | |||||
| * | notify positioning, theming | friendica | 2012-02-25 | 2 | -7/+5 |
| | | |||||
| * | sysnotify count in wrong location, and wrong number | friendica | 2012-02-25 | 2 | -3/+11 |
| | | |||||
| * | theme seen,unseen notifications | friendica | 2012-02-25 | 4 | -16/+20 |
| | | |||||
| * | photos in notifications | friendica | 2012-02-25 | 1 | -1/+1 |
| | | |||||
| * | theme info (like plugin info) | friendica | 2012-02-25 | 4 | -5/+76 |
| | | |||||
| * | notifications to zeros, bug in notify link | friendica | 2012-02-24 | 3 | -3/+88 |
| | | |||||
| * | string update for 2.38 | friendica | 2012-02-24 | 3 | -774/+1324 |
| | | |||||
| * | update author name across items if changed. | friendica | 2012-02-24 | 4 | -3/+24 |
| | | |||||
| * | waitman gobble fix for escaping code blocks in tinymce | friendica | 2012-02-24 | 1 | -8/+65 |
| | | |||||
| * | attribution issue - don't take author name from contact if available from item. | friendica | 2012-02-24 | 4 | -17/+27 |
| | | |||||
| * | more privacy docs | friendica | 2012-02-24 | 2 | -1/+18 |
| | | |||||
| * | theme shakeup commences - themes are now administered in admin panel. | friendica | 2012-02-23 | 9 | -13/+215 |
| | | |||||
| * | system notifications to notify module, untranslated string in notifications.tpl | friendica | 2012-02-23 | 3 | -5/+37 |
| | | |||||
| * | implement firehose notify in ping, strip links so notify popup displays ↵ | friendica | 2012-02-23 | 2 | -140/+115 |
| | | | | | | | | correctly in all themes | ||||
* | | "Vier-Theme" Some more design stuff. | Michael | 2012-02-26 | 4 | -336/+315 |
| | | |||||
* | | poller.php: Test for moving to archive, vier-style: notifications fixed | Michael | 2012-02-25 | 2 | -4/+33 |
| | | |||||
* | | "vier" popup menu looks nicer now (more like quattro again) | Michael | 2012-02-25 | 1 | -6/+14 |
| | | |||||
* | | "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 |