| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2012-04-24 | 2106 | -17706/+98887 |
| |\ | | | | | | | Merge upstream | ||||
| | * | DE strings, correction of a typo | Tobias Diekershoff | 2012-04-23 | 2 | -198/+98 |
| | | | |||||
| | * | diabok-themes: fixed bug in green-wide and dark-wide | tommy tomson | 2012-04-23 | 5 | -12/+12 |
| | | | |||||
| | * | diabook-themes: small fix in nets_aside, group_aside and delete obsolete ↵ | tommy tomson | 2012-04-23 | 211 | -13669/+5 |
| | | | | | | | | | .tpls in subfolders | ||||
| | * | diabook-themes: bugfix in admin-section | tommy tomson | 2012-04-23 | 1 | -1/+1 |
| | | | |||||
| | * | allow bbcode representation of html symbols such as © by wrapping in bb ↵ | friendica | 2012-04-23 | 1 | -0/+3 |
| | | | | | | | | | brackets | ||||
| | * | protect jappixmini/proxy from typo check, more work on email2 connector | friendica | 2012-04-23 | 2 | -1/+51 |
| | | | |||||
| | * | bug #388 - notify_comment received after post deleted | friendica | 2012-04-22 | 2 | -2/+2 |
| | | | |||||
| | * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-22 | 73 | -714/+1005 |
| | |\ | |||||
| | | * | Merge pull request #258 from unary/api | friendica | 2012-04-22 | 2 | -13/+36 |
| | | |\ | | | | | | | | | api: add support for StatusNet-style media param to API | ||||
| | | | * | api: add support for StatusNet-style media param to API | Michael Johnston | 2012-04-22 | 2 | -13/+36 |
| | | | | | |||||
| | | * | | Merge pull request #257 from CatoTH/master | friendica | 2012-04-22 | 1 | -0/+2 |
| | | |\ \ | | | | | | | | | | | Add a hook in mod/ping.php | ||||
| | | | * | | Merge branch 'master' of git://github.com/friendica/friendica | Tobias Hößl | 2012-04-22 | 748 | -2940/+62981 |
| | | | |\| | |||||
| | | | * | | Add a hook | Tobias Hößl | 2012-04-22 | 1 | -0/+2 |
| | | | | | | |||||
| | | * | | | diabook-themes: bugfix | tommy tomson | 2012-04-22 | 15 | -27/+31 |
| | | | | | | |||||
| | | * | | | diabook-themes: fixed youtube-bug and added "Info/Impressum" to footer | tommy tomson | 2012-04-22 | 45 | -101/+108 |
| | | | |/ | | |/| | |||||
| | | * | | DE strings update | Tobias Diekershoff | 2012-04-22 | 8 | -542/+789 |
| | | | | | |||||
| | | * | | diabook-themes: comment-bbcode-bugfix | tommy tomson | 2012-04-22 | 2 | -9/+9 |
| | | | | | |||||
| | | * | | Merge pull request #256 from simonlnu/master | Simon | 2012-04-21 | 2 | -22/+30 |
| | | |\ \ | | | | | | | | | | | fix tinymce theming | ||||
| | | | * | | fix tinymce theming | Simon L'nu | 2012-04-22 | 2 | -22/+30 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-22 | 384 | -56031/+194 |
| | | | |\ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: rev update diabook-themes: deleted obsolete diabook-folder & minor bug-fixes * master: | ||||
| | | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-21 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: rev update * master: | ||||
| | * | | | | don't allow non-existent themes as choices | friendica | 2012-04-22 | 3 | -151/+52 |
| | |/ / / | |||||
| | * | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-21 | 382 | -55989/+76 |
| | |\ \ \ | |||||
| | | * | | | diabook-themes: deleted obsolete diabook-folder & minor bug-fixes | tommy tomson | 2012-04-22 | 382 | -55989/+76 |
| | | |/ / | |||||
| | * / / | rev update | friendica | 2012-04-21 | 2 | -42/+118 |
| | |/ / | |||||
| | * | | rev update | friendica | 2012-04-21 | 2 | -416/+560 |
| | | | | |||||
| | * | | Merge pull request #255 from simonlnu/master | Simon | 2012-04-20 | 2 | -0/+4 |
| | |\ \ | | | | | | | | | fix checkboxes and radio buttons for some browsers | ||||
| | | * | | fix checkbox/radio buttons for some browsers | Simon L'nu | 2012-04-20 | 2 | -0/+4 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-20 | 0 | -0/+0 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: diabook-themes: add diabook-dark diabook-themes: add diabook-green and some minor css/bug-fixes rev update escape email template var names. fix bug n385. * master: | ||||
| | * | | diabook-themes: add diabook-dark | tommy tomson | 2012-04-21 | 117 | -1/+18810 |
| | | | | |||||
| | * | | diabook-themes: add diabook-green and some minor css/bug-fixes | tommy tomson | 2012-04-20 | 121 | -30/+19091 |
| | | | | |||||
| | * | | rev update | friendica | 2012-04-20 | 2 | -7/+7 |
| | | | | |||||
| | * | | Merge pull request #254 from simonlnu/master | Simon | 2012-04-20 | 21 | -21/+1803 |
| | |\ \ | | | | | | | | | add some knobs to comment boxes | ||||
| | | * | | fix the buttons. don't hide the buttons once shown | Simon L'nu | 2012-04-20 | 4 | -14/+2 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | | optimise imgs; add some comment editing knobs | Simon L'nu | 2012-04-20 | 21 | -21/+1815 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-20 | 10 | -39/+118 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: XSRF protection and PHPdoc for mod/admin.php XSRF protection and PHPdoc for mod/admin.php * master: | ||||
| | | * \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-20 | 471 | -28/+75613 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes * master: | ||||
| | | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-19 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: * master: | ||||
| | * | | | | | Merge pull request #253 from fabrixxm/master | fabrixxm | 2012-04-20 | 8 | -50/+50 |
| | |\ \ \ \ \ | | |_|_|/ / | |/| | | | | fix bug n385 | ||||
| | | * | | | | escape email template var names. fix bug n385. | Fabio Comuni | 2012-04-20 | 8 | -50/+50 |
| | | | |/ / | | |/| | | |||||
| | * | | | | Merge remote-tracking branch 'CatoTH/master' into req245 | Fabio Comuni | 2012-04-20 | 10 | -39/+118 |
| | |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | |||||
| | | * | | XSRF protection and PHPdoc for mod/admin.php | Tobias Hößl | 2012-04-18 | 3 | -6/+15 |
| | | | | | |||||
| | | * | | XSRF protection and PHPdoc for mod/admin.php | Tobias Hößl | 2012-04-18 | 8 | -33/+103 |
| | | | | | |||||
| | * | | | Merge pull request #252 from tomtom84/master | tomtom84 | 2012-04-19 | 471 | -28/+75613 |
| | |\ \ \ | | |_|/ | |/| | | diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes | ||||
| | | * | | diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink ↵ | tommy tomson | 2012-04-20 | 471 | -28/+75613 |
| | |/ / | | | | | | | | | | and some bug/css-fixes | ||||
| | * | | Merge pull request #251 from simonlnu/master | Simon | 2012-04-19 | 2 | -4/+2 |
| | |\ \ | | | | | | | | | fix .item-select | ||||
| | | * \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-19 | 0 | -0/+0 |
| | | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | * remotes/upstream/master: * master: | ||||
| | * | | | Merge pull request #250 from simonlnu/master | Simon | 2012-04-19 | 4 | -4/+5 |
| | |\ \ \ | | | | | | | | | | | tweak drop-down and add in filebrowser | ||||
| | | | * | | fix .item-select | Simon L'nu | 2012-04-19 | 2 | -4/+2 |
| | | |/ / | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |