Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'upstream/master' | Michael Vogel | 2012-03-28 | 1 | -26/+28 |
|\ | |||||
| * | filer: info() on item filed | Fabio Comuni | 2012-03-28 | 1 | -0/+1 |
| | | |||||
| * | ability to change tags in edited posts | friendica | 2012-03-22 | 1 | -0/+13 |
| | | |||||
| * | support lowercase :-p smilie | friendica | 2012-03-21 | 1 | -0/+2 |
| | | |||||
| * | modified: include/text.php | Thomas | 2012-03-19 | 1 | -3/+2 |
| | | | | | | | | Stupid bug fixed | ||||
| * | modified: include/text.php | Thomas | 2012-03-19 | 1 | -21/+0 |
| | | | | | | | | | | | | | | | | | | | | deleted: images/diaspora.png deleted: images/smiley-bangheaddesk.gif deleted: images/smiley-beard.png deleted: images/smiley-shaka.gif deleted: images/smiley-whitebeard.png Removed selected smiley per Mike's request. Also removed deprecated smileys that were just commented out. | ||||
| * | some openid fixes, use identity url from openid server and normalise it. | friendica | 2012-03-19 | 1 | -0/+3 |
| | | |||||
| * | support "no_smilies" | friendica | 2012-03-19 | 1 | -0/+5 |
| | | |||||
| * | bug #337, call template_unescape() only at the end of template processing | friendica | 2012-03-17 | 1 | -1/+1 |
| | | |||||
| * | bug #335 network search broken after new ssl policy settings | friendica | 2012-03-16 | 1 | -1/+1 |
| | | |||||
* | | Quotes with author are now having an "open/close" link | Michael Vogel | 2012-03-17 | 1 | -2/+13 |
| | | |||||
* | | New bbcode element: "spoiler". Mail: Top post quotes are now embraced in ↵ | Michael Vogel | 2012-03-17 | 1 | -0/+19 |
|/ | | | | "spoiler" elements | ||||
* | Merge commit 'upstream/master' | Michael Vogel | 2012-03-15 | 1 | -0/+101 |
|\ | |||||
| * | more work on filer, comment level and file tag removal | friendica | 2012-03-13 | 1 | -4/+5 |
| | | |||||
| * | file as widget and basic filing implementation for duepuntozero,slackr | friendica | 2012-03-13 | 1 | -1/+1 |
| | | | | | | | | much more work needed - this is just for test/evaluation currently | ||||
| * | initial tag display for categories and save-to-file - suitable for testing ↵ | friendica | 2012-03-13 | 1 | -0/+27 |
| | | | | | | | | but needs cleanup, links to delete term, and theming. | ||||
| * | more save to file backend | friendica | 2012-03-11 | 1 | -1/+55 |
| | | |||||
| * | backend for "save to file" feature | friendica | 2012-03-11 | 1 | -0/+19 |
| | | |||||
* | | Cache: item cache now has an autodelete of old files. The pages plugin now ↵ | Michael Vogel | 2012-03-11 | 1 | -1/+1 |
| | | | | | | | | sets a link via redirection. So posting works. | ||||
* | | Caching improved. | Michael Vogel | 2012-03-10 | 1 | -13/+11 |
| | | |||||
* | | Enabled Caching for items. Changed color of tags in diabook. | Michael Vogel | 2012-03-10 | 1 | -1/+16 |
|/ | |||||
* | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-06 | 1 | -2/+2 |
| | | | | | | | * remotes/upstream/master: fix html reshares when editplain in use * master: | ||||
* | Fixed...merged with mainline THEN added beards. | Thomas | 2012-03-06 | 1 | -5/+36 |
| | |||||
* | added beard smileys | Thomas | 2012-03-06 | 1 | -35/+8 |
| | |||||
* | remove "smilie" expansion for Diaspora logo | friendica | 2012-03-06 | 1 | -2/+2 |
| | |||||
* | template proc: first optimization | Fabio Comuni | 2012-03-02 | 1 | -1/+7 |
| | |||||
* | expand multiple heart smilies e.g. <3333 | friendica | 2012-03-02 | 1 | -0/+12 |
| | |||||
* | yet more work on notifications | friendica | 2012-02-29 | 1 | -0/+13 |
| | |||||
* | Bugfix | Tobias Hößl | 2012-02-26 | 1 | -1/+1 |
| | |||||
* | never enough documentation | friendica | 2012-02-22 | 1 | -0/+9 |
| | |||||
* | escape smiley conversion in code and pre blocks | friendica | 2012-02-21 | 1 | -0/+17 |
| | |||||
* | Merge branch 'pull' | friendica | 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) | ||||
* | | fix twitter title showing up occasionally | friendica | 2012-02-20 | 1 | -3/+1 |
|/ | |||||
* | 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> | ||||
* | deprecating two-char smilies | friendica | 2012-02-17 | 1 | -10/+10 |
| | |||||
* | facepalm smiley | friendica | 2012-02-16 | 1 | -0/+2 |
| | |||||
* | 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 | 1 | -1/+4 |
| | | |||||
* | | 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 |
|/ | |||||
* | bug #281 | friendica | 2012-02-12 | 1 | -2/+4 |
| | |||||
* | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-02-12 | 1 | -1/+3 |
|\ | |||||
| * | do not display contact_block if config for num shown is 0 | friendica | 2012-02-11 | 1 | -1/+3 |
| | | |||||
* | | ;) :D and :-O are also enabled for wink laugh and surprised smiley's | Vasudev Kamath | 2012-02-12 | 1 | -3/+7 |
|/ | |||||
* | kissing smilie may need escaping (thanks - Abinoam) | friendica | 2012-02-11 | 1 | -1/+2 |
| | |||||
* | :coffee extended smilie | friendica | 2012-02-07 | 1 | -1/+2 |
| | |||||
* | beer smilie | friendica | 2012-02-07 | 1 | -3/+3 |
| | |||||
* | beer | friendica | 2012-02-06 | 1 | -0/+4 |
| |