aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* various fixes regarding mod chatMario Vavti2016-03-314-13/+19
* mod chat rework continuedMario Vavti2016-03-3110-26/+103
* deprecate $a->get_baseurl()redmatrix2016-03-3080-397/+397
* change primary directoryredmatrix2016-03-301-2/+1
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-306-106/+184
|\
| * more work on mod chatMario Vavti2016-03-316-106/+184
* | issue #319 - NOTE: this does not fix the issue, it only reports it and contin...redmatrix2016-03-304-11/+32
|/
* more on mod chatMario Vavti2016-03-304-11/+17
* some work on mod chatMario Vavti2016-03-3013-75/+142
* add page title to the html titleredmatrix2016-03-292-1/+4
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-287-303/+323
|\
| * highlight table row on hoverMario Vavti2016-03-272-1/+2
| * Update es_es+n. Switch the feeds as requested by Mike.jeroenpraat2016-03-275-302/+321
* | revupredmatrix2016-03-281-1/+1
|/
* 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 c...jeroenpraat2016-03-261-1/+2
| * 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 stringsphellmes2016-03-242-574/+580
| * | | move link to /locs to settings menu if we have more than one location and som...Mario Vavti2016-03-268-57/+100
* | | | 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 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
|/ /
* | missing return false for map linkMario Vavti2016-03-191-1/+1