Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | add tag notifications to enotify | friendica | 2012-02-09 | 2 | -9/+28 |
|/ | |||||
* | Merge branch 'pull' | friendica | 2012-02-08 | 1 | -0/+5 |
|\ | |||||
| * | Install note about PHP path. | Abinoam P. Marques Jr | 2012-02-08 | 1 | -0/+5 |
| | | |||||
* | | if removing a contact after viewing the third page of contacts, go back to ↵ | friendica | 2012-02-08 | 1 | -2/+5 |
|/ | | | | page 3 | ||||
* | fix apps sub-menu on quattro and vier | friendica | 2012-02-08 | 2 | -1/+1 |
| | |||||
* | Merge branch 'pull' | friendica | 2012-02-08 | 13 | -1/+4297 |
|\ | |||||
| * | quattro: added delete button to mail list overview | Tobias Diekershoff | 2012-02-08 | 2 | -34/+13 |
| | | |||||
| * | quattro: added delete buttons to groups and contacts | Tobias Diekershoff | 2012-02-08 | 2 | -0/+44 |
| | | |||||
| * | quattro: group member selection styling | Tobias Diekershoff | 2012-02-08 | 2 | -0/+69 |
| | | |||||
| * | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-02-08 | 1 | -3/+1 |
| |\ | |||||
| * | | added theme "vier" by Michael Vogel | Tobias Diekershoff | 2012-02-08 | 11 | -0/+4204 |
| | | | |||||
* | | | begin cmin, cmax | friendica | 2012-02-08 | 2 | -2/+8 |
| |/ |/| | |||||
* | | browser being sent to update_community | friendica | 2012-02-08 | 1 | -3/+1 |
|/ | |||||
* | make individual advanced profile items addressable via script or plugin | friendica | 2012-02-07 | 1 | -19/+19 |
| | |||||
* | :coffee extended smilie | friendica | 2012-02-07 | 2 | -1/+2 |
| | |||||
* | beer smilie | friendica | 2012-02-07 | 2 | -4/+4 |
| | |||||
* | don't link tags enclosed inside Diaspora links | friendica | 2012-02-07 | 1 | -0/+26 |
| | |||||
* | more fixes for textmode | friendica | 2012-02-07 | 4 | -24/+126 |
| | |||||
* | basic support for plaintext editor configuration (disable tinymce), ↵ | friendica | 2012-02-06 | 2 | -95/+121 |
| | | | | currently only zero themes - and not all the post tools currently work (as some of them emit html). | ||||
* | add toggle to choose sending "friends with" activity even if contact is not ↵ | friendica | 2012-02-06 | 4 | -47/+54 |
| | | | | hidden | ||||
* | beer | friendica | 2012-02-06 | 2 | -0/+4 |
| | |||||
* | style missing on crepair-name | friendica | 2012-02-05 | 1 | -0/+2 |
| | |||||
* | Merge branch 'master' into spam | friendica | 2012-02-05 | 2 | -4/+5 |
|\ | |||||
| * | roll update 1118 forward, enable update 1119 | friendica | 2012-02-05 | 2 | -4/+5 |
| | | |||||
* | | Merge branch 'master' into spam | friendica | 2012-02-04 | 2 | -3/+3 |
|\| |