Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | h1>h2 (thanks to Mario) and help text below label on register page (like on ↵ | jeroenpraat | 2016-02-18 | 4 | -7/+10 | |
| | | | | | | | | | | | | | | | | new channel). | |||||
| * | | | Removed export temporary from UNO. Removed 'Remove Channel' from UNO, cause ↵ | jeroenpraat | 2016-02-18 | 4 | -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/master | Wave | 2016-02-18 | 2 | -2549/+2637 | |
| |\ \ \ | | |/ / | |/| / | | |/ | updated Italian strings | |||||
| | * | updated Italian strings | Paolo Tacconi | 2016-02-18 | 2 | -2549/+2637 | |
| | | | ||||||
| * | | some necessary doco for set_iconfig() | redmatrix | 2016-02-18 | 1 | -0/+16 | |
| | | | ||||||
| * | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-18 | 1 | -0/+6 | |
| |\ \ | ||||||
| | * \ | Merge pull request #285 from anaqreon/master | redmatrix | 2016-02-18 | 1 | -0/+6 | |
| | |\ \ | | | | | | | | | | | Added the installation of curl to the .homeinstall script | |||||
| | | * | | Added the installation of curl to the .homeinstall script | Andrew Manning | 2016-02-17 | 1 | -0/+6 | |
| | |/ / | ||||||
| * / / | iconfig - add sharing variable | redmatrix | 2016-02-18 | 5 | -13/+30 | |
| |/ / | ||||||
| * | | this qualifies as an interface change | redmatrix | 2016-02-17 | 1 | -1/+1 | |
| | | | ||||||
| * | | schema updates for iconfig | redmatrix | 2016-02-17 | 4 | -2/+63 | |
| | | | ||||||
| * | | Merge branch 'iconfig' | redmatrix | 2016-02-17 | 2 | -3/+231 | |
| |\ \ | ||||||
| | * | | provide del_iconfig for completeness | redmatrix | 2016-02-17 | 1 | -0/+34 | |
| | | | | ||||||
| | * | | iconfig debugging - federation now working | redmatrix | 2016-02-17 | 1 | -1/+2 | |
| | | | | ||||||
| | * | | iconfig debugging | redmatrix | 2016-02-17 | 2 | -4/+10 | |
| | | | | ||||||
| | * | | slight changes to set_iconfig - if passed an item structure only update the ↵ | redmatrix | 2016-02-16 | 1 | -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 iconfig | redmatrix | 2016-02-16 | 1 | -5/+75 | |
| | | | | ||||||
| | * | | some iconfig basics | redmatrix | 2016-02-16 | 1 | -0/+137 | |
| | | | | ||||||
| * | | | format atom event renderings so they are reasonably compatible with GNU-social | redmatrix | 2016-02-17 | 1 | -2/+15 | |
| | | | | ||||||
| * | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-17 | 9 | -13/+30 | |
| |\ \ \ | ||||||
| | * | | | More clarification about privacy of private content. Changed Channel Name to ↵ | jeroenpraat | 2016-02-17 | 4 | -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 description | Mario Vavti | 2016-02-17 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | make always preload images before rendering the page a display setting | Mario Vavti | 2016-02-17 | 5 | -7/+19 | |
| | | | | | ||||||
| | * | | | more refinement on collapsing | Mario Vavti | 2016-02-17 | 1 | -2/+6 | |
| | | | | | ||||||
| * | | | | add ca help files (per Paco) | redmatrix | 2016-02-17 | 15 | -0/+608 | |
| | | | | | ||||||
| * | | | | revup | redmatrix | 2016-02-17 | 1 | -1/+1 | |
| |/ / / | ||||||
| * | | | allow admin to set and lock features when UNO is enabled | redmatrix | 2016-02-16 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | allow redirection to site workflow page even if auto channel create is applied | redmatrix | 2016-02-16 | 1 | -3/+4 | |
| | | | | ||||||
| * | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-16 | 5 | -5/+10 | |
| |\ \ \ | ||||||
| | * | | | @hubdomain also for auto-create-channel + adding css wrapper (ongoing work) | jeroenpraat | 2016-02-16 | 4 | -2/+7 | |
| | | | | | ||||||
| | * | | | Thats probably better but there are still edge cases... | Mario Vavti | 2016-02-16 | 1 | -2/+2 | |
| | | | | | ||||||
| | * | | | typo | Mario Vavti | 2016-02-16 | 1 | -1/+1 | |
| | |/ / | ||||||
| * / / | revup | redmatrix | 2016-02-16 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | content -> viewport | Mario Vavti | 2016-02-16 | 1 | -1/+1 | |
| | | | ||||||
| * | | only prefetch images on update_mode update | Mario Vavti | 2016-02-16 | 1 | -29/+54 | |
| | | | ||||||
| * | | since we preload images now we also can collapse and calculate posts above ↵ | Mario Vavti | 2016-02-16 | 1 | -25/+43 | |
| | | | | | | | | | | | | the viewport | |||||
| * | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-15 | 2 | -57/+36 | |
| |\ \ | ||||||
| | * \ | 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 remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-02-13 | 9 | -824/+1347 | |
|\| | | ||||||
| * | | 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. |