aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* 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
* | some photos cant be deleted under certain circumstances - needs more investig...Mario Vavti2015-10-201-4/+0
* | add obj_type and object againMario Vavti2015-10-201-1/+3
* | fix jot photo uploadMario Vavti2015-10-201-10/+6
* | update large photo feature setting descriptionMario Vavti2015-10-201-1/+1
* | css cleanupMario Vavti2015-10-201-4/+0
* | create photo object if feature large photos is enabled and display those slig...Mario Vavti2015-10-2010-31/+98
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-192-4/+4
|\ \
| * | add project info to pubsite listredmatrix2015-10-192-4/+4
* | | revert - we can't guarantee what project name the fallback directory server h...redmatrix2015-10-191-6/+4
* | | update site on initial directory setupredmatrix2015-10-191-4/+7