Skip to content

Commit

Permalink
Merge dev to master
Browse files Browse the repository at this point in the history
  • Loading branch information
kiswa committed Jun 1, 2020
2 parents 15b0317 c054776 commit bde1e55
Show file tree
Hide file tree
Showing 343 changed files with 41,940 additions and 38,012 deletions.
13 changes: 13 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 1,13 @@
# Editor configuration, see http://editorconfig.org
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
max_line_length = off
trim_trailing_whitespace = false
16 changes: 16 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 1,16 @@
## Contributing

### Reporting Issues

Fill out the template as completely as possible.

The more information you can provide, the easier it is to research your issue.

### Development

Fork the repository and make your changes on the `dev` branch.

Create a pull request against the `dev` branch to merge your changes with
the main repository.

Make sure to include/update unit tests.
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 23,9 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.

**Please complete the following information:**
- OS: [e.g. Windows 10]
- Browser [e.g. Chrome, Firefox]
- Version [e.g. 22]
- OS: [e.g. Windows 10]
- Browser [e.g. Chrome, Firefox]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
Binary file added .github/boards.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/settings.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/tasks.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
57 changes: 52 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 1,52 @@
api/taskboard.db
api/uploads/*
tags
.idea/*
vendor/
# See http://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/dist-server
/tmp
/out-tsc

# dependencies
/node_modules

# IDEs and editors
/.idea
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace

# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json

# misc
/.sass-cache
/connect.lock
/coverage
/libpeerconnection.log
npm-debug.log
yarn-error.log
testem.log
/typings
.phpunit.result.cache

# e2e
/e2e/*.js
/e2e/*.map

# System Files
.DS_Store
Thumbs.db

# Project Specific Files
/src/api/vendor
*.db
*.sqlite
*.zip

18 changes: 0 additions & 18 deletions .htaccess

This file was deleted.

24 changes: 24 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 1,24 @@
language: php
php:
- '7.2'
- '7.3'
- '7.4'
script:
- npm test
before_script:
- nvm install 13
- nvm use 13
- npm i -g npm@6
- npm i
- touch tests.db
- chmod a w tests.db
- cd src/api/ && composer update && cd ../../
after_success:
- echo -e "<?php\n print phpversion();" > version.php
- curl "https://raw.githubusercontent.com/andreafabrizi/Dropbox-Uploader/master/dropbox_uploader.sh" -o dropbox_uploader.sh
- chmod x dropbox_uploader.sh
- touch fakeconfig
- echo "OAUTH_ACCESS_TOKEN=$OAUTH_ACCESS_TOKEN" > fakeconfig
- ./dropbox_uploader.sh -f fakeconfig upload coverage/api coverage-$(php version.php)/
- ./dropbox_uploader.sh -f fakeconfig upload coverage/app/lcov-report coverage-$(php version.php)/

14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 1,14 @@
## v1.0.0

### New Features

* Complete re-write
* Conversion script for migrating to new database format (sqlite only)

### Updates

* N/A

### Bug Fixes

* N/A
19 changes: 0 additions & 19 deletions CONTRIBUTING.md

This file was deleted.

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 1,6 @@
The MIT License (MIT)

Copyright (c) 2014-2016 Matthew Ross
Copyright (c) 2014-2020 Matthew Ross

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Loading

0 comments on commit bde1e55

Please sign in to comment.