| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #209 from HaakonME/master | redmatrix | 2015-12-06 | 3 | -7003/+7198 |
| |\ | | | | | Updated Norwegian strings for Hubzilla 1.0 | ||||
| | * | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-12-05 | 7 | -13/+17 |
| | |\ | |/ |/| | |||||
| * | | Merge pull request #208 from anaqreon/mail-text-height | redmatrix | 2015-12-05 | 1 | -0/+4 |
| |\ \ | | | | | | | Enlarge the default mail composition text area. | ||||
| | * | | Enlarge the default mail composition text area. | Andrew Manning | 2015-12-04 | 1 | -0/+4 |
| |/ / | |||||
| * | | fix rendering of unseen forum posts count | Mario Vavti | 2015-12-04 | 1 | -1/+1 |
| | | | |||||
| * | | add hubzilla.nl as fallback | redmatrix | 2015-12-03 | 1 | -1/+2 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-12-03 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | srand() is for seeding the PRNG. You want rand() here. | ken restivo | 2015-12-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | remove non-working directory server from the project fallback list. | redmatrix | 2015-12-03 | 1 | -1/+0 |
| |/ / | |||||
| * | | use the std_version where applicable instead of matching to the git. | redmatrix | 2015-12-03 | 2 | -7/+7 |
| | | | |||||
| * | | time to tag the sucker1.0 | redmatrix | 2015-12-03 | 2 | -2/+2 |
| | | | |||||
| | * | Updated Norwegian translation | Haakon Meland Eriksen | 2015-12-05 | 2 | -7002/+7197 |
| | | | |||||
| | * | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-12-03 | 19 | -13331/+13365 |
| | |\ | |/ |/| | |||||
| * | | non-functional changes (changes to comments, etc.) | redmatrix | 2015-12-02 | 1 | -9/+3 |
| | | | |||||
| * | | provide correct error if a directory server requires a realm_token and one ↵ | redmatrix | 2015-12-02 | 1 | -2/+2 |
| | | | | | | | | | wasn't provided | ||||
| * | | prevent function name re-declaration in widget space | redmatrix | 2015-12-02 | 1 | -4/+5 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-12-02 | 10 | -13301/+13326 |
| |\ \ | |||||
| | * | | es+nl and bluegrid update | jeroenpraat | 2015-12-03 | 5 | -13295/+13301 |
| | | | | |||||
| | * | | fix nav search popup active background color | Mario Vavti | 2015-12-02 | 1 | -0/+7 |
| | | | | |||||
| | * | | fix mail attachment and photo permissions. issue #202 | Mario Vavti | 2015-12-02 | 1 | -4/+5 |
| | | | | |||||
| | * | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2015-12-02 | 4 | -7/+11 |
| | |\ \ | |||||
| | * | | | fix attachment rendering for mail | Mario Vavti | 2015-12-02 | 4 | -2/+13 |
| | | | | | |||||
| * | | | | introduce STD_VERSION and get_std_version() [in include/plugin.php], we ↵ | redmatrix | 2015-12-02 | 3 | -5/+17 |
| | |/ / |/| | | | | | | | | begin with 0.11.1 since it is an incompatible interface change to 0.11. | ||||
| * | | | issue #204 | redmatrix | 2015-12-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-12-01 | 1 | -1/+6 |
| |\ \ \ | |||||
| | * \ \ | Merge pull request #200 from anaqreon/update-addon-script | redmatrix | 2015-12-02 | 1 | -1/+6 |
| | |\ \ \ | | |/ / | |/| | | Update addon script | ||||
| | | * | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into ↵ | Andrew Manning | 2015-11-30 | 6 | -122/+177 |
| | | |\ \ | | | | | | | | | | | | | | | | update-addon-script | ||||
| | | * | | | Abort addon update if repo does not exist | Andrew Manning | 2015-11-30 | 1 | -1/+6 |
| | | | | | | |||||
| * | | | | | usercache is no longer used | redmatrix | 2015-12-01 | 2 | -5/+4 |
| |/ / / / | |||||
| * | | | | fix badge padding in narrow navbar | Mario Vavti | 2015-12-01 | 2 | -1/+1 |
| | | | | | |||||
| * | | | | make narrow navbar setting work again | Mario Vavti | 2015-12-01 | 2 | -3/+1 |
| | | | | | |||||
| | | | * | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-12-01 | 11 | -6759/+6830 |
| | | | |\ | |_|_|/ |/| | | | |||||
| * | | | | version | redmatrix | 2015-11-30 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #201 from wave72/master | Wave | 2015-11-30 | 2 | -6634/+6637 |
| |\ \ \ \ | |_|/ / |/| | | | Updated Italian strings | ||||
| | * | | | Updated Italian strings | Paolo Tacconi | 2015-11-30 | 2 | -6634/+6637 |
| | | | | | |||||
| | * | | | Merge pull request #3 from redmatrix/master | Wave | 2015-11-25 | 525 | -14424/+116761 |
| | |\ \ \ | | | | | | | | | | | Update branch | ||||
| * | | | | | generalise the site black|white allow lists, also add a channel black|white ↵ | redmatrix | 2015-11-29 | 4 | -26/+63 |
| | | | | | | | | | | | | | | | | | | | | | list for future use | ||||
| * | | | | | report correct directory mode for standalone directories in siteinfo | redmatrix | 2015-11-29 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | create get_site_info() function so we can have a siteinfo.json module ↵ | redmatrix | 2015-11-29 | 3 | -97/+115 |
| | |_|/ / |/| | | | | | | | | | | | instead of or actually in addition to siteinfo/json | ||||
| * | | | | issue #189 | redmatrix | 2015-11-29 | 2 | -1/+7 |
| | | | | | |||||
| * | | | | don't try to pull public content from dead sites | redmatrix | 2015-11-29 | 1 | -1/+4 |
| | | | | | |||||
| * | | | | log whatever is showing up in the delivery hash array since it seems that ↵ | redmatrix | 2015-11-29 | 2 | -1/+5 |
| | | | | | | | | | | | | | | | | | one site has something unusual there and it is throwing errors. | ||||
| | | | * | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-29 | 7 | -30/+51 |
| | | | |\ | |_|_|/ |/| | | | |||||
| * | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-28 | 7 | -30/+51 |
| |\ \ \ \ | |||||
| | * | | | | reflect in form if we are editing or creating | Mario Vavti | 2015-11-28 | 1 | -7/+7 |
| | | | | | | |||||
| | * | | | | css fixes | Mario Vavti | 2015-11-28 | 5 | -22/+43 |
| | | | | | | |||||
| * | | | | | version | redmatrix | 2015-11-28 | 1 | -1/+1 |
| | | | | | | |||||
| | | | | * | Resolving merge conflict | Haakon Meland Eriksen | 2015-11-29 | 9 | -302/+49 |
| | | | | | | |||||
| | | | | * | My version of jot.tpl | Haakon Meland Eriksen | 2015-11-28 | 1 | -49/+58 |
| | | | | | | |||||
| | | | | * | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-28 | 27 | -4462/+4962 |
| | | | | |\ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/datetime.php include/text.php mod/events.php version.inc view/css/mod_events.css view/theme/redbasic/css/style.css view/tpl/event_head.tpl view/tpl/events-js.tpl view/tpl/jot.tpl | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |