| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | fix view contacts | friendica | 2012-04-27 | 1 | -1/+1 |
| | | |||||
| * | reset qcomment selector after insert. | friendica | 2012-04-26 | 1 | -0/+1 |
| | | |||||
| * | put fakelink back in birthday notice | friendica | 2012-04-26 | 1 | -1/+1 |
| | | |||||
| * | birthday contact link goes to event page instead of remote profile | friendica | 2012-04-26 | 1 | -1/+1 |
| | | |||||
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-26 | 1 | -5/+5 |
| |\ | |||||
| | * | Merge pull request #269 from simonlnu/master | Simon | 2012-04-26 | 1 | -5/+5 |
| | |\ | | | | | | | fix s/color/colour/g issue | ||||
| | | * | fix s/color/colour/g issue | Simon L'nu | 2012-04-26 | 1 | -5/+5 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-26 | 0 | -0/+0 |
| | |/ | | | | | | | | | | | | | | | * remotes/upstream/master: diabook-themes: small-fix add link "remove account" to /mod/settings.php * master: | ||||
| * | | make comment edit icons look more like base theme | friendica | 2012-04-26 | 5 | -29/+37 |
| | | | |||||
| * | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-26 | 80 | -1518/+4867 |
| |\| | |||||
| | * | Merge pull request #267 from tomtom84/master | friendica | 2012-04-26 | 2 | -1/+11 |
| | |\ | | | | | | | add link "remove account" to /mod/settings.php | ||||
| | | * | diabook-themes: small-fix | tommy tomson | 2012-04-26 | 1 | -1/+6 |
| | | | | |||||
| | | * | add link "remove account" to /mod/settings.php | tommy tomson | 2012-04-26 | 1 | -0/+5 |
| | | | | |||||
| | * | | Merge pull request #268 from simonlnu/master | Simon | 2012-04-26 | 64 | -1515/+3857 |
| | |\ \ | | |/ | |/| | announced dipsy change. re-tie your boots, we're in for a wee ride ;) | ||||
| | | * | announced dipsy change. re-tie your boots, we're in for a wee ride ;) | Simon L'nu | 2012-04-26 | 64 | -1515/+3857 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-26 | 0 | -0/+0 |
| | |/ | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: rev update, fix autoname test "random" failure duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design added BBCODE thing in comments add cleanzero theme * master: | ||||
| | * | Merge pull request #265 from cvogeley/master | friendica | 2012-04-26 | 14 | -2/+999 |
| | |\ | | | | | | | cleanzero theme added | ||||
| | | * | duepuntozero: move community and manage link to upper right area + css fixes ↵ | Christian Vogeley | 2012-04-25 | 1 | -0/+71 |
| | | | | | | | | | | | | | to avoid breaking of design | ||||
| | | * | duepuntozero: move community and manage link to upper right area + css fixes ↵ | Christian Vogeley | 2012-04-25 | 1 | -2/+5 |
| | | | | | | | | | | | | | to avoid breaking of design | ||||
| | | * | added BBCODE thing in comments | Christian Vogeley | 2012-04-25 | 1 | -0/+38 |
| | | | | |||||
| | | * | add cleanzero theme | Christian Vogeley | 2012-04-25 | 12 | -0/+885 |
| | | | | |||||
| * | | | rev update | friendica | 2012-04-26 | 2 | -3/+3 |
| |/ / | |||||
| * | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-26 | 6 | -6358/+6809 |
| |\ \ | |||||
| | * \ | Merge pull request #266 from simonlnu/master | Simon | 2012-04-25 | 4 | -6353/+6793 |
| | |\ \ | | | | | | | | | convert stylesheets to less, and compress output css | ||||
| | | * | | convert stylesheets to less, and compress output css | Simon L'nu | 2012-04-26 | 4 | -6353/+6793 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-26 | 2 | -5/+16 |
| | | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | * remotes/upstream/master: Diabook-dark more CSS fixes. * master: | ||||
| | * | | | Diabook-dark more CSS fixes. | Thomas Willingham | 2012-04-25 | 2 | -5/+16 |
| | | |/ | |/| | | | | | | | Slowly getting there. | ||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-25 | 16 | -452/+151 |
| | | |\ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: bug #307, explaining decentralised private photos is impossible. this turns out to be harder than I thought cleanup - make bb-buttons vanish when comment closed Esperanto at 100% again * master: | ||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-25 | 50 | -501/+1196 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: diabook-themes: fix css to login.tpl restore qcomment selector rev update zero-themes: add bbcode-toolbar to commentbox diabook-themes: small fix Diabook-dark css fix Diabook-dark, couple of new icons, and another css fix. fix tags test with new url quattro: small week calendar view for event/birthday reminders remove html from get_birthdays() and get_events() events page: set calendar start date from url (events/[year]/[month]/) and show event popup from url anchor (#link-[event id]) * master: | ||||
| | | * \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-24 | 41 | -601/+974 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: separate tag search from body search Esperanto at 100% again Improvements to diabook-dark move unfriend to standalone function for use in account removal more work on mail2 (introductions), added 'm' (mail) flag to ACL backend for autocomplete of PM recips * master: | ||||
| | | * \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-23 | 222 | -13881/+170 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: DE strings, correction of a typo diabok-themes: fixed bug in green-wide and dark-wide diabook-themes: small fix in nets_aside, group_aside and delete obsolete .tpls in subfolders diabook-themes: bugfix in admin-section allow bbcode representation of html symbols such as © by wrapping in bb brackets protect jappixmini/proxy from typo check, more work on email2 connector * master: | ||||
| | | * \ \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-22 | 67 | -294/+231 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: bug #388 - notify_comment received after post deleted don't allow non-existent themes as choices diabook-themes: bugfix diabook-themes: fixed youtube-bug and added "Info/Impressum" to footer api: add support for StatusNet-style media param to API Add a hook * master: | ||||
| | | * | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-22 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: DE strings update diabook-themes: comment-bbcode-bugfix * master: | ||||
| * | | | | | | | rev update, fix autoname test "random" failure | friendica | 2012-04-26 | 3 | -32/+35 |
| |/ / / / / / | |||||
| * | | | | | | bug #307, explaining decentralised private photos is impossible. | friendica | 2012-04-25 | 1 | -0/+23 |
| | | | | | | | |||||
| * | | | | | | this turns out to be harder than I thought | friendica | 2012-04-25 | 2 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #264 from mschmitt/master | friendica | 2012-04-25 | 2 | -78/+112 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Esperanto at 100% again | ||||
| | * | | | | | | Esperanto at 100% again | Martin Schmitt | 2012-04-25 | 2 | -78/+112 |
| | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-25 | 12 | -12/+96 |
| |\| | | | | | |||||
| | * | | | | | Merge pull request #263 from tomtom84/master | tomtom84 | 2012-04-24 | 12 | -12/+96 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | diabook-themes: fix css to login.tpl | ||||
| | | * | | | | | diabook-themes: fix css to login.tpl | tommy tomson | 2012-04-25 | 12 | -12/+96 |
| | | | | | | | | |||||
| * | | | | | | | cleanup - make bb-buttons vanish when comment closed | friendica | 2012-04-25 | 14 | -374/+16 |
| |/ / / / / / | |||||
| * | | | | | | restore qcomment selector | friendica | 2012-04-24 | 7 | -21/+35 |
| | | | | | | | |||||
| * | | | | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-24 | 36 | -94/+934 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Merge pull request #262 from tomtom84/master | friendica | 2012-04-24 | 22 | -0/+732 |
| | |\| | | | | | | | | | | | | | | | | | | | zero-themes: add bbcode-toolbar to commentbox | ||||
| | | * | | | | | zero-themes: add bbcode-toolbar to commentbox | tommy tomson | 2012-04-25 | 22 | -0/+732 |
| | |/ / / / / | |||||
| | * | | | | | diabook-themes: small fix | tommy tomson | 2012-04-25 | 3 | -8/+31 |
| | | | | | | | |||||
| | * | | | | | Merge pull request #261 from fabrixxm/eventspage | friendica | 2012-04-24 | 6 | -82/+167 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Some tweak on events page and events/bitrhdays reminder | ||||
| | | * | | | | | quattro: small week calendar view for event/birthday reminders | Fabio Comuni | 2012-04-24 | 2 | -0/+40 |
| | | | | | | | | |||||
| | | * | | | | | remove html from get_birthdays() and get_events() | Fabio Comuni | 2012-04-24 | 3 | -23/+53 |
| | | | | | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |