aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-179-13/+30
|\
| * More clarification about privacy of private content. Changed Channel Name to ↵jeroenpraat2016-02-174-5/+6
| | | | | | | | simply Name when registering/creating an account or channel. First time when people see this they get confused (by experience on my hubs). This will even be more with UNO.
| * Change descriptionMario Vavti2016-02-171-1/+1
| |
| * make always preload images before rendering the page a display settingMario Vavti2016-02-175-7/+19
| |
| * more refinement on collapsingMario Vavti2016-02-171-2/+6
| |
* | add ca help files (per Paco)redmatrix2016-02-1715-0/+608
| |
* | revupredmatrix2016-02-171-1/+1
|/
* allow admin to set and lock features when UNO is enabledredmatrix2016-02-161-1/+1
|
* allow redirection to site workflow page even if auto channel create is appliedredmatrix2016-02-161-3/+4
|
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-165-5/+10
|\
| * @hubdomain also for auto-create-channel + adding css wrapper (ongoing work)jeroenpraat2016-02-164-2/+7
| |
| * Thats probably better but there are still edge cases...Mario Vavti2016-02-161-2/+2
| |
| * typoMario Vavti2016-02-161-1/+1
| |
* | revupredmatrix2016-02-161-1/+1
|/
* content -> viewportMario Vavti2016-02-161-1/+1
|
* only prefetch images on update_mode updateMario Vavti2016-02-161-29/+54
|
* since we preload images now we also can collapse and calculate posts above ↵Mario Vavti2016-02-161-25/+43
| | | | the viewport
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-152-57/+36
|\
| * Merge pull request #283 from phellmes/conneditredmatrix2016-02-161-32/+34
| |\ | | | | | | Add string translation to auto approval option
| | * Add string translation to auto approval optionphellmes2016-02-151-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 earlierMario Vavti2016-02-151-25/+2
| |/
* / update fr strings from transifexredmatrix2016-02-154-7055/+8913
|/
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-145-1791/+1826
|\
| * Spanish and Dutch string updatejeroenpraat2016-02-144-1790/+1824
| |
| * 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}
* / form cleanup (profile_photo and cover_photo), admin 'user_approve' not ↵redmatrix2016-02-147-115/+139
|/ | | | found, missing close div in mood_content.tpl
* 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
|/