Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Merge pull request #283 from phellmes/connedit | redmatrix | 2016-02-16 | 1 | -32/+34 | |
| |\ \ | | | | | | | | | Add string translation to auto approval option | |||||
| | * | | Add string translation to auto approval option | phellmes | 2016-02-15 | 1 | -32/+34 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Make the description for the auto-approval option translatable. Put the switch array of that option (with another missing t-funtion) into a $yes_no variable to be consistent with other settings pages. | |||||
| * | | | clean up some unused stuff and start loading content a bit earlier | Mario Vavti | 2016-02-15 | 1 | -25/+2 | |
| |/ / | ||||||
* / / | update fr strings from transifex | redmatrix | 2016-02-15 | 4 | -7055/+8913 | |
|/ / | ||||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-14 | 5 | -1791/+1826 | |
|\ \ | ||||||
| * | | Spanish and Dutch string update | jeroenpraat | 2016-02-14 | 4 | -1790/+1824 | |
| | | | ||||||
| * | | Merge pull request #282 from royalterra/master | redmatrix | 2016-02-14 | 1 | -1/+2 | |
| |\ \ | | | | | | | | | add https://blablanet.es faillback server | |||||
| | * | | add https://blablanet.es faillback server | royalterra | 2016-02-13 | 1 | -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} | |||||
* / / | form cleanup (profile_photo and cover_photo), admin 'user_approve' not ↵ | redmatrix | 2016-02-14 | 7 | -115/+139 | |
|/ / | | | | | | | found, missing close div in mood_content.tpl | |||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-12 | 6 | -7/+516 | |
|\ \ | ||||||
| * | | don't confuse people with matrix | Jeroen van Riet Paap | 2016-02-12 | 1 | -3/+3 | |
| | | | ||||||
| * | | https://blablanet.es/siteinfo/json reports itself as directory_mode ↵ | Mario Vavti | 2016-02-12 | 1 | -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 Vavti | 2016-02-12 | 4 | -3/+513 | |
| | | | | | | | | | | | | some detailed logging in js-console | |||||
* | | | directory modes reversed | redmatrix | 2016-02-12 | 3 | -817/+831 | |
|/ / | ||||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-11 | 1 | -0/+1 | |
|\ \ | ||||||
| * \ | Merge pull request #278 from royalterra/master | redmatrix | 2016-02-12 | 1 | -0/+1 | |
| |\ \ | | | | | | | | | Update boot.php Add Failback Server blablanet.es | |||||
| | * \ | Merge pull request #1 from royalterra/royalterra-patch-1 | royalterra | 2016-02-11 | 1 | -0/+1 | |
| | |\ \ | | | | | | | | | | | Update boot.php Failback Server blablanet.es | |||||
| | | * | | Update boot.php Failback Server blablanet.es | royalterra | 2016-02-11 | 1 | -0/+1 | |
| | |/ / | | | | | | | | | This HUB is running us fallback many months us fallback server | |||||
* | / / | whitespace | redmatrix | 2016-02-11 | 2 | -1/+2 | |
|/ / / | ||||||
* | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-11 | 1 | -74/+94 | |
|\| | | ||||||
| * | | update readmore.js to a more recent version | Mario Vavti | 2016-02-11 | 1 | -74/+94 | |
| | | | ||||||
* | | | guest photo upload failing when js_upload is in use due to non-existent acl ↵ | redmatrix | 2016-02-11 | 3 | -2/+10 | |
|/ / | | | | | | | parameters | |||||
* | | feed dates are always UTC. This means we will need another mechanism to pass ↵ | redmatrix | 2016-02-10 | 1 | -2/+2 | |
| | | | | | | | | localised dates to items_fetch() | |||||
* | | feed dates weren't being honoured. When that was fixed they turned out to be ↵ | redmatrix | 2016-02-10 | 2 | -3/+5 | |
| | | | | | | | | reversed. | |||||
* | | put a sane lower time limit on content search for public feed requests | redmatrix | 2016-02-10 | 1 | -0/+6 | |
| | | ||||||
* | | hook changes to support pubsubhubbub | redmatrix | 2016-02-10 | 3 | -5/+33 | |
| | | ||||||
* | | rev update | redmatrix | 2016-02-10 | 2 | -1/+2 | |
| | | ||||||
* | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | jeroenpraat | 2016-02-09 | 2 | -30/+26 | |
|\ \ | ||||||
| * \ | Merge pull request #276 from phellmes/invite | git-marijus | 2016-02-09 | 2 | -30/+26 | |
| |\ \ | | | | | | | | | Invite module UI and strings update | |||||
| | * | | [invite module] remove trailing spaces from translatable strings | phellmes | 2016-02-09 | 1 | -6/+6 | |
| | | | | ||||||
| | * | | [invite module] update UI template | phellmes | 2016-02-09 | 1 | -24/+20 | |
| |/ / | ||||||
* / / | Castellano and Nederlands string updates | jeroenpraat | 2016-02-09 | 4 | -4010/+4152 | |
|/ / | ||||||
* | | need to re-arrange a few things for a short vcard | redmatrix | 2016-02-08 | 2 | -1/+46 | |
| | | ||||||
* | | lots more zcard tweaks | redmatrix | 2016-02-08 | 6 | -20/+57 | |
| | | ||||||
* | | duplicated lines in en config file | redmatrix | 2016-02-08 | 1 | -10/+0 | |
| | | ||||||
* | | make yet another recommended security header optional - this time because of ↵ | redmatrix | 2016-02-08 | 12 | -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 again | redmatrix | 2016-02-08 | 2 | -11/+7 | |
| | | ||||||
* | | Revert "sort out the well-known acme-challenge mess - at least on apache" | redmatrix | 2016-02-08 | 3 | -6/+12 | |
| | | | | | | | | This reverts commit be99c7fe12cc68bba1716a0b708bb171cfd223e6. | |||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-08 | 2 | -3/+2 | |
|\ \ | ||||||
| * | | avoid collapsing only above the viewport | Mario Vavti | 2016-02-08 | 2 | -3/+2 | |
| | | | ||||||
* | | | sort out the well-known acme-challenge mess - at least on apache | redmatrix | 2016-02-08 | 3 | -12/+6 | |
|/ / | ||||||
* | | a few tweaks to uno settings page to allow a default ACL to be created | redmatrix | 2016-02-07 | 2 | -1/+8 | |
| | | ||||||
* | | change register workflow if uno is set | redmatrix | 2016-02-07 | 1 | -1/+1 | |
| | | ||||||
* | | provide get_server_role() to abstract different roles and capabilities | redmatrix | 2016-02-07 | 4 | -2/+9 | |
| | | ||||||
* | | block public was still referenced in admin/site template | redmatrix | 2016-02-07 | 1 | -1/+0 | |
| | | ||||||
* | | update UI template for 'mood' module | redmatrix | 2016-02-07 | 2 | -8/+19 | |
| | | ||||||
* | | fix uno import by disabling for now | redmatrix | 2016-02-05 | 2 | -1/+10 | |
| | | ||||||
* | | uno stuff | redmatrix | 2016-02-05 | 3 | -11/+17 | |
| | | ||||||
* | | more uno groundwork | redmatrix | 2016-02-05 | 5 | -4/+12 | |
| | | ||||||
* | | rev update | redmatrix | 2016-02-05 | 5 | -1465/+1528 | |
| | |