Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | more backend work on mail2 followers | friendica | 2012-04-10 | 2 | -9/+57 |
* | make editplain work everywhere | friendica | 2012-04-10 | 5 | -9/+25 |
* | move all fix_mce to one function so it can easily be undone | friendica | 2012-04-10 | 2 | -4/+2 |
* | duplicate community posts | friendica | 2012-04-10 | 1 | -4/+4 |
* | fix_mce_lf contact edit page | friendica | 2012-04-10 | 1 | -1/+1 |
* | fix_mce_lf on profiles | friendica | 2012-04-10 | 2 | -10/+16 |
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-10 | 34 | -278/+352 |
|\ | |||||
| * | Merge pull request #222 from CatoTH/master | friendica | 2012-04-10 | 2 | -2/+2 |
| |\ | |||||
| | * | Incorrect tranlation (one negation too much) | Tobias Hößl | 2012-04-10 | 2 | -2/+2 |
| * | | Merge pull request #223 from campino/master | friendica | 2012-04-10 | 1 | -3/+2 |
| |\ \ | | |/ | |/| | |||||
| | * | fixed install bug | Alexander Kampmann | 2012-04-10 | 1 | -3/+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 |
| * | | Merge pull request #221 from simonlnu/master | Simon | 2012-04-10 | 11 | -268/+278 |
| |\ \ | |||||
| | * | | aaah, nice asides ;). we'll be updating these soon | Simon L'nu | 2012-04-10 | 11 | -268/+278 |
| | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-10 | 1 | -2/+2 |
| | |\ \ | | |/ / | |/| | | |||||
| | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-10 | 6 | -1067/+1227 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-09 | 70 | -415/+947 |
| | |\ \ \ | |||||
| | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-08 | 0 | -0/+0 |
* | | | | | | set default on get_avatar | friendica | 2012-04-10 | 1 | -1/+8 |
* | | | | | | Merge branch 'libravatar' of https://github.com/dawnbreak/friendica into pull | friendica | 2012-04-10 | 7 | -40/+24 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove Gravatar from core and add new hook avatar_lookup. | Klaus Weidenbach | 2012-04-09 | 6 | -34/+18 |
| * | | | | | | Rename gravatar_img() more generic to avatar_img(). | Klaus Weidenbach | 2012-04-09 | 3 | -7/+7 |
* | | | | | | | rev update | friendica | 2012-04-10 | 2 | -42/+101 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | path to default.php in theme dir was incorrect | friendica | 2012-04-10 | 1 | -2/+2 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge branch 'pull' | friendica | 2012-04-09 | 61 | -1063/+1580 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge pull request #218 from campino/master | friendica | 2012-04-09 | 5 | -1037/+1197 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| | | |||||
| | * | | | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-09 | 8 | -0/+0 |
| | |\ \ \ | |||||
| | * | | | | source beautifarming to make review easier | Alexander Kampmann | 2012-04-09 | 1 | -180/+180 |
| | * | | | | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-09 | 30 | -399/+574 |
| | |\ \ \ \ | |||||
| | * | | | | | fixed some typos | Alexander Kampmann | 2012-04-09 | 3 | -6/+6 |
| | * | | | | | made exceptions from the db optional | Alexander Kampmann | 2012-04-09 | 3 | -872/+918 |
| | * | | | | | added exceptions to dba class | Alexander Kampmann | 2012-04-09 | 6 | -188/+302 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge pull request #220 from tomtom84/master | tomtom84 | 2012-04-09 | 40 | -26/+383 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | 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 |
| | |_|/ | |/| | | |||||
| * | | | Merge pull request #217 from tomtom84/master | tomtom84 | 2012-04-09 | 8 | -0/+0 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | diabook-nav-icons with gradient | tommy tomson | 2012-04-09 | 8 | -0/+0 |
| |/ / | |||||
* / / | rev update | friendica | 2012-04-09 | 2 | -30/+30 |
|/ / | |||||
* | | Merge branch 'pull' | friendica | 2012-04-09 | 2 | -64/+64 |
|\ \ | |||||
| * \ | Merge pull request #216 from zzottel/master | tomtom84 | 2012-04-09 | 2 | -64/+64 |
| |\ \ | |||||
| | * | | Some new German translations | zottel | 2012-04-09 | 2 | -64/+64 |
| | * | | Merge remote branch 'upstream/master' | zottel | 2012-04-09 | 26 | -333/+498 |
| | |\ \ | |||||
| | * \ \ | Merge remote branch 'upstream/master' | zottel | 2012-04-08 | 22 | -25/+302 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | * | | | Merge remote branch 'upstream/master' | zottel | 2012-04-08 | 1418 | -2297/+4820 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-04-04 | 70 | -3913/+376 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-04-03 | 41 | -276/+471 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-04-02 | 115 | -313/+12740 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-03-31 | 197 | -1141/+19714 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-03-30 | 39 | -139/+391 |
| | |\ \ \ \ \ \ \ \ |