aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* erge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-03-210-0/+0
|\
| * Merge pull request #329 from git-marijus/masterredmatrix2016-03-213-13/+31
| |\
* | | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-03-202-3/+3
|\| | | |/ |/|
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-208-1161/+1181
| |\
| * | issue #330 - permit archived connections in ACLs. If they are to be blocked f...redmatrix2016-03-202-3/+3
* | | an attempt to visualize the supremacy of dont show over show in the acl selectorMario Vavti2016-03-201-4/+9
* | | fix #328 by using a seperate query instead of group_concatMario Vavti2016-03-202-9/+22
| |/ |/|
* | Update NL + es_ES strings.jeroenpraat2016-03-204-1151/+1163
* | add fixmeMario Vavti2016-03-201-1/+3
* | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-03-206-448/+458
|\|
| * make the admin side menu extensible and provide a hook for a channel "move" o...redmatrix2016-03-196-448/+458
* | make >>indicate group members<< in acl selector work again on group > show or...Mario Vavti2016-03-203-9/+15
|/
* missing return false for map linkMario Vavti2016-03-191-1/+1
* add use as cover photo link to photos viewMario Vavti2016-03-182-14/+34
* change rev1.3.1redmatrix2016-03-171-1/+1
* SECURITY: DAV authentication issueredmatrix2016-03-171-1/+1
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-1711-261/+325
|\
| * See issue https://github.com/redmatrix/hubzilla-addons/issues/17 (UNO: enable...jeroenpraat2016-03-171-1/+9
| * some work on profile listingMario Vavti2016-03-176-71/+65
| * bring more structure to profiles editMario Vavti2016-03-177-191/+253
* | no xchan here if using zot protocolredmatrix2016-03-173-3/+5
|/
* 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 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
| |/ |/|
* | 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 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 einervonvielen/install-script_add-hubsites_stop-...redmatrix2016-03-141-0/+14
| | |\ \ \ | | | |/ / | | |/| |
| | | * | 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 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
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-126-66/+31
|\| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 17:56:53 +0000