aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 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
| | * | fix placeholder font-familymcnesium2015-10-221-2/+2
| |/ / | | | | | | [Imgur](http://i.imgur.com/Cegabd5.png)
| * | 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 ↵Mario Vavti2015-10-225-31/+34
| | | | | | | | | | | | stuff with it
* | | 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
| | | | | | | | rest of application
* | 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 ↵Mario Vavti2015-10-213-28/+29
| | | | | | | | | | | | remaining space is less than 100MB and fix % calculation
* | | turn relative links in app_render() into absolute links, without affecting ↵redmatrix2015-10-212-4/+9
|/ / | | | | | | the install.
* | 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 ↵Mario Vavti2015-10-201-4/+0
| | | | | | | | investigation. revert this until a better fix is found.
* | 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 ↵Mario Vavti2015-10-2010-31/+98
| | | | | | | | slightly different
* | 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 ↵redmatrix2015-10-191-6/+4
| | | | | | | | | | | | has and this could cause bugs later
* | | update site on initial directory setupredmatrix2015-10-191-4/+7
| | |
* | | extened the earlier fixredmatrix2015-10-191-2/+2
| | |
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-190-0/+0
|\| | | | | | | | | | | | | | Conflicts: include/zot.php
| * | typoredmatrix2015-10-191-1/+1
| | |
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-1911-6825/+7139
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/zot.php install/schema_mysql.sql install/schema_postgres.sql install/update.php mod/zfinger.php
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-194-6816/+7110
| |\ \
| | * | Update es+nljeroenpraat2015-10-184-6816/+7110
| | | |
| * | | add the project name to site info packetredmatrix2015-10-197-8/+27
| |/ /
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-196-3/+3
|\ \ \
| * \ \ Merge pull request #93 from tuscanhobbit/masterredmatrix2015-10-205-2/+2
| |\ \ \ | | | |/ | | |/| Replaced some old redmatrix branding
| | * | Replaced some old redmatrix brandingPaolo Tacconi2015-10-195-2/+2
| | | |