Skip to content

Current state #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
janeon wants to merge 44 commits into
base: master
Choose a base branch
from
Open

Current state #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
9a8ae76
journal skeleton component
adinajohnson Oct 30, 2018
5b7134d
Merge branch 'master' into journal
adinajohnson Oct 30, 2018
3d7593f
add dylan's ex skeleton code
adinajohnson Oct 31, 2018
888f279
My first commit for this branch!
Oct 31, 2018
e67f048
Merge branch 'analytics' of https://github.com/janeon/projectManager …
janeon Oct 31, 2018
b6217f2
bringing back month view by putting it in taskDisplay
janeon Oct 31, 2018
7388b43
Merge branch 'master' into journal
adinajohnson Nov 2, 2018
af56afc
calendar in taskDisplay
janeon Nov 4, 2018
bded827
adding calendar to its own component
janeon Nov 4, 2018
3fd97a6
adding todos
janeon Nov 4, 2018
0d7c1bf
more todos
janeon Nov 4, 2018
6f79476
Merge branch 'master' into journal
adinajohnson Nov 4, 2018
8db42e9
figured out how to do some basic form submission
adinajohnson Nov 5, 2018
eefe830
move testutils.js -> test_resources/
ddibened Nov 5, 2018
3f40c30
resolving conflicts to switch around folders
ddibened Nov 5, 2018
6cc2d4b
committing to pull
janeon Nov 5, 2018
96f8b8e
adding back index for calendar
janeon Nov 5, 2018
7c4478f
lowercasing Model and Utilities folders to match imports and adding b…
janeon Nov 5, 2018
abc71ce
can now add event given start and end time, also fixed vertical overf…
janeon Nov 5, 2018
ab16045
Update README.md
janeon Nov 6, 2018
988409c
fixing localizer passing to render css
janeon Nov 6, 2018
ae669be
entering and displaying journal entries works now
adinajohnson Nov 9, 2018
8589560
Merge pull request #5 from janeon/calendar
svouse Nov 10, 2018
f755fd1
Merge pull request #7 from janeon/journal
svouse Nov 10, 2018
c119c90
Merge pull request #8 from janeon/analytics
svouse Nov 10, 2018
b782490
user can now add their own events!! TODO: save events to model
janeon Nov 10, 2018
6176ff1
Merge remote-tracking branch 'origin' into calendar to begin calling …
janeon Nov 10, 2018
2dc15a9
resolving conflicts for taskDisplay
janeon Nov 10, 2018
1ca51ad
can now delete events
janeon Nov 10, 2018
e2c194d
Merge branch 'currentState' into model
ddibened Nov 11, 2018
ccb3641
Merge pull request #6 from janeon/model
ddibened Nov 11, 2018
ea61805
Model adds and removes tasks.
ddibened Nov 11, 2018
62c4cd1
Merge branch 'currentState' into model
ddibened Nov 11, 2018
817f2fa
Merge pull request #9 from janeon/model
ddibened Nov 12, 2018
5411057
conflict resolution
janeon Nov 12, 2018
0a3edf2
can now drag events and add recurring events
janeon Nov 13, 2018
a4d144d
fixing todo list
janeon Nov 13, 2018
53800a9
displays a graph; can't add data yet.
Nov 13, 2018
c3af7ea
Update README.md
janeon Nov 13, 2018
4ef7109
adding switch to render different tabs in tab display
janeon Nov 13, 2018
aa7740f
Merge branch 'currentState' of https://github.com/janeon/projectManag…
janeon Nov 13, 2018
d203e64
Merge branch 'analytics' into currentState
janeon Nov 13, 2018
3ae884b
hopefully resolving conflicts
janeon Nov 13, 2018
6be83d8
can now click to show the different tabs. TODO: be able to add tabs t…
janeon Nov 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Git tips: to push your local branch to a remote branch that it's not tracking (say currentState for instance), use
Git tips: to push your local branch to a remote branch that it's not tracking (say this currentState for instance), use
git push origin your_updated_branch_name:currentState

/--------------------------------- THE TREE -----------------------------------/
Expand Down
Loading