| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | |\ | | | | | | | Translation bugfix | ||||
| | | * | 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 |
| | |\ \ | | |/ | |/| | bug fix | ||||
| | | * | 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 | ||||
| | | * | | aaah, nice asides ;). we'll be updating these soon | Simon L'nu | 2012-04-10 | 11 | -268/+278 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-10 | 1 | -2/+2 |
| | | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | * remotes/upstream/master: path to default.php in theme dir was incorrect * master: | ||||
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-10 | 6 | -1067/+1227 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: rev update source beautifarming to make review easier fixed some typos made exceptions from the db optional set address for updae mails correctly added exceptions to dba class added exception handling to index.php, please mind that there is no recovery at the moment added transactions to db update. Please mind that they might not be supported by db table engines. added admin email on failed updates * master: | ||||
| | | * \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-09 | 70 | -415/+947 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: bbcode toolbar attached to the comment text field minor css-fixes diabook-themes: small icon fix diabook-nav-icons with gradient use local_user for tag completion if available. See bug #368 more sane defaults datetime_convert fix empty string timezone Some new German translations send zrl after dfrn_request homecoming for manual entries fix to wall_upload photos default permissions to use cid rather than uid. fixed z-index of youtube-vids fixed bug to hide right_side * master: | ||||
| | | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-08 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: prepare for using a master theme_init() provide theme_init() functions rev updates API: API is now enhanced. mentions, repeat and destroy now works. "vier": Some design stuff "vier": Bookmarks now look better. API: template for test function added The "vier"-theme is now working again. But there is still work needed New script that checks if a script is running poller: An optional lockfile is used to check if the poller is already running Several improvements * master: | ||||
| * | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes all occurances of Gravatar from friendica's core and adds a new hook "avatar_lookup" inside the function avatar_img($email) where the new *avatar-plugins should hook in. I haven't touched the language files yet. Are they updated automatically somehow? | ||||
| | * | | | | | | Rename gravatar_img() more generic to avatar_img(). | Klaus Weidenbach | 2012-04-09 | 3 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I would like to extend the Gravatar support to also use Libravatar, a decentralized avatar service. First step to extract Gravatar from core and put it into its own plugin. Later the Libravatar plugin can be done, too as a plugin. | ||||
| * | | | | | | | 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 |
| | |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| | | db errors and update error mail | ||||
| | | * | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | set address for updae mails correctly | ||||
| | | * | | | | | added exceptions to dba class | Alexander Kampmann | 2012-04-09 | 6 | -188/+302 |
| | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added exception handling to index.php, please mind that there is no recovery at the moment added transactions to db update. Please mind that they might not be supported by db table engines. added admin email on failed updates added german translation for admin email | ||||
| | * | | | | | Merge pull request #220 from tomtom84/master | tomtom84 | 2012-04-09 | 40 | -26/+383 |
| | |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | fixes in diabook-themes | ||||
| | | * | | | | bbcode toolbar attached to the comment text field | tommy tomson | 2012-04-10 | 40 | -26/+383 |
| | |/ / / / | | | | | | | | | | | | | | | | minor css-fixes | ||||
| | * | | / | 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 |
| | |\ \ \ | | |_|/ | |/| | | small fix in theme diabook | ||||
| | | * | | 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 |
| | |\ \ | | | | | | | | | German translations | ||||
| | | * | | 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 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-03-29 | 87 | -435/+2071 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-03-27 | 166 | -1297/+7813 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-03-24 | 5 | -223/+86 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-03-23 | 5 | -34/+4953 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | zottel | 2012-03-23 | 12 | -34/+375 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |