aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-2712-25/+125
|\
| * Merge pull request #101 from kenrestivo/kens-fixesredmatrix2015-10-282-1/+50
| |\ | | | | | | Add YML file for travis CI suite, fix MIME types for audio files
| | * Add yml file for travis, as an experiment.ken restivo2015-10-271-0/+46
| | |
| | * Correct mime types via https://wiki.xiph.org/MIME_Types_and_File_Extensionsken restivo2015-10-271-1/+4
| |/
| * More fine tuning bluegrid schema. Extra generic-wrapper-styled.jeroenpraat2015-10-277-14/+58
| |
| * css fixesMario Vavti2015-10-271-2/+2
| |
| * first the image than the bodyMario Vavti2015-10-271-1/+1
| |
| * fix sharing of photo itemsMario Vavti2015-10-272-8/+15
| |
* | revisionredmatrix2015-10-271-1/+1
|/
* Better -styled.jeroenpraat2015-10-271-1/+1
|
* Another .generic-content-wrapperjeroenpraat2015-10-271-0/+2
|
* Merge branch 'master' of https://github.com/redmatrix/hubzillajeroenpraat2015-10-271-1/+1
|\
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-2619-2128/+2247
| |\
| * | versionredmatrix2015-10-261-1/+1
| | |
* | | NEW: Redbasic schema, based on the Hubzilla project page layout.jeroenpraat2015-10-273-0/+358
| |/ |/|
* | 2 more tpl files with generic-content-wrapper-styledjeroenpraat2015-10-262-0/+4
| |
* | 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 ↵jeroenpraat2015-10-267-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.jeroenpraat2015-10-262-5/+10
|/
* looks like there may be issues with the datetime picker if the local ↵redmatrix2015-10-253-6/+4
| | | | timezone isn't the same as your settings.
* 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 themes
| | * 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 proxy
| * | 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
| |/ | | | | | | sizes
* / 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 updated
| | * 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
|/ / | | | | | | simple status body (if create status post is enabled) on upload
* | 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
| |\ \ | | | | | | | | fix placeholder font-family
| | * | Merge pull request #1 from mcnesium/placeholder-fontmcnesium2015-10-221-2/+2
| |/| | | | | | | | | | fix placeholder font-family