aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Search docs/context/ hierarchically for help.html files to reduce redundancyAndrew Manning2016-03-266-42/+27
* Added help for post permissionsAndrew Manning2016-03-262-3/+4
* Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextua...Andrew Manning2016-03-2331-3052/+2924
|\
| * atom specifies a uri or iri for the id. message_id isn't suitable here.redmatrix2016-03-233-5/+6
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-225-837/+847
| |\
| | * Merge pull request #332 from wave72/masterWave2016-03-222-836/+841
| | |\
| | | * Updated Italian stringsPaolo Tacconi2016-03-222-836/+841
| | * | Add a link to /locs to channel managerMario Vavti2016-03-223-1/+6
| * | | rewrite the webfinger discovery logicredmatrix2016-03-225-248/+253
| |/ /
| * | update network_to_name (reserve DFRN for future use)redmatrix2016-03-212-11/+15
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-214-100/+95
| |\ \
| | * | whip mod manage into shapeMario Vavti2016-03-224-100/+95
| * | | attempting to work with braindead lighttpd gnusocial serversredmatrix2016-03-212-3/+21
| |/ /
| * | more federation workredmatrix2016-03-202-32/+28
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-203-13/+31
| |\ \
| | * \ 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
| | |\| | | | | | |/ / | | |/| |
| | * | | 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
| * | | | rework salmon - important, update addons also if you have enabled gnusoc addonredmatrix2016-03-203-207/+2
| | |/ / | |/| |
| * | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-208-1161/+1181
| |\| |
| | * | 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 >>indicate group members<< in acl selector work again on group > show or...Mario Vavti2016-03-203-9/+15
| * | | | issue #330 - permit archived connections in ACLs. If they are to be blocked f...redmatrix2016-03-202-3/+3
| | |/ / | |/| |
| * | | make the admin side menu extensible and provide a hook for a channel "move" o...redmatrix2016-03-196-448/+458
| |/ /
* | | Network page help with auto-scroll and element highlightingAndrew Manning2016-03-231-0/+26
* | | Override navbar help button to open contextual help panel. Contextual help fo...Andrew Manning2016-03-218-5/+108
|/ /
* | 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
|\ \