Code

test pull request #137

Code

Open

ChadLiberty wants to merge 74 commits intoQTodoTxt:masterQTodoTxt/QTodoTxt2:masterfrom sDriskell:masterCopy head branch name to clipboard

+228-110

Commits

Commits on Mar 31, 2020

• Add Workflow

  Show description for 251de18
  sDriskell

  authored
  251de18

• Testing branch/push functionality for project

  

  Shane Driskell

  committed
  b3e7595

• Change Workflow

  Show description for 5300ff3
  sDriskell

  authored
  5300ff3

• Remove Previous Workflow

  Show description for be6d6b1
  sDriskell

  authored
  be6d6b1

• Merge remote-tracking branch 'origin/master' into ShaneTestBranch

  

  Shane Driskell

  committed
  f80d2f4

• Remove pythonapp.yml

  

  Shane Driskell

  committed
  bfde1bc

• Merge remote-tracking branch 'origin/master' into ShaneTestBranch

  

  Shane Driskell

  committed
  54ca56f

• Merge branch 'ShaneTestBranch'

  

  Shane Driskell

  committed
  f3057a9

• Use App Workflow

  sDriskell

  authored
  4ecd40e

• Delete pythonpackage.yml

  sDriskell

  authored
  079dddd

• Merge branch 'master' of https://github.com/sDriskell/QTodoTxt2 into ShaneTestBranch

  

  Shane Driskell

  committed
  5ad356b

• testing commit/push functionality of Pycharm with project

  

  Shane Driskell

  committed
  9703b2e

• Merge pull request #2 from sDriskell/ShaneTestBranch

  Show description for 2e3e0aa
  sDriskell

  authored
  2e3e0aa

• Commit and push with requirements.txt

  

  Shane Driskell

  committed
  7ba71c9

• Add files via upload

  sDriskell

  authored
  df563e9

• Merge branch 'master' of https://github.com/sDriskell/QTodoTxt2

  

  Shane Driskell

  committed
  e658890

• Commit and push with requirements.txt

  

  Shane Driskell

  committed
  a89894b

• Commit and push with requirements.txt

  

  Shane Driskell

  committed
  ab0e027

Commits on Apr 10, 2020

• My initial commit. Fixed font size issue.

  Mark-Pasq

  committed
  08ead2a

• Merge pull request #4 from Mark-Pasq/MarksBranch

  Show description for 7593187
  Mark-Pasq

  authored
  7593187

• Revert "My initial commit. Fixed font size issue."

  Mark-Pasq

  authored
  c389b7a

• Merge pull request #5 from sDriskell/revert-4-MarksBranch

  Show description for 90f06bc
  Mark-Pasq

  authored
  90f06bc

• cleaned up commented out code, seemed unused

  bclodge

  committed
  0feace8

• Merge pull request #6 from sDriskell/BrandonBranch

  Show description for a8be974
  sDriskell

  authored
  a8be974

• Removed commented out code to test merging.

  

  Shane Driskell

  committed
  56034b5

Commits on Apr 13, 2020

• Mark's Branch here.

  Show description for cb38d87
  

  Mark Pasquantonio

  committed
  cb38d87

• Cleaning out commented code and fixing flake-8 issues

  

  Shane Driskell

  committed
  13a983e

• Merge remote-tracking branch 'origin/master'

  Show description for 096697a
  

  Mark Pasquantonio

  committed
  096697a

• Testing Workflow for application

  

  Shane Driskell

  committed
  ff52907

• Merge remote-tracking branch 'origin/master' into shaneBranch2

  

  Shane Driskell

  committed
  34a2797

• Update app.py

  Show description for a278f50
  sDriskell

  authored
  a278f50

• Update pythonapp.yml

  Show description for a37ae1d
  sDriskell

  authored
  a37ae1d

• Testing Workflow for application

  

  Shane Driskell

  committed
  1b0bdd2

• Merge pull request #7 from sDriskell/ShaneBranch3

  Show description for b89bf8e
  sDriskell

  authored
  b89bf8e

• Testing Workflow for application

  

  Shane Driskell

  committed
  dd76f69

• Merge pull request #8 from sDriskell/ShaneBranch3

  Show description for 6e79729
  sDriskell

  authored
  6e79729

• Update pythonapp.yml

  sDriskell

  authored
  1e71ff4

