| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-23 | 4 | -39/+70 |
| |\ | |||||
| | * | Merge pull request #312 from simonlnu/master | Simon | 2012-05-23 | 4 | -39/+70 |
| | |\ | | | | | | | a few more fixes | ||||
| | | * | clean up and more fixing | Simon L'nu | 2012-05-23 | 4 | -39/+70 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-23 | 3 | -151/+174 |
| | | |\ | | |/ | |/| | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: slackr - better highlighting of current selections slackr - knock the sharp edges off the events calendar rev update * master: | ||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-23 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: Update install wizard - writable .htconfig.php not required - add test for working .htaccess/mod_rewrite configuration - fix last pass: create tables, eventually show config text and print a "What next" section * master: | ||||
| * | | | more theme stuff | friendica | 2012-05-23 | 3 | -1/+56 |
| |/ / | |||||
| * | | slackr - better highlighting of current selections | friendica | 2012-05-23 | 1 | -1/+6 |
| | | | |||||
| * | | slackr - knock the sharp edges off the events calendar | friendica | 2012-05-23 | 1 | -1/+1 |
| | | | |||||
| * | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-23 | 12 | -137/+278 |
| |\| | |||||
| | * | Merge pull request #309 from fabrixxm/master | Simon | 2012-05-23 | 4 | -38/+56 |
| | |\ | | | | | | | Update install wizard | ||||
| | | * | Update install wizard | root | 2012-05-23 | 4 | -38/+56 |
| | | | | | | | | | | | | | | | | | | | - writable .htconfig.php not required - add test for working .htaccess/mod_rewrite configuration - fix last pass: create tables, eventually show config text and print a "What next" section | ||||
| | * | | Merge pull request #311 from simonlnu/master | Simon | 2012-05-23 | 5 | -64/+164 |
| | |\ \ | | | | | | | | | clean up and fixing things | ||||
| | | * | | clean up and make nice the dispy photo edit stuff | Simon L'nu | 2012-05-23 | 5 | -64/+164 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-23 | 0 | -0/+0 |
| | |/ / | | | | | | | | | | | | | | | | * remotes/upstream/master: * master: | ||||
| | * | | Merge pull request #310 from simonlnu/master | Simon | 2012-05-23 | 7 | -35/+58 |
| | |\ \ | | |/ | |/| | add a placeholder attribute on #search-text; dispy fixes | ||||
| | | * | add a placeholder attribute on search-text; dispy fixes | Simon L'nu | 2012-05-23 | 7 | -35/+58 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-23 | 19 | -269/+417 |
| | | |\ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: photo rotation event calendar theming import quattro event reminder mark bubbles unsupported keep FB out of private notes clear submanage, etc from session on logout if identity (uid) changes - reload any other open browser windows on next ping. * master: | ||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-22 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: Oops - but lets commit the right revision, sorry. There's a spare line in the last one. Fix darkzero/ns BB icon background colours. cause of bogus wall-to-wall posts found add queue totals to admin summary page DE: update to the strings and some mail templates fix setting array values to config items redir links for permission controlled attachments * master: | ||||
| * | | | rev update | friendica | 2012-05-23 | 2 | -150/+168 |
| |/ / | |||||
| * | | photo rotation | friendica | 2012-05-23 | 4 | -4/+75 |
| | | | |||||
| * | | event calendar theming | friendica | 2012-05-22 | 1 | -0/+3 |
| | | | |||||
| * | | import quattro event reminder | friendica | 2012-05-22 | 2 | -0/+40 |
| | | | |||||
| * | | mark bubbles unsupported | friendica | 2012-05-22 | 2 | -0/+0 |
| | | | |||||
| * | | keep FB out of private notes | friendica | 2012-05-22 | 4 | -16/+25 |
| | | | |||||
| * | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-22 | 2 | -4/+8 |
| |\| | |||||
| | * | Oops - but lets commit the right revision, sorry. There's a spare line in ↵ | Thomas Willingham | 2012-05-22 | 1 | -6/+1 |
| | | | | | | | | | the last one. | ||||
| | * | Fix darkzero/ns BB icon background colours. | Thomas Willingham | 2012-05-22 | 2 | -4/+13 |
| | | | |||||
| * | | clear submanage, etc from session on logout | friendica | 2012-05-22 | 1 | -0/+7 |
| | | | |||||
| * | | if identity (uid) changes - reload any other open browser windows on next ping. | friendica | 2012-05-22 | 5 | -249/+267 |
| |/ | |||||
| * | cause of bogus wall-to-wall posts found | friendica | 2012-05-22 | 1 | -1/+1 |
| | | |||||
| * | add queue totals to admin summary page | friendica | 2012-05-22 | 2 | -1/+18 |
| | | |||||
| * | DE: update to the strings and some mail templates | Tobias Diekershoff | 2012-05-22 | 4 | -483/+535 |
| | | |||||
| * | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-05-22 | 4 | -27/+30 |
| |\ | |||||
| | * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-21 | 9 | -213/+227 |
| | |\ | |||||
| | * | | redir links for permission controlled attachments | friendica | 2012-05-21 | 4 | -27/+30 |
| | | | | |||||
| * | | | fix setting array values to config items | Tobias Diekershoff | 2012-05-22 | 1 | -3/+1 |
| | |/ |/| | |||||
| * | | Merge pull request #308 from simonlnu/master | Simon | 2012-05-21 | 2 | -2/+2 |
| |\ \ | | | | | | | fix (mini-)search-text text | ||||
| | * | | fix (min-)search-text text | Simon L'nu | 2012-05-21 | 2 | -2/+2 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | | Merge pull request #307 from simonlnu/master | Simon | 2012-05-21 | 9 | -212/+226 |
| |\| | | |/ |/| | updates to dispy family; fix typo in INSTALL.txt | ||||
| | * | updates to dispy family; fix typo in INSTALL.txt | Simon L'nu | 2012-05-21 | 9 | -212/+226 |
| | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-21 | 11 | -66/+205 |
| | |\ | |/ |/| | | | | | | | | | * remotes/upstream/master: rev update, bug 428, 429, and ability to block globaldir submissions from demo sites * master: | ||||
| * | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-21 | 2 | -8/+8 |
| |\ \ | |||||
| * | | | rev update, bug 428, 429, and ability to block globaldir submissions from ↵ | friendica | 2012-05-21 | 11 | -66/+205 |
| | | | | | | | | | | | | | demo sites | ||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-21 | 0 | -0/+0 |
| | |/ | | | | | | | | | | | * remotes/upstream/master: * master: | ||||
| | * | Merge pull request #306 from simonlnu/master | Simon | 2012-05-21 | 2 | -2/+2 |
| | |\ | | | | | | | more light fixes | ||||
| | | * | more light fixes | Simon L'nu | 2012-05-21 | 2 | -2/+2 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | | Merge pull request #305 from simonlnu/master | Simon | 2012-05-20 | 2 | -6/+6 |
| |/| | | |/ | | | fix dumb mistake in light | ||||
| | * | fix dumb mistake in light | Simon L'nu | 2012-05-21 | 2 | -6/+6 |
| | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-21 | 0 | -0/+0 |
| |/ | | | | | | | * remotes/upstream/master: rev update * master: | ||||
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-20 | 2 | -2/+2 |
| |\ | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |