aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #698 from dawnbreak/devKlaus2017-03-181-2/+1
|\
| * Missed one old Markdown()Klaus2017-03-181-2/+1
|/
* Merge pull request #569 from dawnbreak/QA_testingzotlabs2017-03-1615-234/+758
|\
| * :construction_worker: Add Travis' GitHub deployment steps.Klaus Weidenbach2017-03-142-50/+27
| * :construction_worker: :arrow_up: :heavy_plus_sign: Update PHPUnit to current ...Klaus Weidenbach2017-03-148-224/+372
| * :construction_worker: Add old MySQL 5.5 to Travis CI again.Klaus Weidenbach2017-03-143-4/+13
| * :construction_worker: use PHP7.1 and add PostgreSQL9.6Klaus Weidenbach2017-03-143-28/+39
| * :green_heart: Update Travis CI's Doxygen.Klaus Weidenbach2017-03-143-14/+42
| * [FEATURE] :construction_worker: Extend Travis CI integration.Klaus Weidenbach2017-03-1410-27/+378
* | better handling of mimetype securityMario Vavti2017-03-152-18/+6
|/
* Merge pull request #697 from anaqreon/devgit-marijus2017-03-131-1/+1
|\
| * Add id to app-menu for JS accessAndrew Manning2017-03-121-1/+1
* | we need to have this even if we are not the owner. otherwise we loose the acl...Mario Vavti2017-03-131-1/+1
|/
* Login-box css-fix for Bluegrid schemejeroenpraat2017-03-111-1/+25
* Merge pull request #693 from anaqreon/devgit-marijus2017-03-111-1/+1
|\
| * Take me home instead of get me homeAndrew Manning2017-03-091-1/+1
|/
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-03-073-10/+10
|\
| * allow post_activity_item to be passed an empty ACL without resetting to chann...zotlabs2017-03-061-1/+2
| * add public_policy to the nwiki container also. This should not affect the rec...zotlabs2017-03-061-0/+2
| * correct fix for wiki anonymous read issue (items_permissions_sql checks item....zotlabs2017-03-062-9/+6
* | Big 2.2 string update Dutchjeroenpraat2017-03-072-6864/+7305
|/
* allow unauthenticated access to public wiki pagesMario Vavti2017-03-061-2/+10
* do not collapse long nsfw contentMario Vavti2017-03-061-1/+1
* remove include/probe.php which has never completed development and has never ...zotlabs2017-03-054-106/+1
* move emoji emoticons (not reactions) to pluginzotlabs2017-03-051824-18/+2
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-0522-4756/+5247
|\
| * Merge pull request #689 from mjfriaza/devzotlabs2017-03-052-2329/+2378
| |\
| | * Translated the last strings into Spanish versionManuel Jiménez Friaza2017-03-052-2329/+2378
| * | Merge pull request #688 from dawnbreak/markdownzotlabs2017-03-0520-2427/+2869
| |\ \
| | * | :arrow_up: :hammer: Upgrade Markdownify library.Klaus Weidenbach2017-03-0520-2427/+2869
| |/ /
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-042-1/+2
|\| |
| * | update changelogMario Vavti2017-03-041-0/+1
| * | we need item edited for wiki page history, not item createdMario Vavti2017-03-041-1/+1
* | | minor feed issuezotlabs2017-03-041-0/+8
|/ /
* | string updatezotlabs2017-03-031-887/+910
* | fix badge position for narrow navbarMario Vavti2017-03-031-4/+0
* | reverse sort orderzotlabs2017-03-021-1/+1
* | activity widget - turns out the owner is not relevant.zotlabs2017-03-021-9/+5
* | document the activity widgetzotlabs2017-03-021-0/+1
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-029-28/+23
|\ \
| * | provide info if there are no sche,es availableMario Vavti2017-03-021-4/+9
| * | reset schema value after we empty and repopulate it. second half of fix for #624Mario Vavti2017-03-022-2/+2
| * | reset schema value after we empty and repopulate it. first half of fix for #624Mario Vavti2017-03-021-0/+2
| * | setting top position of contextual-help in schemes does not work with narrow ...Mario Vavti2017-03-024-5/+0
| * | add title to connect buttonMario Vavti2017-03-011-1/+1
| * | minor template fixesMario Vavti2017-03-013-19/+12
* | | activity widget - like the forum widget but represents unseen activity by aut...zotlabs2017-03-029-4/+97
* | | make system.expire_delivery_reports default setting consistent (10 days)zotlabs2017-03-011-1/+1
|/ /
* | cleaner integration between the headers and session options of z_fetch_url()zotlabs2017-02-281-7/+26
* | expire unread system notifications after a year. It would provide a better ex...zotlabs2017-02-281-0/+7