aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update es_es+n. Switch the feeds as requested by Mike.jeroenpraat2016-03-275-302/+321
|
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-2611-632/+688
|\
| * Small, but I think useful hack. Added a top posts only atom feed, so people ↵jeroenpraat2016-03-261-1/+2
| | | | | | | | can choose directly from their browser which feed they need.
| * removed link to connected apps by accidentMario Vavti2016-03-262-2/+8
| |
| * Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-03-268-830/+852
| |\
| | * Merge pull request #333 from phellmes/de20160324git-marijus2016-03-252-574/+580
| | |\ | | | | | | | | Update DE translation strings
| | | * Update DE translation stringsphellmes2016-03-242-574/+580
| | | |
| * | | move link to /locs to settings menu if we have more than one location and ↵Mario Vavti2016-03-268-57/+100
| | | | | | | | | | | | | | | | some template work on locs
* | | | issue #319 part 2redmatrix2016-03-263-143/+154
| |/ / |/| |
* | | revupredmatrix2016-03-241-1/+1
| |/ |/|
* | add hook to allow plugins to perform a follow activity from an activityfeedredmatrix2016-03-231-4/+14
| |
* | 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 strings
| | * 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
| | |\ \ | | | | | | | | | | fix #328 by using a seperate query instead of group_concat
| * | | | 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 ↵Mario Vavti2016-03-203-9/+15
| | | | | | | | | | | | | | | | or group > dont show is selected
* | | | issue #330 - permit archived connections in ACLs. If they are to be blocked ↵redmatrix2016-03-202-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" ↵redmatrix2016-03-196-448/+458
|/ / | | | | | | operation that federation plugins might use to re-establish connections after a channel move.
* | 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: ↵jeroenpraat2016-03-171-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 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 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
| | | |