Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-01 | 10 | -50/+55 |
|\ | |||||
| * | fix js error and add id to field input block | Mario Vavti | 2016-03-01 | 2 | -2/+2 |
| | | |||||
| * | fix padding | Mario Vavti | 2016-03-01 | 1 | -1/+1 |
| | | |||||
| * | do not show empty buttons if not logged in | Mario Vavti | 2016-03-01 | 2 | -2/+2 |
| | | |||||
| * | another resize issue | Mario Vavti | 2016-03-01 | 1 | -0/+1 |
| | | |||||
| * | fix resize issue | Mario Vavti | 2016-03-01 | 1 | -1/+6 |
| | | |||||
| * | move preview content outside of editor space | Mario Vavti | 2016-03-01 | 1 | -1/+2 |
| | | |||||
| * | adjust padding | Mario Vavti | 2016-03-01 | 1 | -2/+2 |
| | | |||||
| * | set line-height to initial | Mario Vavti | 2016-03-01 | 1 | -1/+1 |
| | | |||||
| * | another css fix | Mario Vavti | 2016-03-01 | 1 | -1/+1 |
| | | |||||
| * | css fixes to make jot look better with background colors or images | Mario Vavti | 2016-03-01 | 5 | -44/+42 |
| | | |||||
* | | Allow configuration of the display order of profile fields. This is an ↵ | redmatrix | 2016-03-01 | 1 | -9/+64 |
|/ | | | | important piece of a more general profile configuration framework which will eventually be accessible via the admin page. | ||||
* | provide footer bbcode | Mario Vavti | 2016-02-29 | 1 | -0/+5 |
| | |||||
* | simplify profile edit button(s) and make it useful for multiple profiles | Mario Vavti | 2016-02-29 | 2 | -12/+21 |
| | |||||
* | update es-es. tested it and it works now. Don't know what happened earlier. | jeroenpraat | 2016-02-29 | 2 | -1342/+1326 |
| | |||||
* | revert es-es update. something went wrong. later today I will examine what. | jeroenpraat | 2016-02-29 | 2 | -84/+9767 |
| | |||||
* | update es-es strings | jeroenpraat | 2016-02-28 | 2 | -9767/+84 |
| | |||||
* | Merge pull request #302 from phellmes/de20160227 | redmatrix | 2016-02-28 | 2 | -1342/+1326 |
|\ | | | | | Update DE translation strings | ||||
| * | Update DE translation strings | phellmes | 2016-02-27 | 2 | -1342/+1326 |
| | | |||||
* | | update NL strings | jeroenpraat | 2016-02-27 | 2 | -1355/+1339 |
|/ | |||||
* | make attach_delete() return and comment out album rename functionality since ↵ | Mario Vavti | 2016-02-27 | 1 | -0/+2 |
| | | | | this is not supported by the backend at the moment. | ||||
* | several photo item template fixes | Mario Vavti | 2016-02-26 | 2 | -18/+24 |
| | |||||
* | provide an edit button for the profile page | Mario Vavti | 2016-02-25 | 1 | -0/+3 |
| | |||||
* | we have got a button for events in the nav. no need for it in the tabs if we ↵ | Mario Vavti | 2016-02-25 | 1 | -0/+1 |
| | | | | are local. | ||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-24 | 1 | -6/+6 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/redmatrix/hubzilla | jeroenpraat | 2016-02-25 | 2 | -1/+4 |
| |\ | |||||
| * | | another dutch update | jeroenpraat | 2016-02-25 | 1 | -6/+6 |
| | | | |||||
* | | | issue #216 - calendar sharing | redmatrix | 2016-02-24 | 4 | -3/+44 |
| |/ |/| | |||||
* | | schema change to support channel move (a completely different operation than ↵ | redmatrix | 2016-02-24 | 1 | -1/+1 |
| | | | | | | | | channel clone) | ||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-24 | 3 | -9/+5 |
|\| | |||||
| * | interim dutch string update | jeroenpraat | 2016-02-25 | 1 | -3/+3 |
| | | |||||
| * | fix boxy scheme | Mario Vavti | 2016-02-25 | 1 | -5/+1 |
| | | |||||
| * | give nav dropdowns a fixed width to preventtext-overflow: ellipsis cut of to ↵ | Mario Vavti | 2016-02-24 | 1 | -1/+1 |
| | | | | | | | | much of the text in some situations | ||||
* | | add 'requires' field to plugin info to list other dependent plugins/addons ↵ | redmatrix | 2016-02-24 | 1 | -0/+3 |
|/ | | | | and disable if dependencies are not installed/enabled | ||||
* | Merge pull request #296 from wave72/master | Wave | 2016-02-23 | 2 | -1564/+1641 |
|\ | | | | | Updated Italian strings | ||||
| * | Updated Italian strings | Paolo Tacconi | 2016-02-23 | 2 | -1564/+1641 |
| | | |||||
* | | some work on mod/register | Mario Vavti | 2016-02-22 | 7 | -200/+98 |
| | | |||||
* | | Merge pull request #291 from phellmes/de201602201300 | redmatrix | 2016-02-22 | 2 | -7184/+7448 |
|\ \ | | | | | | | Update DE strings | ||||
| * | | Update DE strings | phellmes | 2016-02-20 | 2 | -7184/+7448 |
| | | | |||||
* | | | There was nothing wrong with my pimped pubsites (was another problem). Took ↵ | jeroenpraat | 2016-02-21 | 7 | -3144/+3327 |
| | | | | | | | | | | | | the opportunity to update schemas. Plus updated spanish and dutch strings. | ||||
* | | | Pimped the pubsites page. I tried to get this into a .tpl-file, but it was ↵ | jeroenpraat | 2016-02-21 | 1 | -5/+2 |
| | | | | | | | | | | | | to complicated for me. Pubsites page is now more narrow (fits on most devices) and location is not taking a complete column (location is almost never used). Also a fix on the auto-create-channel part on the register page. | ||||
* | | | grid->network, whitespace and bootstrapify create button | Mario Vavti | 2016-02-20 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-02-19 | 1 | -0/+1 |
|\ \ | |||||
| * | | issue #287 require old password to change password | redmatrix | 2016-02-19 | 1 | -0/+1 |
| | | | |||||
* | | | pimp up mod new_channel | Mario Vavti | 2016-02-19 | 5 | -219/+45 |
|/ / | |||||
* | | 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 | 3 | -6/+14 |
| | | | | | | | | 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 |
| | | |||||
* | | make always preload images before rendering the page a display setting | Mario Vavti | 2016-02-17 | 3 | -6/+7 |
| | |