Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'upstream/master' | Michael | 2012-04-11 | 96 | -457/+1097 |
|\ | |||||
| * | major refactor. step 1 | Simon L'nu | 2012-04-11 | 4 | -71/+108 |
| * | visit "random profile" feature | friendica | 2012-04-10 | 1 | -0/+1 |
| * | make editplain work everywhere | friendica | 2012-04-10 | 3 | -4/+3 |
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-10 | 33 | -275/+350 |
| |\ | |||||
| | * | Incorrect tranlation (one negation too much) | Tobias Hößl | 2012-04-10 | 2 | -2/+2 |
| | * | diabook-themes: smal fix in bbcode-js | tommy tomson | 2012-04-10 | 4 | -1/+25 |
| | * | diabook-themes: added url and quote to bbcode toolbar under comment box | tommy tomson | 2012-04-10 | 16 | -4/+45 |
| | * | aaah, nice asides ;). we'll be updating these soon | Simon L'nu | 2012-04-10 | 11 | -268/+278 |
| * | | Merge branch 'libravatar' of https://github.com/dawnbreak/friendica into pull | friendica | 2012-04-10 | 1 | -1/+0 |
| |\ \ | | |/ | |/| | |||||
| | * | Remove Gravatar from core and add new hook avatar_lookup. | Klaus Weidenbach | 2012-04-09 | 1 | -1/+0 |
| * | | Merge pull request #218 from campino/master | friendica | 2012-04-09 | 3 | -1/+25 |
| |\ \ | |||||
| | * \ | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-09 | 8 | -0/+0 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-09 | 23 | -109/+243 |
| | |\ \ \ | |||||
| | * | | | | fixed some typos | Alexander Kampmann | 2012-04-09 | 1 | -1/+1 |
| | * | | | | added exceptions to dba class | Alexander Kampmann | 2012-04-09 | 3 | -0/+24 |
| * | | | | | bbcode toolbar attached to the comment text field | tommy tomson | 2012-04-10 | 40 | -26/+383 |
| | |_|_|/ | |/| | | | |||||
| * | | | | diabook-themes: small icon fix | tommy tomson | 2012-04-09 | 14 | -0/+0 |
| | |_|/ | |/| | | |||||
| * | | | diabook-nav-icons with gradient | tommy tomson | 2012-04-09 | 8 | -0/+0 |
| | |/ | |/| | |||||
| * | | Some new German translations | zottel | 2012-04-09 | 2 | -64/+64 |
| * | | fixed z-index of youtube-vids | tommy tomson | 2012-04-09 | 21 | -45/+179 |
| |/ | |||||
| * | provide theme_init() functions | friendica | 2012-04-08 | 7 | -0/+14 |
* | | API: Tweetdeck is now working | Michael Vogel | 2012-04-09 | 2 | -54/+51 |
|/ | |||||
* | Merge commit 'upstream/master' | Michael Vogel | 2012-04-08 | 15 | -30/+43 |
|\ | |||||
| * | minor dispy* fixes | Simon L'nu | 2012-04-07 | 7 | -30/+35 |
| * | diabook-themes: small fix | tommy tomson | 2012-04-07 | 8 | -0/+8 |
* | | "vier": Some design stuff | Michael Vogel | 2012-04-07 | 1 | -0/+1 |
* | | Merge commit 'upstream/master' | Michael Vogel | 2012-04-07 | 493 | -1342/+3345 |
|\| | |||||
| * | changelog 1.014 : | tommy tomson | 2012-04-07 | 37 | -79/+1373 |
| * | Merge pull request #210 from tomtom84/master | tomtom84 | 2012-04-06 | 173 | -51/+126 |
| |\ | |||||
| | * | new-contacts-introductions in contacts-drop-down and new-messages in messages... | tommy tomson | 2012-04-06 | 173 | -51/+126 |
| * | | small fixes for the German strings | Tobias Diekershoff | 2012-04-06 | 2 | -19/+19 |
| |/ | |||||
| * | update to the German strings | Tobias Diekershoff | 2012-04-06 | 2 | -1216/+1850 |
| * | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-05 | 890 | -5398/+45119 |
| |\ | |||||
* | | | "vier": Bookmarks now look better. | Michael Vogel | 2012-04-07 | 2 | -0/+10 |
* | | | Merge commit 'upstream/master' | Michael Vogel | 2012-04-06 | 84 | -4038/+567 |
|\ \ \ | | |/ | |/| | |||||
| * | | finish styling category tags and category input | Simon L'nu | 2012-04-05 | 2 | -0/+20 |
| * | | style categorytags | Simon L'nu | 2012-04-04 | 2 | -4/+4 |
| * | | update the dispy* templates | Simon L'nu | 2012-04-04 | 19 | -131/+188 |
| * | | move alert box away from nav links | friendica | 2012-04-04 | 1 | -1/+4 |
| * | | latest changes are the popup menu for notifs, fixes | Simon L'nu | 2012-04-04 | 2 | -20/+38 |
| * | | Merge branch 'pull' | friendica | 2012-04-03 | 24 | -120/+313 |
| |\ \ | |||||
| | * | | smal fix | tommy tomson | 2012-04-03 | 1 | -1/+1 |
| | * | | german translation for right_aside | tommy tomson | 2012-04-03 | 1 | -0/+8 |
| | * | | make right_aside translatable and provide german translation... | tommy tomson | 2012-04-03 | 23 | -119/+304 |
| * | | | remove loozah themes which fell too far behind to recover | friendica | 2012-04-03 | 39 | -3762/+0 |
| |/ / | |||||
* | | | API: template for test function added | Michael Vogel | 2012-04-02 | 1 | -0/+1 |
* | | | Merge commit 'upstream/master' | Michael Vogel | 2012-04-02 | 65 | -470/+1540 |
|\| | | |||||
| * | | diabook-themes: css-fixes | tommy tomson | 2012-04-02 | 24 | -20/+125 |
| * | | diabook-themes: fixes in js | tommy tomson | 2012-04-02 | 4 | -112/+115 |