aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-1855-11648/+14661
|\
| * h1>h2 (thanks to Mario) and help text below label on register page (like on ↵jeroenpraat2016-02-184-7/+10
| | | | | | | | new channel).
| * Removed export temporary from UNO. Removed 'Remove Channel' from UNO, cause ↵jeroenpraat2016-02-184-11/+22
| | | | | | | | a UNO member has only 1 channel, so it's logical to remove the acccount (by experience on UNO hub). Styling oauth settings.
| * Merge pull request #286 from wave72/masterWave2016-02-182-2549/+2637
| |\ | | | | | | updated Italian strings
| | * updated Italian stringsPaolo Tacconi2016-02-182-2549/+2637
| | |
| * | some necessary doco for set_iconfig()redmatrix2016-02-181-0/+16
| | |
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-181-0/+6
| |\ \
| | * \ Merge pull request #285 from anaqreon/masterredmatrix2016-02-181-0/+6
| | |\ \ | | | | | | | | | | Added the installation of curl to the .homeinstall script
| | | * | Added the installation of curl to the .homeinstall scriptAndrew Manning2016-02-171-0/+6
| | |/ /
| * / / iconfig - add sharing variableredmatrix2016-02-185-13/+30
| |/ /
| * | this qualifies as an interface changeredmatrix2016-02-171-1/+1
| | |
| * | schema updates for iconfigredmatrix2016-02-174-2/+63
| | |
| * | Merge branch 'iconfig'redmatrix2016-02-172-3/+231
| |\ \
| | * | provide del_iconfig for completenessredmatrix2016-02-171-0/+34
| | | |
| | * | iconfig debugging - federation now workingredmatrix2016-02-171-1/+2
| | | |
| | * | iconfig debuggingredmatrix2016-02-172-4/+10
| | | |
| | * | slight changes to set_iconfig - if passed an item structure only update the ↵redmatrix2016-02-161-33/+13
| | | | | | | | | | | | | | | | structure. Update the DB only if passed an item_id. This makes a clean separation of behaviour that's easy to document. One could get into some weird situations the original way which tried to update and sync both.
| | * | more work on iconfigredmatrix2016-02-161-5/+75
| | | |
| | * | some iconfig basicsredmatrix2016-02-161-0/+137
| | | |
| * | | format atom event renderings so they are reasonably compatible with GNU-socialredmatrix2016-02-171-2/+15
| | | |
| * | | 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 remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-139-824/+1347
|\| |
| * | 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
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 21:56:55 +0000