Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #7 from redmatrix/master | mrjive | 2015-10-26 | 124 | -21709/+23747 |
|\ | | | | | updating from original codebase | ||||
| * | es+nl strings | jeroenpraat | 2015-10-26 | 4 | -2090/+2128 |
| | | |||||
| * | Merge branch 'master' of https://github.com/redmatrix/hubzilla | jeroenpraat | 2015-10-26 | 4 | -19/+28 |
| |\ | |||||
| | * | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2015-10-26 | 8 | -16/+24 |
| | |\ | |||||
| | * | | bring back item transparency | Mario Vavti | 2015-10-26 | 4 | -19/+28 |
| | | | | |||||
| * | | | Update Dark schema | jeroenpraat | 2015-10-26 | 1 | -3/+63 |
| | |/ | |/| | |||||
| * | | Revert this one. This was hub specific. | jeroenpraat | 2015-10-26 | 1 | -11/+5 |
| | | | |||||
| * | | Added a few generic-content-wrapper-styled classes and a button position ↵ | jeroenpraat | 2015-10-26 | 7 | -16/+25 |
| | | | | | | | | | | | | fixed for lostpass. mod/search probably needs a .tpl in the future, but I don't know how to that. | ||||
| * | | Fixed connection page. Page was overcrowded on systems with larger fonts. | jeroenpraat | 2015-10-26 | 2 | -5/+10 |
| |/ | |||||
| * | looks like there may be issues with the datetime picker if the local ↵ | redmatrix | 2015-10-25 | 3 | -6/+4 |
| | | | | | | | | timezone isn't the same as your settings. | ||||
| * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-25 | 2 | -1/+12 |
| |\ | |||||
| | * | Merge pull request #99 from HaakonME/master | redmatrix | 2015-10-26 | 2 | -1/+12 |
| | |\ | | | | | | | | | Hubzilla on OpenShift - now with plugins and extra themes | ||||
| | | * | Hubzilla on OpenShift - now with plugins and extra themes | Haakon Meland Eriksen | 2015-10-25 | 1 | -1/+1 |
| | | | | |||||
| | | * | Add DeadSuperHero Themes for Hubzilla to deploy | Haakon Meland Eriksen | 2015-10-25 | 1 | -0/+5 |
| | | | | |||||
| | | * | Adding Hubzilla addons to deploy script | Haakon Meland Eriksen | 2015-10-25 | 1 | -2/+0 |
| | | | | |||||
| | | * | Adding Hubzilla addons to deploy script | Haakon Meland Eriksen | 2015-10-25 | 1 | -0/+8 |
| | | | | |||||
| * | | | new feature: delayed posting | redmatrix | 2015-10-25 | 5 | -2/+51 |
| |/ / | |||||
| * | | make use of http_host vs. server_name configurable in script_path() | redmatrix | 2015-10-25 | 1 | -2/+10 |
| | | | |||||
| * | | Merge pull request #100 from StefanKrauth/master | redmatrix | 2015-10-26 | 1 | -7/+2 |
| |\ \ | | | | | | | | | Better handling for SSL reverse proxy | ||||
| | * | | Better handling for SSL reverse proxy | Stefan Krauth | 2015-10-25 | 1 | -7/+2 |
| | | | | |||||
| * | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-25 | 3 | -43/+60 |
| |\| | | |||||
| | * | | improve photo item object - we now provide the infos for all available photo ↵ | Mario Vavti | 2015-10-25 | 3 | -43/+60 |
| | |/ | | | | | | | | | | sizes | ||||
| * / | version update | redmatrix | 2015-10-25 | 1 | -1/+1 |
| |/ | |||||
| * | new line between photo and description | Mario Vavti | 2015-10-24 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2015-10-24 | 3 | -5239/+5492 |
| |\ | |||||
| | * | Merge pull request #97 from wave72/master | Wave | 2015-10-24 | 3 | -5239/+5492 |
| | |\ | | | | | | | | | Italian strings updated | ||||
| | | * | Italian strings updated | wave72 | 2015-10-24 | 3 | -5239/+5492 |
| | | | | |||||
| * | | | another try to avoid dubble photo deletion. allow to set a photo caption and ↵ | Mario Vavti | 2015-10-24 | 6 | -26/+55 |
| |/ / | | | | | | | | | | simple status body (if create status post is enabled) on upload | ||||
| * | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-23 | 1 | -20/+22 |
| |\ \ | |||||
| | * | | fix app.tpl missing </div> tag if not authenticated | Mario Vavti | 2015-10-23 | 1 | -20/+22 |
| | | | | |||||
| * | | | version and strings | redmatrix | 2015-10-23 | 2 | -853/+869 |
| |/ / | |||||
| * | | update the to-do list | redmatrix | 2015-10-22 | 1 | -6/+2 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-22 | 7 | -37/+59 |
| |\ \ | |||||
| | * \ | Merge pull request #96 from mcnesium/master | git-marijus | 2015-10-22 | 1 | -2/+2 |
| | |\ \ | | | | | | | | | | | fix placeholder font-family | ||||
| | | * | | Merge pull request #1 from mcnesium/placeholder-font | mcnesium | 2015-10-22 | 1 | -2/+2 |
| | |/| | | | | | | | | | | | | fix placeholder font-family | ||||
| | | * | | fix placeholder font-family | mcnesium | 2015-10-22 | 1 | -2/+2 |
| | |/ / | | | | | | | | | [Imgur](http://i.imgur.com/Cegabd5.png) | ||||
| | * | | photo object fixes | Mario Vavti | 2015-10-22 | 2 | -0/+10 |
| | | | | |||||
| | * | | experiment: put the photo-item photo on top of the post | Mario Vavti | 2015-10-22 | 2 | -6/+13 |
| | | | | |||||
| | * | | implement the new anchor target behaviour | Mario Vavti | 2015-10-22 | 1 | -1/+1 |
| | | | | |||||
| | * | | define $photo | Mario Vavti | 2015-10-22 | 1 | -0/+2 |
| | | | | |||||
| | * | | move photo object stuff from itemObject to prepare_body() so we can do more ↵ | Mario Vavti | 2015-10-22 | 5 | -31/+34 |
| | | | | | | | | | | | | | | | | stuff with it | ||||
| * | | | revision | redmatrix | 2015-10-22 | 1 | -1/+1 |
| |/ / | |||||
| * | | set link target window for many links that are included in posts, but not in ↵ | redmatrix | 2015-10-21 | 1 | -16/+16 |
| | | | | | | | | | | | | rest of application | ||||
| * | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-21 | 3 | -28/+29 |
| |\ \ | |||||
| | * | | warn if quota exceeds 90% of storage limit | Mario Vavti | 2015-10-21 | 2 | -2/+2 |
| | | | | |||||
| | * | | move file storage quota display to upload section. add a warning if ↵ | Mario Vavti | 2015-10-21 | 3 | -28/+29 |
| | | | | | | | | | | | | | | | | remaining space is less than 100MB and fix % calculation | ||||
| * | | | turn relative links in app_render() into absolute links, without affecting ↵ | redmatrix | 2015-10-21 | 2 | -4/+9 |
| |/ / | | | | | | | | | | the install. | ||||
| * | | old merge conflict | redmatrix | 2015-10-20 | 1 | -7/+1 |
| | | | |||||
| * | | move quota display to where it's visible on a tablet | redmatrix | 2015-10-20 | 1 | -2/+3 |
| | | | |||||
| * | | fix image path | jeroenpraat | 2015-10-20 | 1 | -2/+2 |
| | | |