| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge commit 'upstream/master' | Michael Vogel | 2012-03-15 | 75 | -404/+1216 |
| |\ | |||||
| | * | commit latest to dispy-dark. fixes in html css and js | Simon L'nu | 2012-03-15 | 16 | -85/+115 |
| | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | Merge branch 'pull' | friendica | 2012-03-15 | 10 | -21/+74 |
| | |\ | |||||
| | | * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-03-15 | 10 | -21/+74 |
| | | |\ | |||||
| | | | * | add links to wall, photos, events, etc to aside on networkpage, fixes in css | tommy tomson | 2012-03-15 | 10 | -21/+74 |
| | | | | | |||||
| | * | | | force login to ssl on SSL_POLICY_SELFSIGN | friendica | 2012-03-14 | 2 | -2/+2 |
| | | | | | |||||
| | * | | | ssl_policy stuff | friendica | 2012-03-14 | 1 | -0/+1 |
| | |/ / | |||||
| | * | | Merge pull request #132 from campino/master | friendica | 2012-03-14 | 1 | -10/+10 |
| | |\ \ | | | | | | | | | Test cases | ||||
| | | * \ | Merge branch 'master' of git://github.com/friendica/friendica | Alexander Kampmann | 2012-03-14 | 69 | -689/+7698 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: view/de/strings.php | ||||
| | | * \ \ | Merge branch 'master' of git://github.com/friendica/friendica | Alexander Kampmann | 2012-03-09 | 88 | -190/+11452 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge branch 'master' of git://github.com/friendica/friendica | Alexander Kampmann | 2012-03-07 | 21 | -133/+238 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | merged | Alexander Kampmann | 2012-03-07 | 94 | -2529/+7640 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | added test blueprints, fixed? encoding issues | Alexander Kampmann | 2012-03-05 | 1 | -10/+10 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge pull request #133 from tonybaldwin/master | friendica | 2012-03-14 | 2 | -0/+102 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | slack-NS | ||||
| | | * | | | | | | | added slack-NS, non-scrolly, slackr-based theme. | Tony Baldwin | 2012-03-13 | 2 | -0/+102 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-03-14 | 7 | -7/+189 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge pull request #134 from simonlnu/master | Simon | 2012-03-14 | 34 | -137/+356 |
| | | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | PHP Fatal error: Call-time pass-by-reference has been removed in mod/item.php on line 630 | ||||
| | | * | | | | | | | | fix in nav | tommy tomson | 2012-03-14 | 1 | -4/+0 |
| | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | | * | | | | | | | add links to home, profile, photos, events, notes to aside in network-stream | tommy tomson | 2012-03-14 | 6 | -3/+189 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge pull request #131 from simonlnu/master | Simon | 2012-03-13 | 9 | -128/+247 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | massive work done to both dispys, mostly -dark | ||||
| | | * | | | | | | | massive work done to both dispys, mostly -dark | Simon L'nu | 2012-03-14 | 9 | -128/+247 |
| | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * / | | | | | | more work on filer, comment level and file tag removal | friendica | 2012-03-13 | 3 | -4/+9 |
| | |/ / / / / / | |||||
| | * | | | | | | file as widget and basic filing implementation for duepuntozero,slackr | friendica | 2012-03-13 | 6 | -3/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | much more work needed - this is just for test/evaluation currently | ||||
| | * | | | | | | Merge branch 'pull' | friendica | 2012-03-13 | 9 | -6/+14 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge pull request #129 from CatoTH/master | friendica | 2012-03-13 | 9 | -6/+14 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | CSRF-Protection and minor changes | ||||
| | | | * | | | | | | Some security against XSRF-attacks | Tobias Hößl | 2012-03-12 | 9 | -6/+14 |
| | | | | | | | | | | |||||
| | * | | | | | | | | invite potential connectees to the free social web | friendica | 2012-03-13 | 2 | -0/+11 |
| | |/ / / / / / / | |||||
| | * | / / / / / | click anywhere to close notifications -> zeros and bubbles | friendica | 2012-03-12 | 8 | -0/+39 |
| | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | | fix css | tommy tomson | 2012-03-13 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Merge pull request #127 from tomtom84/master | tomtom84 | 2012-03-12 | 44 | -1490/+2 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | fixes in diabook-derivates | ||||
| | | * | | | | | | use fancybox instead of lightbox | tommy tomson | 2012-03-13 | 44 | -1490/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge pull request #126 from tomtom84/master | tomtom84 | 2012-03-12 | 6 | -4/+72 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | fixes in diabook-derivates | ||||
| | | * | | | | | | fixes | tommy tomson | 2012-03-12 | 6 | -4/+72 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge pull request #125 from tomtom84/master | tomtom84 | 2012-03-12 | 59 | -45/+1667 |
| | |\| | | | | | | | |/ / / / / | |/| | | | | | fixes in diabook-derivates | ||||
| | | * | | | | | add lightbox, fixex in css | tommy tomson | 2012-03-12 | 59 | -45/+1667 |
| | | | | | | | | |||||
| | * | | | | | | fix dispy-dark photo album stuff | Simon L'nu | 2012-03-11 | 1 | -17/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | | | | | | fix dispys' css and layout | Simon L'nu | 2012-03-11 | 7 | -130/+147 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | | | | | | Removed changes | Michael Vogel | 2012-03-11 | 2 | -19/+11 |
| | | | | | | | | |||||
| * | | | | | | | Merge commit 'upstream/master' | Michael Vogel | 2012-03-11 | 52 | -542/+7157 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: view/theme/diabook/wall_item.tpl view/theme/diabook/wallwall_item.tpl | ||||
| | * | | | | | | screwed up on the font-size for screen last push | Simon L'nu | 2012-03-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | | | | | | add some '@media handheld' types for dispys | Simon L'nu | 2012-03-11 | 2 | -1/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | | | | | | fix more stuff | Simon L'nu | 2012-03-11 | 1 | -5/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | | | | | | fix some stuff right away | Simon L'nu | 2012-03-11 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | | | | | | preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP! | Simon L'nu | 2012-03-11 | 33 | -13/+6144 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | | | | | | bug #327 - composed private message is lost if no recip specified. | friendica | 2012-03-10 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Merge pull request #118 from tomtom84/master | tomtom84 | 2012-03-10 | 9 | -11/+52 |
| | |\| | | | | | | | | | | | | | | | | | | | fixes in diabook-derivates | ||||
| | | * | | | | | fixed login-fields, fixed. notofication.png, changed locations | tommy tomson | 2012-03-10 | 9 | -11/+52 |
| | | | | | | | | |||||
| | * | | | | | | German translation | Tobias Diekershoff | 2012-03-10 | 2 | -473/+810 |
| | | | | | | | | |||||
| | * | | | | | | allow user to set number of items to show on network page | Michael Johnston | 2012-03-09 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | Merge pull request #116 from tomtom84/master | tomtom84 | 2012-03-09 | 5 | -0/+134 |
| | |\| | | | | | | | | | | | | | | | | | | | fixes in diabook-derivates | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |