Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | various fixes regarding mod chat | Mario Vavti | 2016-03-31 | 4 | -13/+19 |
| | |||||
* | mod chat rework continued | Mario Vavti | 2016-03-31 | 10 | -26/+103 |
| | |||||
* | deprecate $a->get_baseurl() | redmatrix | 2016-03-30 | 80 | -397/+397 |
| | |||||
* | change primary directory | redmatrix | 2016-03-30 | 1 | -2/+1 |
| | |||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-30 | 6 | -106/+184 |
|\ | |||||
| * | more work on mod chat | Mario Vavti | 2016-03-31 | 6 | -106/+184 |
| | | |||||
* | | issue #319 - NOTE: this does not fix the issue, it only reports it and ↵ | redmatrix | 2016-03-30 | 4 | -11/+32 |
|/ | | | | continues. We need to examine any logger statements that contain 'stack:' as a result of reporting this issue and find and fix the original problem - which is that set_pconfig is being called without a valid $uid. I'm worried that since we will now continue on without throwing a PHP error that nobody will ever notice or find the problem that is causing this. | ||||
* | more on mod chat | Mario Vavti | 2016-03-30 | 4 | -11/+17 |
| | |||||
* | some work on mod chat | Mario Vavti | 2016-03-30 | 13 | -75/+142 |
| | |||||
* | add page title to the html title | redmatrix | 2016-03-29 | 2 | -1/+4 |
| | |||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-28 | 7 | -303/+323 |
|\ | |||||
| * | highlight table row on hover | Mario Vavti | 2016-03-27 | 2 | -1/+2 |
| | | |||||
| * | Update es_es+n. Switch the feeds as requested by Mike. | jeroenpraat | 2016-03-27 | 5 | -302/+321 |
| | | |||||
* | | revup | redmatrix | 2016-03-28 | 1 | -1/+1 |
|/ | |||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-26 | 11 | -632/+688 |
|\ | |||||
| * | Small, but I think useful hack. Added a top posts only atom feed, so people ↵ | jeroenpraat | 2016-03-26 | 1 | -1/+2 |
| | | | | | | | | can choose directly from their browser which feed they need. | ||||
| * | removed link to connected apps by accident | Mario Vavti | 2016-03-26 | 2 | -2/+8 |
| | | |||||
| * | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-03-26 | 8 | -830/+852 |
| |\ | |||||
| | * | Merge pull request #333 from phellmes/de20160324 | git-marijus | 2016-03-25 | 2 | -574/+580 |
| | |\ | | | | | | | | | Update DE translation strings | ||||
| | | * | Update DE translation strings | phellmes | 2016-03-24 | 2 | -574/+580 |
| | | | | |||||
| * | | | move link to /locs to settings menu if we have more than one location and ↵ | Mario Vavti | 2016-03-26 | 8 | -57/+100 |
| | | | | | | | | | | | | | | | | some template work on locs | ||||
* | | | | issue #319 part 2 | redmatrix | 2016-03-26 | 3 | -143/+154 |
| |/ / |/| | | |||||
* | | | revup | redmatrix | 2016-03-24 | 1 | -1/+1 |
| |/ |/| | |||||
* | | add hook to allow plugins to perform a follow activity from an activityfeed | redmatrix | 2016-03-23 | 1 | -4/+14 |
| | | |||||
* | | atom specifies a uri or iri for the id. message_id isn't suitable here. | redmatrix | 2016-03-23 | 3 | -5/+6 |
| | | |||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-22 | 5 | -837/+847 |
|\| | |||||
| * | Merge pull request #332 from wave72/master | Wave | 2016-03-22 | 2 | -836/+841 |
| |\ | | | | | | | Updated Italian strings | ||||
| | * | Updated Italian strings | Paolo Tacconi | 2016-03-22 | 2 | -836/+841 |
| | | | |||||
| * | | Add a link to /locs to channel manager | Mario Vavti | 2016-03-22 | 3 | -1/+6 |
| | | | |||||
* | | | rewrite the webfinger discovery logic | redmatrix | 2016-03-22 | 5 | -248/+253 |
|/ / | |||||
* | | update network_to_name (reserve DFRN for future use) | redmatrix | 2016-03-21 | 2 | -11/+15 |
| | | |||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-21 | 4 | -100/+95 |
|\ \ | |||||
| * | | whip mod manage into shape | Mario Vavti | 2016-03-22 | 4 | -100/+95 |
| | | | |||||
* | | | attempting to work with braindead lighttpd gnusocial servers | redmatrix | 2016-03-21 | 2 | -3/+21 |
|/ / | |||||
* | | more federation work | redmatrix | 2016-03-20 | 2 | -32/+28 |
| | | |||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-20 | 3 | -13/+31 |
|\ \ | |||||
| * \ | erge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-03-21 | 0 | -0/+0 |
| |\ \ | |||||
| | * \ | Merge pull request #329 from git-marijus/master | redmatrix | 2016-03-21 | 3 | -13/+31 |
| | |\ \ | | | | | | | | | | | fix #328 by using a seperate query instead of group_concat | ||||
| * | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-03-20 | 2 | -3/+3 |
| |\| | | | | |/ / | |/| | | |||||
| * | | | an attempt to visualize the supremacy of dont show over show in the acl selector | Mario Vavti | 2016-03-20 | 1 | -4/+9 |
| | | | | |||||
| * | | | fix #328 by using a seperate query instead of group_concat | Mario Vavti | 2016-03-20 | 2 | -9/+22 |
| | | | | |||||
* | | | | rework salmon - important, update addons also if you have enabled gnusoc addon | redmatrix | 2016-03-20 | 3 | -207/+2 |
| |/ / |/| | | |||||
* | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-20 | 8 | -1161/+1181 |
|\| | | |||||
| * | | Update NL + es_ES strings. | jeroenpraat | 2016-03-20 | 4 | -1151/+1163 |
| | | | |||||
| * | | add fixme | Mario Vavti | 2016-03-20 | 1 | -1/+3 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-03-20 | 6 | -448/+458 |
| |\ \ | |||||
| * | | | make >>indicate group members<< in acl selector work again on group > show ↵ | Mario Vavti | 2016-03-20 | 3 | -9/+15 |
| | | | | | | | | | | | | | | | | or group > dont show is selected | ||||
* | | | | issue #330 - permit archived connections in ACLs. If they are to be blocked ↵ | redmatrix | 2016-03-20 | 2 | -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" ↵ | redmatrix | 2016-03-19 | 6 | -448/+458 |
|/ / | | | | | | | operation that federation plugins might use to re-establish connections after a channel move. | ||||
* | | missing return false for map link | Mario Vavti | 2016-03-19 | 1 | -1/+1 |
| | |