aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextua...Andrew Manning2016-04-0347-742/+771
|\
| * show chat expiration time in overview and minor fixesMario Vavti2016-04-031-1/+1
| * Chat Rooms -> ChatroomsMario Vavti2016-04-011-1/+1
| * change the App constructorredmatrix2016-03-311-4/+1
| * create miniApp to convert existing settings files to the static App classredmatrix2016-03-315-51/+23
| * issue #336redmatrix2016-03-312-3/+6
| * Merge branch 'static'redmatrix2016-03-3142-528/+528
| |\
| | * static Appredmatrix2016-03-3142-528/+528
| * | various fixes regarding mod chatMario Vavti2016-03-311-1/+1
| * | mod chat rework continuedMario Vavti2016-03-311-0/+8
| |/
| * deprecate $a->get_baseurl()redmatrix2016-03-3019-133/+133
| * issue #319 - NOTE: this does not fix the issue, it only reports it and contin...redmatrix2016-03-303-10/+31
| * more on mod chatMario Vavti2016-03-301-0/+1
| * some work on mod chatMario Vavti2016-03-303-10/+11
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-261-6/+20
| |\
| | * removed link to connected apps by accidentMario Vavti2016-03-261-0/+6
| | * Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-03-263-252/+252
| | |\
| | * | move link to /locs to settings menu if we have more than one location and som...Mario Vavti2016-03-261-6/+14
| * | | issue #319 part 2redmatrix2016-03-261-9/+11
| | |/ | |/|
| * | add hook to allow plugins to perform a follow activity from an activityfeedredmatrix2016-03-231-4/+14
* | | Search docs/context/ hierarchically for help.html files to reduce redundancyAndrew Manning2016-03-261-2/+7
* | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextua...Andrew Manning2016-03-239-484/+321
|\| |
| * | atom specifies a uri or iri for the id. message_id isn't suitable here.redmatrix2016-03-232-4/+5
| * | rewrite the webfinger discovery logicredmatrix2016-03-222-244/+233
| |/
| * update network_to_name (reserve DFRN for future use)redmatrix2016-03-211-10/+12
| * attempting to work with braindead lighttpd gnusocial serversredmatrix2016-03-211-2/+20
| * more federation workredmatrix2016-03-202-32/+28
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-201-0/+16
| |\
| | * fix #328 by using a seperate query instead of group_concatMario Vavti2016-03-201-0/+16
| * | rework salmon - important, update addons also if you have enabled gnusoc addonredmatrix2016-03-201-196/+0
| |/
| * make the admin side menu extensible and provide a hook for a channel "move" o...redmatrix2016-03-192-5/+16
* | Override navbar help button to open contextual help panel. Contextual help fo...Andrew Manning2016-03-211-3/+8
|/
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-171-1/+9
|\
| * See issue https://github.com/redmatrix/hubzilla-addons/issues/17 (UNO: enable...jeroenpraat2016-03-171-1/+9
* | no xchan here if using zot protocolredmatrix2016-03-172-2/+4
|/
* typoredmatrix2016-03-161-1/+1
* more federation backendredmatrix2016-03-162-7/+4
* lots of work on federated channel discoveryredmatrix2016-03-163-65/+283
* more federation backend workredmatrix2016-03-151-4/+39
* some heavy lifting porting the old salmon coderedmatrix2016-03-151-0/+201
* federation workredmatrix2016-03-142-10/+25
* some re-working of webfinger and hcard parsing which will be necessary going ...redmatrix2016-03-141-10/+33
* 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-121-1/+11
|\
| * some janitor work on profilesMario Vavti2016-03-121-1/+11
* | some minor cleanupsredmatrix2016-03-102-2/+2
|/
* UNO: Hide bookmark tools in items (#^ and in menu)jeroenpraat2016-03-102-1/+6
* handle UNO move channel operationredmatrix2016-03-092-4/+65
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-091-1/+1
|\
| * Issue #316 make /display updates work. Basically copy and paste what we do on...Mario Vavti2016-03-091-1/+1