aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #702 from dawnbreak/devzotlabs2017-03-202-33/+37
|\
| * :white_check_mark: Add unit test for purify_html().Klaus Weidenbach2017-03-192-33/+37
|/
* fix php warning and remove loggingMario Vavti2017-03-191-4/+2
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-181-2/+1
|\
| * Merge pull request #698 from dawnbreak/devKlaus2017-03-181-2/+1
| |\
| | * Missed one old Markdown()Klaus2017-03-181-2/+1
| |/
* | issue #699zotlabs2017-03-1849-1651/+0
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-1515-234/+758
|\|
| * 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
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-152-18/+6
|\| |
| * | better handling of mimetype securityMario Vavti2017-03-152-18/+6
| |/
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-132-2/+2
|\|
| * 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
| |/
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-112-2/+26
|\|
| * 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
| |/
* | stringszotlabs2017-03-101-3838/+3824
* | Monday is a proper name and should be capitalised (except in private conversa...zotlabs2017-03-081-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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 15:20:37 +0000