| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-20 | 3 | -13/+31 |
| |\ | |||||
| | * | erge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-03-21 | 0 | -0/+0 |
| | |\ | |||||
| | | * | Merge pull request #329 from git-marijus/master | redmatrix | 2016-03-21 | 3 | -13/+31 |
| | | |\ | | | | | | | | | fix #328 by using a seperate query instead of group_concat | ||||
| | * | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-03-20 | 2 | -3/+3 |
| | |\| | | | |/ | |/| | |||||
| | * | | an attempt to visualize the supremacy of dont show over show in the acl selector | Mario Vavti | 2016-03-20 | 1 | -4/+9 |
| | | | | |||||
| | * | | fix #328 by using a seperate query instead of group_concat | Mario Vavti | 2016-03-20 | 2 | -9/+22 |
| | | | | |||||
| * | | | rework salmon - important, update addons also if you have enabled gnusoc addon | redmatrix | 2016-03-20 | 3 | -207/+2 |
| | |/ |/| | |||||
| * | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-20 | 8 | -1161/+1181 |
| |\| | |||||
| | * | Update NL + es_ES strings. | jeroenpraat | 2016-03-20 | 4 | -1151/+1163 |
| | | | |||||
| | * | add fixme | Mario Vavti | 2016-03-20 | 1 | -1/+3 |
| | | | |||||
| | * | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-03-20 | 6 | -448/+458 |
| | |\ | |||||
| | * | | make >>indicate group members<< in acl selector work again on group > show ↵ | Mario Vavti | 2016-03-20 | 3 | -9/+15 |
| | | | | | | | | | | | | | or group > dont show is selected | ||||
| * | | | issue #330 - permit archived connections in ACLs. If they are to be blocked ↵ | redmatrix | 2016-03-20 | 2 | -3/+3 |
| | |/ |/| | | | | | for delivery (or some other purpose) this should probably happen in the delivery mechanism (or other related sub-system) rather than the permissions mechanism, although currently we still attempt direct delivery to archived connections. Technically "archived" means merely that we won't 'poll' the connection according to the current definition. | ||||
| * | | make the admin side menu extensible and provide a hook for a channel "move" ↵ | redmatrix | 2016-03-19 | 6 | -448/+458 |
| |/ | | | | operation that federation plugins might use to re-establish connections after a channel move. | ||||
| * | missing return false for map link | Mario Vavti | 2016-03-19 | 1 | -1/+1 |
| | | |||||
| * | add use as cover photo link to photos view | Mario Vavti | 2016-03-18 | 2 | -14/+34 |
| | | |||||
| * | change rev1.3.1 | redmatrix | 2016-03-17 | 1 | -1/+1 |
| | | |||||
| * | SECURITY: DAV authentication issue | redmatrix | 2016-03-17 | 1 | -1/+1 |
| | | |||||
| * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-17 | 11 | -261/+325 |
| |\ | |||||
| | * | See issue https://github.com/redmatrix/hubzilla-addons/issues/17 (UNO: ↵ | jeroenpraat | 2016-03-17 | 1 | -1/+9 |
| | | | | | | | | | enable the Diaspora protocol for all channels (if addon is enabled) - I had to do this during channel creation and not in the addon itself, or else the member can't change this after the channel is created. Tested it on UNO and normal Hubzilla. If this is not the right place for this, please move it. If not wanted at all, please discuss. | ||||
| | * | some work on profile listing | Mario Vavti | 2016-03-17 | 6 | -71/+65 |
| | | | |||||
| | * | bring more structure to profiles edit | Mario Vavti | 2016-03-17 | 7 | -191/+253 |
| | | | |||||
| * | | no xchan here if using zot protocol | redmatrix | 2016-03-17 | 3 | -3/+5 |
| |/ | |||||
| * | typo | redmatrix | 2016-03-16 | 1 | -1/+1 |
| | | |||||
| * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-16 | 5 | -395/+260 |
| |\ | |||||
| | * | Merge pull request #327 from anaqreon/ownmapp-typo | git-marijus | 2016-03-16 | 1 | -1/+1 |
| | |\ | | | | | | | Misspelling of ownMapp in homeinstall script | ||||
| | | * | Misspelling of ownMapp | Andrew Manning | 2016-03-15 | 1 | -1/+1 |
| | | | | |||||
| | * | | move buttons to dropdown menu and some cleanup | Mario Vavti | 2016-03-16 | 4 | -234/+242 |
| | | | | |||||
| | * | | still more janitor work on profiles | Mario Vavti | 2016-03-16 | 2 | -185/+42 |
| | | | | |||||
| * | | | more federation backend | redmatrix | 2016-03-16 | 2 | -7/+4 |
| | | | | |||||
| * | | | lots of work on federated channel discovery | redmatrix | 2016-03-16 | 8 | -70/+303 |
| |/ / | |||||
| * | | more federation backend work | redmatrix | 2016-03-15 | 1 | -4/+39 |
| | | | |||||
| * | | even more janitor work on profiles | Mario Vavti | 2016-03-15 | 2 | -18/+8 |
| |/ | |||||
| * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-15 | 4 | -766/+764 |
| |\ | |||||
| | * | Merge branch 'master' of https://github.com/redmatrix/hubzilla | jeroenpraat | 2016-03-14 | 19 | -1510/+1495 |
| | |\ | |||||
| | * | | update nl + es-es strings | jeroenpraat | 2016-03-14 | 4 | -766/+764 |
| | | | | |||||
| * | | | some heavy lifting porting the old salmon code | redmatrix | 2016-03-15 | 3 | -1/+211 |
| | | | | |||||
| * | | | federation work | redmatrix | 2016-03-14 | 2 | -10/+25 |
| | | | | |||||
| * | | | some re-working of webfinger and hcard parsing which will be necessary going ↵ | redmatrix | 2016-03-14 | 3 | -18/+58 |
| | |/ |/| | | | | | forward. | ||||
| * | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-13 | 6 | -1067/+997 |
| |\ \ | |||||
| | * \ | Merge pull request #323 from phellmes/de20160313 | redmatrix | 2016-03-14 | 2 | -859/+883 |
| | |\ \ | | | | | | | | | Update DE translation strings | ||||
| | | * | | Update DE translation strings | phellmes | 2016-03-13 | 2 | -859/+883 |
| | | | | | |||||
| | * | | | fix spacing | Mario Vavti | 2016-03-13 | 1 | -1/+6 |
| | | | | | |||||
| | * | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-03-13 | 10 | -381/+537 |
| | |\ \ \ | |||||
| | | * \ \ | Merge pull request #324 from ↵ | redmatrix | 2016-03-14 | 1 | -0/+14 |
| | | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | einervonvielen/install-script_add-hubsites_stop-hubzilla Install script: stop of apache, mysql | ||||
| | | | * | | Install script: Added plugin hubsites and stop of apache, mysql | EinerVonVielen | 2016-03-13 | 1 | -0/+14 |
| | | |/ / | |||||
| | | * | | Merge pull request #322 from einervonvielen/homeinstall_with_plugins | redmatrix | 2016-03-13 | 1 | -2/+72 |
| | | |\ \ | | | | | | | | | | | Added installation of extended plugins and themes to homeinstall script | ||||
| | | | * | | Added installation of extended plugins and themes to homeinstall script | EinerVonVielen | 2016-03-13 | 1 | -2/+72 |
| | | | |/ | |||||
| | * | | | more janitor work on profiles | Mario Vavti | 2016-03-13 | 3 | -206/+23 |
| | | | | | |||||
| * | | | | git update everything | redmatrix | 2016-03-13 | 2 | -1/+18 |
| | |/ / |/| | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |