Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'pull' | friendica | 2012-02-13 | 11 | -5/+1554 |
|\ | |||||
| * | green variation of the quattro theme | Tobias Diekershoff | 2012-02-13 | 5 | -0/+1503 |
| | | |||||
| * | Merge pull request #34 from fabrixxm/master | fabrixxm | 2012-02-13 | 6 | -5/+51 |
| |\ | | | | | | | Allow reshare in display view | ||||
| | * | Fix 'item not found' message | Fabio Comuni | 2012-02-13 | 1 | -1/+1 |
| | | | |||||
| | * | Merge remote-tracking branch 'friendica/master' into mobile | Fabio Comuni | 2012-02-13 | 46 | -2785/+7678 |
| | |\ | | |/ | |/| | |||||
| | * | quattro: pause icon | Fabio Comuni | 2012-02-13 | 2 | -0/+12 |
| | | | |||||
| | * | reshare in "display" view | Fabio Comuni | 2012-02-13 | 2 | -3/+16 |
| | | | |||||
| | * | hidden jot in "display" to allow reshare | Fabio Comuni | 2012-02-10 | 3 | -3/+16 |
| | | | |||||
| | * | quattro: add "view in context" link in search results | Fabio Comuni | 2012-02-10 | 1 | -1/+9 |
| | | | |||||
* | | | hr bbcode tag | friendica | 2012-02-13 | 2 | -1/+2 |
| | | | |||||
* | | | POST should be lowercase these days | friendica | 2012-02-13 | 1 | -1/+1 |
|/ / | |||||
* | | finish translation of 'xxxxx wrote:' | friendica | 2012-02-12 | 1 | -2/+4 |
| | | |||||
* | | Merge pull request #33 from friendica/bbcode | friendica | 2012-02-12 | 1 | -13/+62 |
|\ \ | | | | | | | Improving BBCode support | ||||
| * \ | Merge branch 'master' into bbcode | Abinoam P. Marques Jr | 2012-02-12 | 6 | -2673/+2887 |
| |\ \ | |/ / |/| | | |||||
* | | | make 'x minutes ago' fully translateable with argument ordering. string update. | friendica | 2012-02-12 | 3 | -2670/+2879 |
| | | | |||||
* | | | bug #281 | friendica | 2012-02-12 | 3 | -3/+8 |
| | | | |||||
| * | | Added [th] bbcode tag support. | Abinoam P. Marques Jr | 2012-02-12 | 1 | -0/+1 |
| | | | |||||
| * | | Fixed bbcode [li] and [*] handling. | Abinoam P. Marques Jr | 2012-02-12 | 1 | -7/+2 |
| | | | |||||
| * | | Added [quote=Name] bbcode support. | Abinoam P. Marques Jr | 2012-02-12 | 1 | -1/+7 |
| | | | |||||
| * | | Added [center] bbcode support. | Abinoam P. Marques Jr | 2012-02-12 | 1 | -0/+3 |
| | | | |||||
| * | | BBCode [size=50] --> font-size: 50px (with the unit px). | Abinoam P. Marques Jr | 2012-02-12 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | This [size=number] without unit is kind of a standard. It was being rendered like "font-size: 50" and that's not valid CSS style. | ||||
| * | | Added support to [noparse], [nobb] and [pre] as bbcode escape tags. | Abinoam P. Marques Jr | 2012-02-12 | 1 | -0/+34 |
| | | | |||||
| * | | Added support for [ol] standard ordered list bbcode. | Abinoam P. Marques Jr | 2012-02-12 | 1 | -0/+2 |
| | | | |||||
| * | | Added support for [ul] standard unordered list bbcode. | Abinoam P. Marques Jr | 2012-02-12 | 1 | -1/+3 |
| | | | |||||
| * | | Regexp fix for [LIST=i], [list=i], [LIST=I] and [LIST=i] bbcodes | Abinoam P. Marques Jr | 2012-02-12 | 1 | -4/+8 |
|/ / | |||||
* | | Merge pull request #32 from copyninja/master | tobiasd | 2012-02-12 | 1 | -3/+7 |
|\ \ | | | | | | | Mapped ;) :D and :-O smileys | ||||
| * \ | 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 |
|/ / | |||||
* | | refresh contact record after setting change | friendica | 2012-02-11 | 1 | -0/+8 |
| | | |||||
* | | kissing smilie may need escaping (thanks - Abinoam) | friendica | 2012-02-11 | 1 | -1/+2 |
| | | |||||
* | | bug #279, add network selector widget to contacts page | friendica | 2012-02-11 | 1 | -1/+6 |
| | | |||||
* | | fix link/bookmark reshares | friendica | 2012-02-11 | 3 | -1/+17 |
| | | |||||
* | | bug #278 show only blocked contacts | friendica | 2012-02-11 | 2 | -6/+16 |
| | | |||||
* | | Merge branch 'pull' | friendica | 2012-02-11 | 5 | -5/+153 |
|\ \ | |||||
| * | | fpostit by Devlon Duthied added to utils | Tobias Diekershoff | 2012-02-11 | 4 | -0/+148 |
| | | | |||||
| * | | bug #270 - solved | Abinoam P. Marques Jr | 2012-02-10 | 1 | -5/+5 |
| | | | |||||
* | | | show tags (pub_keywords) in advanced profile | friendica | 2012-02-11 | 3 | -2/+21 |
|/ / | |||||
* | | db installation sync | friendica | 2012-02-10 | 4 | -3/+22 |
| | | |||||
* | | send notify emails to community pages as well as people | friendica | 2012-02-10 | 1 | -30/+32 |
| | | |||||
* | | bug #274 | friendica | 2012-02-09 | 1 | -17/+21 |
| | | |||||
* | | item tag notifications | friendica | 2012-02-09 | 3 | -23/+43 |
| | | |||||
* | | add render_location hook to both sets of conversations | friendica | 2012-02-09 | 1 | -11/+5 |
| | | |||||
* | | Merge branch 'pull' | friendica | 2012-02-09 | 1 | -1/+31 |
|\ \ | |||||
| * \ | Merge pull request #30 from Keith2/master | Keith Fernie | 2012-02-09 | 1 | -1/+31 |
| |\ \ | | | | | | | | | Adds a custom YourLS url shortener to slinky.php | ||||
| | * | | modified: library/slinky.php Set up tabs in code correctly. | Keith Fernie | 2012-02-09 | 1 | -16/+16 |
| | | | | |||||
| | * | | modified: library/slinky.php Added a custom YourLS shortener to the ↵ | Keith Fernie | 2012-02-09 | 1 | -1/+31 |
| | | | | | | | | | | | | | | | | available shorteners | ||||
* | | | | edit post not working after plaintext editor fixes, missing some recent ↵ | friendica | 2012-02-09 | 3 | -7/+16 |
| | | | | | | | | | | | | | | | | editor template changes | ||||
* | | | | bug #273 - no $baseurl variable expansion in install template | friendica | 2012-02-09 | 1 | -0/+1 |
|/ / / | |||||
* | | | render_location hook | friendica | 2012-02-09 | 1 | -8/+17 |
| | | |