aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* more widgetszotlabs2017-03-155-173/+172
|
* convert more widgets to classeszotlabs2017-03-156-133/+166
|
* Merge branch 'red' of https://github.com/zotlabs/hubzilla into redzotlabs2017-03-15225-1684/+5210
|\
| * new composer.lock for redzotlabs2017-03-16225-1684/+5210
| |
* | use absolute namespacezotlabs2017-03-151-1/+2
|/
* Comanche: allow widgets to be class based and stored appropriately in Zotlabszotlabs2017-03-153-16/+37
|
* could not fix the merge conflicts in composer.lock so it will need to be ↵zotlabs2017-03-1515-750/+1077
|\ | | | | | | | | | | | | | | regenerated in the red tree. also the autoload_classmap is a disgrace. We provide autoload functions so that we can dynamically change the file tree without needing to regenerate a bunch of runtime stuff every time we add a file. Merge branch 'dev' into red
| * 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
| | |\ | | | | | | | | [FEATURE] Extend Travis CI integration.
| | | * :construction_worker: Add Travis' GitHub deployment steps.Klaus Weidenbach2017-03-142-50/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed API documentation deployment to gh_pages to Travis's GitHub Pages deployment. Also add Travis GitHub Release Deployment step to offer API documentation. Both steps are optional and need to be activated in Travis by setting GH_TOKEN.
| | | * :construction_worker: :arrow_up: :heavy_plus_sign: Update PHPUnit to current ↵Klaus Weidenbach2017-03-148-224/+372
| | | | | | | | | | | | | | | | | | | | | | | | | | | | stable 6. Update requirements to PHP7 for dev. Add php-mock-phpunit to mock and stub global functions in a better way.
| | | * :construction_worker: Add old MySQL 5.5 to Travis CI again.Klaus Weidenbach2017-03-143-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | The trusty distro contains MySQL 5.6. Add a precise distro with MySQL 5.5. Unfortunately 5.7 is not yet provided, which would be interesting because of the enabled strict SQL mode.
| | | * :construction_worker: use PHP7.1 and add PostgreSQL9.6Klaus Weidenbach2017-03-143-28/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use newer distro for Travis CI runs. New environment provides PostgreSQL9.6. Also no need to install custom Doxygen, made it optional. Changed default PHP environment from PHP7.0 to current PHP7.1. Changed codecoverage reporting.
| | | * :green_heart: Update Travis CI's Doxygen.Klaus Weidenbach2017-03-143-14/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Travis CI has Doxygen 1.7. We need 1.8 to generate our API documentation. Get a static version and use it. Always build API Documentation, but changed Doxygen configuration to only print out errors in the documentation generation, so these can be reviewed.
| | | * [FEATURE] :construction_worker: Extend Travis CI integration.Klaus Weidenbach2017-03-1410-27/+378
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Testing several Travis CI features. Add DBs to travis execution matrix. Doxygen API docu generation and deployment to gh-pages. Update phpunit to 5.7.
* | | | 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 ↵zotlabs2017-03-152-22/+55
| | | | | | | | | | | | | | | | | | number of htmlspecialchars operations for markdown content. Also ensure that the content is escaped the correct number of times on imported items.
* | | more work related to attach/photo and os_path, display_path and general code ↵zotlabs2017-03-152-36/+40
| | | | | | | | | | | | cleanup
* | | add os_path and display_path to photos, fix some issues with multiple path ↵zotlabs2017-03-143-96/+12
| | | | | | | | | | | | separators after cloud/nickname in the content field of attach and photos
* | | 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 ↵zotlabs2017-03-141-0/+86
| | | | | | | | | | | | (escaped) what may be unsafe code in codeblocks. The stored item needs to be unescaped just prior to calling the markdown-to-html processor
* | | 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 ↵zotlabs2017-03-137-79/+28
| | | | | | | | | | | | code allow and limiting to specific channels only. This reduces the possibility of cross channel security issues coming into play. Then provide a single function for checking the code permission. This is only partially done as we often need to check against the observer or logged in channel as well as the resource owner to ensure that this only returns true for local channels which also own the requested resource.
* | | 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 access
| | | * 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 ↵Mario Vavti2017-03-131-1/+1
| | |/ | | | | | | | | | acl if e.g. not-owner edits a webpage. should probably find a better solution for this though.
* | | 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 home
| | | * Take me home instead of get me homeAndrew Manning2017-03-091-1/+1
| | |/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 12:33:29 +0000