• Update pythonapp.yml

  sDriskell

  authored
  598e45e

• Update pythonapp.yml

  Show description for 909ca74
  sDriskell

  authored
  909ca74

• Updated changes to Preferences.qml

  

  Mark Pasquantonio

  committed
  a292a2b

• Updated changes to tasklib.py and qtodotxt.pyw

  

  Mark Pasquantonio

  committed
  cadbb38

Commits on Apr 14, 2020

• Cleaning up errors to pass flake8.

  

  Shane Driskell

  committed
  ddb0865

• Cleaning up errors to pass flake8.

  

  Shane Driskell

  committed
  817faf9

• Cleaning up errors to pass flake8.

  

  Shane Driskell

  committed
  2b97453

• Cleaning up errors to pass flake8 and creating separate branch from master.

  

  Shane Driskell

  committed
  1146e5c

• Cleaning up errors to pass flake8 and creating separate branch from master.

  

  Shane Driskell

  committed
  6a8b6ca

• Updated changes to TaskLine.qml

  

  Mark Pasquantonio

  committed
  dba4f9e

• Cleaning out old commented code for better legibility.

  

  Shane Driskell

  committed
  49cdf8b

Commits on Apr 15, 2020

• Minor changes to syntax of FilterView.qml and Preferences.qml

  

  Mark Pasquantonio

  committed
  edd5239

• Restoring a change to Preferences.qml

  

  Mark Pasquantonio

  committed
  c01e494

• Merge remote-tracking branch 'origin/MarkBranch3' into HEAD

  

  Mark Pasquantonio

  committed
  babc0e4

• Updated FilterView.qml

  Show description for d248490
  

  Mark Pasquantonio

  committed
  d248490

• TYPO-error fixed in TaskListTableView.qml

  

  Mark Pasquantonio

  committed
  a91cd63

Commits on Apr 17, 2020

• Addition made to Preferences.qml

  Show description for 4530d41
  

  Mark Pasquantonio

  committed
  4530d41

Commits on Apr 26, 2020

• Merge branch 'shaneBranch' into MarkBranch3

  sDriskell

  authored
  7f0a87f

• Merge pull request #9 from sDriskell/MarkBranch3

  Show description for 7dd6cba
  sDriskell

  authored
  7dd6cba

• Merge pull request #10 from sDriskell/shaneBranch

  Show description for b7a1479
  sDriskell

  authored
  b7a1479

• Demoing branches

  bclodge

  committed
  f88ac0e

• Merge branch 'shaneBranch' of https://github.com/sDriskell/QTodoTxt2 into BrandonBranch

  Show description for b2d06f3
  bclodge

  committed
  b2d06f3

• Fixed error message in app for not excepting the date.

  

  Shane Driskell

  committed
  3e5df5c

• Fixed error with Due: 's, which caused an error to generate in the app.

  Show description for 58e2370
  bclodge

  committed
  58e2370

• Merge pull request #11 from sDriskell/BrandonBranch

  Show description for dd66eaf
  sDriskell

  authored
  dd66eaf

Commits on Apr 27, 2020

• Update to qtodotxt2

  Show description for c82ecfc
  

  Mark Pasquantonio

  committed
  c82ecfc

Commits on May 3, 2020

• Fixed due date format to remove error message from within app; all tests can still pass.

  

  Shane Driskell

  committed
  8173dfe

• Reverting test functions to work with new date bug fix

  

  Shane Driskell

  committed
  b3b9cfc

• Continuing to update test functions to work with due bug fix

  

  Shane Driskell

  committed
  a8ddd90

• Flake 8 corrections

  

  Shane Driskell

  committed
  307eaf4

• Flake 8 corrections

  

  Shane Driskell

  committed
  b9be11a

Commits on May 4, 2020

• Fixed two test functions

  

  Shane Driskell

  committed
  dff13e2

• Fixed flake8 error

  

  Shane Driskell

  committed
  0598017

Commits on May 5, 2020

• Finish correcting testing errors.

  

  Shane Driskell

  committed
  2b6a270

• Merge branch 'master' into MarkBranch

  sDriskell

  authored
  2554cc9

• Merge pull request #12 from sDriskell/MarkBranch

  Show description for 5dcc60d
  sDriskell

  authored
  5dcc60d

Commits on May 14, 2020

• Removed font sizing.

  

  Shane Driskell

  committed
  18b2095