aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #282 from royalterra/masterredmatrix2016-02-141-1/+2
|\ | | | | add https://blablanet.es faillback server
| * add https://blablanet.es faillback serverroyalterra2016-02-131-1/+2
|/ | | {"version":"2016-02-12.1307H","version_tag":"1.2.2","server_role":"advanced","commit":"dd2d123","url":"https:\/\/blablanet.es","plugins":["b2tbtn","bookmarker","chess","dfedfix","diaspora","diaspost","dirstats","donar","jappixmini","libertree","ljpost","mailhost","mchat","metatag","noticias","pgpkey","pumpio","sendzid","smiley_pack","smileybutton","statistics","statistics_json","status","statusnet","twitter","wholikesme","wppost","xmpp","xmppac"],"register_policy":"REGISTER_OPEN","invitation_only":0,"directory_mode":"DIRECTORY_MODE_SECONDARY","language":"es","rss_connections":1,"expiration":0,"default_service_restrictions":false,"locked_features":[],"admin":[{"name":"BlaBlanet-ES","address":"blablanet-es@blablanet.es","channel":"https:\/\/blablanet.es\/channel\/blablanet-es"}],"site_name":"BlablaNet Espa\u00f1a donde est\u00e1n tus amigos, Tu Red Social","platform":"BlaBlaNet","dbdriver":"mysqli","lastpoll":"2016-02-13 14:39:07","info":"","channels_total":29,"channels_active_halfyear":26,"channels_active_monthly":11,"local_posts":6600,"hide_in_statistics":0}
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-126-7/+516
|\
| * don't confuse people with matrixJeroen van Riet Paap2016-02-121-3/+3
| |
| * https://blablanet.es/siteinfo/json reports itself as directory_mode ↵Mario Vavti2016-02-121-1/+0
| | | | | | | | DIRECTORY_MODE_PRIMARY. AFAIK this should not be the case as we can only have one primary per realm.
| * tryout: introduce loading of images before rendering content and provide ↵Mario Vavti2016-02-124-3/+513
| | | | | | | | some detailed logging in js-console
* | directory modes reversedredmatrix2016-02-123-817/+831
|/
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-111-0/+1
|\
| * Merge pull request #278 from royalterra/masterredmatrix2016-02-121-0/+1
| |\ | | | | | | Update boot.php Add Failback Server blablanet.es
| | * Merge pull request #1 from royalterra/royalterra-patch-1royalterra2016-02-111-0/+1
| | |\ | | | | | | | | Update boot.php Failback Server blablanet.es
| | | * Update boot.php Failback Server blablanet.esroyalterra2016-02-111-0/+1
| | |/ | | | | | | This HUB is running us fallback many months us fallback server
* | / whitespaceredmatrix2016-02-112-1/+2
|/ /
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-111-74/+94
|\|
| * update readmore.js to a more recent versionMario Vavti2016-02-111-74/+94
| |
* | guest photo upload failing when js_upload is in use due to non-existent acl ↵redmatrix2016-02-113-2/+10
|/ | | | parameters
* feed dates are always UTC. This means we will need another mechanism to pass ↵redmatrix2016-02-101-2/+2
| | | | localised dates to items_fetch()
* feed dates weren't being honoured. When that was fixed they turned out to be ↵redmatrix2016-02-102-3/+5
| | | | reversed.
* put a sane lower time limit on content search for public feed requestsredmatrix2016-02-101-0/+6
|
* hook changes to support pubsubhubbubredmatrix2016-02-103-5/+33
|
* rev updateredmatrix2016-02-102-1/+2
|
* Merge branch 'master' of https://github.com/redmatrix/hubzillajeroenpraat2016-02-092-30/+26
|\
| * Merge pull request #276 from phellmes/invitegit-marijus2016-02-092-30/+26
| |\ | | | | | | Invite module UI and strings update
| | * [invite module] remove trailing spaces from translatable stringsphellmes2016-02-091-6/+6
| | |
| | * [invite module] update UI templatephellmes2016-02-091-24/+20
| |/
* / Castellano and Nederlands string updatesjeroenpraat2016-02-094-4010/+4152
|/
* need to re-arrange a few things for a short vcardredmatrix2016-02-082-1/+46
|
* lots more zcard tweaksredmatrix2016-02-086-20/+57
|
* duplicated lines in en config fileredmatrix2016-02-081-10/+0
|
* make yet another recommended security header optional - this time because of ↵redmatrix2016-02-0812-1/+107
| | | | piwik. Personally I think if you want to track people you really don't understand this project and its history, but whatever....
* try that patch againredmatrix2016-02-082-11/+7
|
* Revert "sort out the well-known acme-challenge mess - at least on apache"redmatrix2016-02-083-6/+12
| | | | This reverts commit be99c7fe12cc68bba1716a0b708bb171cfd223e6.
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-082-3/+2
|\
| * avoid collapsing only above the viewportMario Vavti2016-02-082-3/+2
| |
* | sort out the well-known acme-challenge mess - at least on apacheredmatrix2016-02-083-12/+6
|/
* a few tweaks to uno settings page to allow a default ACL to be createdredmatrix2016-02-072-1/+8
|
* change register workflow if uno is setredmatrix2016-02-071-1/+1
|
* provide get_server_role() to abstract different roles and capabilitiesredmatrix2016-02-074-2/+9
|
* block public was still referenced in admin/site templateredmatrix2016-02-071-1/+0
|
* update UI template for 'mood' moduleredmatrix2016-02-072-8/+19
|
* fix uno import by disabling for nowredmatrix2016-02-052-1/+10
|
* uno stuffredmatrix2016-02-053-11/+17
|
* more uno groundworkredmatrix2016-02-055-4/+12
|
* rev updateredmatrix2016-02-055-1465/+1528
|
* remove blackout setting now that the keepout plugin performs the same tasks ↵redmatrix2016-02-041-3/+0
| | | | (plus a lot more)
* initial uno configredmatrix2016-02-0414-10/+37
|
* will probably need this to make it workredmatrix2016-02-041-1/+1
|
* make strict transport security header optionalredmatrix2016-02-042-1/+3
|
* comment buttons hookredmatrix2016-02-042-0/+7
|
* update docsredmatrix2016-02-041-0/+2
|
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-041-0/+4
|\