aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | could not fix the merge conflicts in composer.lock so it will need to be rege...zotlabs2017-03-1515-750/+1077
|\| |
| * | 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' into redzotlabs2017-03-150-0/+0
|\| | |
| * | | 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
| | |/
* | | ensure z_input_filter is called exactly once, since we now depend on the numb...zotlabs2017-03-152-22/+55
* | | more work related to attach/photo and os_path, display_path and general code ...zotlabs2017-03-152-36/+40
* | | add os_path and display_path to photos, fix some issues with multiple path se...zotlabs2017-03-143-96/+12
* | | store os_path and display_path with fileszotlabs2017-03-141-2/+3
* | | use dim for the button border alsozotlabs2017-03-141-1/+1
* | | dim class was un-themedzotlabs2017-03-142-2/+2
* | | input filter updateszotlabs2017-03-146-103/+57
* | | fix group by item queryzotlabs2017-03-141-17/+15
* | | class MarkdownSoap to safely store markdown by purifying and preserving (esca...zotlabs2017-03-141-0/+86
* | | get rid of some cruft in boot.phpzotlabs2017-03-141-62/+17
* | | make redbasic compatible with red 5.xzotlabs2017-03-131-1/+1
* | | remove the unimplemented upload limit site settingszotlabs2017-03-131-3/+0
* | | code_allowed is a real mess. Start the cleanup by remving the account level c...zotlabs2017-03-137-79/+28
* | | Merge branch 'dev' into redzotlabs2017-03-131-1/+1
|\| |
| * | 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
| | |/
* | | move oauth2 to vendorzotlabs2017-03-14132-3612/+1324
* | | better handling of mimetype securityzotlabs2017-03-123-20/+7
* | | remove more hardwired brandingzotlabs2017-03-123-65/+67
* | | update licensezotlabs2017-03-121-1/+1
* | | update readmezotlabs2017-03-121-27/+3
* | | grrr. stop making branding assumptions.zotlabs2017-03-126-13/+8
* | | more cleanupzotlabs2017-03-121-29/+35
* | | update std_versionzotlabs2017-03-121-1/+1
* | | db issueszotlabs2017-03-124-90/+8
* | | Merge branch 'dev' into redzotlabs2017-03-113-3/+27
|\| |
| * | 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
| |/
* | stringszotlabs2017-03-101-3838/+3824
* | one role.zotlabs2017-03-094-61/+5
* | more cleanupzotlabs2017-03-093-40/+5
* | Merge branch 'dspr' into redzotlabs2017-03-0911-7395/+7326
|\ \