Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |/ / |/| | | |||||
* | | | issue #320 - regression, after removing channel attached to an authenticated ↵ | redmatrix | 2016-03-12 | 3 | -30/+34 |
| | | | | | | | | | | | | session the session was not completely cleared. | ||||
* | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-12 | 6 | -66/+31 |
|\| | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-03-12 | 1 | -2/+2 |
| |\ \ | |||||
| | * \ | Merge pull request #321 from einervonvielen/fix_german_help_link_to_github | Jeroen van Riet Paap | 2016-03-12 | 1 | -2/+2 |
| | |\ \ | | | |/ | | |/| | Fix: german help > link to of project in github | ||||
| | | * | Fix: German help > link to of project in github. The link Pointed to | EinerVonVielen | 2016-03-12 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | redmatrix. Now the link points to hubzilla. | ||||
| * | | | some janitor work on profiles | Mario Vavti | 2016-03-12 | 4 | -63/+29 |
| |/ / | |||||
| * | | remove superfluous return | Mario Vavti | 2016-03-11 | 1 | -1/+0 |
| | | | |||||
* | | | provide service federation overview - how to go about it and the appropriate ↵ | redmatrix | 2016-03-12 | 3 | -346/+413 |
| | | | | | | | | | | | | places to attach your plugin. | ||||
* | | | some minor cleanups | redmatrix | 2016-03-10 | 4 | -4/+5 |
|/ / | |||||
* | | UNO: Hide bookmark tools in items (#^ and in menu) | jeroenpraat | 2016-03-10 | 2 | -1/+6 |
| | | |||||
* | | we've come a long way since this faq entry on the limits of cloning was written | redmatrix | 2016-03-09 | 1 | -1/+1 |
| | | |||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-09 | 1 | -2/+2 |
|\ \ | |||||
| * | | Update doc | jeroenpraat | 2016-03-09 | 1 | -2/+2 |
| | | | |||||
* | | | handle UNO move channel operation | redmatrix | 2016-03-09 | 3 | -15/+74 |
|/ / | |||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-09 | 3 | -5/+50 |
|\ \ | |||||
| * \ | Merge pull request #318 from git-marijus/master | redmatrix | 2016-03-10 | 1 | -1/+1 |
| |\ \ | | | | | | | | | should have probably done that on tag release | ||||
| | * | | should have probably done that on tag release | Mario Vavti | 2016-03-09 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #317 from git-marijus/master | redmatrix | 2016-03-09 | 2 | -4/+49 |
| |\| | | | | | | | | | | Issue #316 make /display updates work. Basically copy and paste what … | ||||
| | * | | Issue #316 make /display updates work. Basically copy and paste what we do ↵ | Mario Vavti | 2016-03-09 | 2 | -4/+49 |
| |/ / | | | | | | | | | | on load and add $simple_update to the query. | ||||
* | | | issue #319 - make sure we have a local_channel() and an App::channel before ↵ | redmatrix | 2016-03-09 | 1 | -1/+1 |
| | | | | | | | | | | | | trying to change the default schema for a channel | ||||
* | | | work on implementing account/channel move (as opposed to clone) | redmatrix | 2016-03-09 | 6 | -25/+30 |
|/ / | |||||
* | | isue #315 | redmatrix | 2016-03-08 | 1 | -0/+3 |
| | | |||||
* | | move "generator" to HttpMeta | redmatrix | 2016-03-08 | 2 | -2/+2 |
| | |