aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7 from redmatrix/mastermrjive2015-10-26124-21709/+23747
|\
| * es+nl stringsjeroenpraat2015-10-264-2090/+2128
| * Merge branch 'master' of https://github.com/redmatrix/hubzillajeroenpraat2015-10-264-19/+28
| |\
| | * Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-10-268-16/+24
| | |\
| | * | bring back item transparencyMario Vavti2015-10-264-19/+28
| * | | Update Dark schemajeroenpraat2015-10-261-3/+63
| | |/ | |/|
| * | Revert this one. This was hub specific.jeroenpraat2015-10-261-11/+5
| * | Added a few generic-content-wrapper-styled classes and a button position fixe...jeroenpraat2015-10-267-16/+25
| * | Fixed connection page. Page was overcrowded on systems with larger fonts.jeroenpraat2015-10-262-5/+10
| |/
| * looks like there may be issues with the datetime picker if the local timezone...redmatrix2015-10-253-6/+4
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-252-1/+12
| |\
| | * Merge pull request #99 from HaakonME/masterredmatrix2015-10-262-1/+12
| | |\
| | | * Hubzilla on OpenShift - now with plugins and extra themesHaakon Meland Eriksen2015-10-251-1/+1
| | | * Add DeadSuperHero Themes for Hubzilla to deployHaakon Meland Eriksen2015-10-251-0/+5
| | | * Adding Hubzilla addons to deploy scriptHaakon Meland Eriksen2015-10-251-2/+0
| | | * Adding Hubzilla addons to deploy scriptHaakon Meland Eriksen2015-10-251-0/+8
| * | | new feature: delayed postingredmatrix2015-10-255-2/+51
| |/ /
| * | make use of http_host vs. server_name configurable in script_path()redmatrix2015-10-251-2/+10
| * | Merge pull request #100 from StefanKrauth/masterredmatrix2015-10-261-7/+2
| |\ \
| | * | Better handling for SSL reverse proxyStefan Krauth2015-10-251-7/+2
| * | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-253-43/+60
| |\| |
| | * | improve photo item object - we now provide the infos for all available photo ...Mario Vavti2015-10-253-43/+60
| | |/
| * / version updateredmatrix2015-10-251-1/+1
| |/
| * new line between photo and descriptionMario Vavti2015-10-241-2/+2
| * Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-10-243-5239/+5492
| |\
| | * Merge pull request #97 from wave72/masterWave2015-10-243-5239/+5492
| | |\
| | | * Italian strings updatedwave722015-10-243-5239/+5492
| * | | another try to avoid dubble photo deletion. allow to set a photo caption and ...Mario Vavti2015-10-246-26/+55
| |/ /
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-231-20/+22
| |\ \
| | * | fix app.tpl missing </div> tag if not authenticatedMario Vavti2015-10-231-20/+22
| * | | version and stringsredmatrix2015-10-232-853/+869
| |/ /
| * | update the to-do listredmatrix2015-10-221-6/+2
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-227-37/+59
| |\ \
| | * \ Merge pull request #96 from mcnesium/mastergit-marijus2015-10-221-2/+2
| | |\ \
| | | * | Merge pull request #1 from mcnesium/placeholder-fontmcnesium2015-10-221-2/+2
| | |/| |
| | | * | fix placeholder font-familymcnesium2015-10-221-2/+2
| | |/ /
| | * | photo object fixesMario Vavti2015-10-222-0/+10
| | * | experiment: put the photo-item photo on top of the postMario Vavti2015-10-222-6/+13
| | * | implement the new anchor target behaviourMario Vavti2015-10-221-1/+1
| | * | define $photoMario Vavti2015-10-221-0/+2
| | * | move photo object stuff from itemObject to prepare_body() so we can do more s...Mario Vavti2015-10-225-31/+34
| * | | revisionredmatrix2015-10-221-1/+1
| |/ /
| * | set link target window for many links that are included in posts, but not in ...redmatrix2015-10-211-16/+16
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-213-28/+29
| |\ \
| | * | warn if quota exceeds 90% of storage limitMario Vavti2015-10-212-2/+2
| | * | move file storage quota display to upload section. add a warning if remaining...Mario Vavti2015-10-213-28/+29
| * | | turn relative links in app_render() into absolute links, without affecting th...redmatrix2015-10-212-4/+9
| |/ /
| * | old merge conflictredmatrix2015-10-201-7/+1
| * | move quota display to where it's visible on a tabletredmatrix2015-10-201-2/+3
| * | fix image pathjeroenpraat2015-10-201-2/+2