aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* typoredmatrix2016-03-161-1/+1
|
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-165-395/+260
|\
| * Merge pull request #327 from anaqreon/ownmapp-typogit-marijus2016-03-161-1/+1
| |\ | | | | | | Misspelling of ownMapp in homeinstall script
| | * Misspelling of ownMappAndrew Manning2016-03-151-1/+1
| | |
| * | move buttons to dropdown menu and some cleanupMario Vavti2016-03-164-234/+242
| | |
| * | still more janitor work on profilesMario Vavti2016-03-162-185/+42
| | |
* | | more federation backendredmatrix2016-03-162-7/+4
| | |
* | | lots of work on federated channel discoveryredmatrix2016-03-168-70/+303
|/ /
* | more federation backend workredmatrix2016-03-151-4/+39
| |
* | even more janitor work on profilesMario Vavti2016-03-152-18/+8
|/
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-154-766/+764
|\
| * Merge branch 'master' of https://github.com/redmatrix/hubzillajeroenpraat2016-03-1419-1510/+1495
| |\
| * | update nl + es-es stringsjeroenpraat2016-03-144-766/+764
| | |
* | | some heavy lifting porting the old salmon coderedmatrix2016-03-153-1/+211
| | |
* | | federation workredmatrix2016-03-142-10/+25
| | |
* | | some re-working of webfinger and hcard parsing which will be necessary going ↵redmatrix2016-03-143-18/+58
| |/ |/| | | | | forward.
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-136-1067/+997
|\ \
| * \ Merge pull request #323 from phellmes/de20160313redmatrix2016-03-142-859/+883
| |\ \ | | | | | | | | Update DE translation strings
| | * | Update DE translation stringsphellmes2016-03-132-859/+883
| | | |
| * | | fix spacingMario Vavti2016-03-131-1/+6
| | | |
| * | | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-03-1310-381/+537
| |\ \ \
| | * \ \ Merge pull request #324 from ↵redmatrix2016-03-141-0/+14
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | einervonvielen/install-script_add-hubsites_stop-hubzilla Install script: stop of apache, mysql
| | | * | Install script: Added plugin hubsites and stop of apache, mysqlEinerVonVielen2016-03-131-0/+14
| | |/ /
| | * | Merge pull request #322 from einervonvielen/homeinstall_with_pluginsredmatrix2016-03-131-2/+72
| | |\ \ | | | | | | | | | | Added installation of extended plugins and themes to homeinstall script
| | | * | Added installation of extended plugins and themes to homeinstall scriptEinerVonVielen2016-03-131-2/+72
| | | |/
| * | | more janitor work on profilesMario Vavti2016-03-133-206/+23
| | | |
* | | | git update everythingredmatrix2016-03-132-1/+18
| |/ / |/| |
* | | issue #320 - regression, after removing channel attached to an authenticated ↵redmatrix2016-03-123-30/+34
| | | | | | | | | | | | session the session was not completely cleared.
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-126-66/+31
|\| |
| * | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-03-121-2/+2
| |\ \
| | * \ Merge pull request #321 from einervonvielen/fix_german_help_link_to_githubJeroen van Riet Paap2016-03-121-2/+2
| | |\ \ | | | |/ | | |/| Fix: german help > link to of project in github
| | | * Fix: German help > link to of project in github. The link Pointed toEinerVonVielen2016-03-121-2/+2
| | | | | | | | | | | | | | | | redmatrix. Now the link points to hubzilla.
| * | | some janitor work on profilesMario Vavti2016-03-124-63/+29
| |/ /
| * | remove superfluous returnMario Vavti2016-03-111-1/+0
| | |
* | | provide service federation overview - how to go about it and the appropriate ↵redmatrix2016-03-123-346/+413
| | | | | | | | | | | | places to attach your plugin.
* | | some minor cleanupsredmatrix2016-03-104-4/+5
|/ /
* | UNO: Hide bookmark tools in items (#^ and in menu)jeroenpraat2016-03-102-1/+6
| |
* | we've come a long way since this faq entry on the limits of cloning was writtenredmatrix2016-03-091-1/+1
| |
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-091-2/+2
|\ \
| * | Update docjeroenpraat2016-03-091-2/+2
| | |
* | | handle UNO move channel operationredmatrix2016-03-093-15/+74
|/ /
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-093-5/+50
|\ \
| * \ Merge pull request #318 from git-marijus/masterredmatrix2016-03-101-1/+1
| |\ \ | | | | | | | | should have probably done that on tag release
| | * | should have probably done that on tag releaseMario Vavti2016-03-091-1/+1
| | | |
| * | | Merge pull request #317 from git-marijus/masterredmatrix2016-03-092-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 Vavti2016-03-092-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 ↵redmatrix2016-03-091-1/+1
| | | | | | | | | | | | trying to change the default schema for a channel
* | | work on implementing account/channel move (as opposed to clone)redmatrix2016-03-096-25/+30
|/ /
* | isue #315redmatrix2016-03-081-0/+3
| |
* | move "generator" to HttpMetaredmatrix2016-03-082-2/+2
| |