Skip to content
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

Jump to bottom

Version 2.2.0 #129

Merged
merged 51 commits into from
Nov 14, 2017
Merged

Version 2.2.0 #129

merged 51 commits into from
Nov 14, 2017

Conversation

sproogen
Copy link
Owner

@sproogen sproogen commented Nov 7, 2017

No description provided.

@sproogen
Added url auto linking in questions and answers
a942a14
@sproogen
Removed linkClicked from component state
72a9d9f
@sproogen
Merge pull request #104 from sproogen/f/#99-autolink-urls
dffaae4 
Added url auto linking in questions and answers
@sproogen
Merge branch 'develop' into f/#105-button-tests
c539a89
@sproogen
Merge pull request #114 from sproogen/f/#105-button-tests
86519d5 
F/#105 button tests
@sproogen
Fix #117 hide loading screen
b86b46c
@sproogen
Work on improving components and answers route jsx
e9cca15
@sproogen
Started work on the Ask components refactor
84e698c
@sproogen
Some modal fixes
3f84fe4
@sproogen
Merge branch 'develop' into b/#117-loading-bug
d817801
@sproogen
Merge pull request #118 from sproogen/b/#117-loading-bug
cc01b1b 
Fix #117 hide loading screen
@sproogen
Further updates for components in the ask route
ae6cbfb
@sproogen
Merge branch 'develop' into f/#115-component-updates
823b790 
Conflicts:
	app/Resources/client/src/routes/NotFound/NotFound.js
@sproogen
Fixed js issue
ae00126
@sproogen
Merge pull request #120 from sproogen/f/#115-component-updates
63ad7ff 
F/#115 component updates
@sproogen
Added endDate and ended to poll entity
34e508e
@sproogen
Added more poll end date stuff and tests
c11d459
@sproogen
Added tests for PollEndService
0484921
@sproogen
Added api tests for poll ending
d9c182c
@sproogen
Started to add poll optons for end date
d1f86d2 
Conflicts:
	app/Resources/client/src/routes/Ask/components/OptionsModal/OptionsModal.js
@sproogen
Styling and tidying up for end in option
b259392
@sproogen
Added datepicker to poll options
5b50bca
@sproogen
Started working on timepicker component
607a415
@sproogen
Added timpicker popup functionality
77b236b
@sproogen
Removed custom time picker and added antd time picker
c4dce76
@sproogen
Added styling for timepicker input
84d36c0
@sproogen
Removed font
06c8c1b
@sproogen
Started to hook up the time picker
94a05d0
@sproogen
Added endDate to postPoll api call
043a205
@sproogen
Finished adding timepicker and endAt tests
7c8caca
@sproogen
Some formatting updates
adcd6ff
@sproogen
Fixed some shit
2388728
@sproogen
Stop response API calls when poll is ended
2793bdc
@sproogen
Hidden checkboxes for ended poll
13fe0b4
@sproogen
Added poll ended notification
3ea34ab
@sproogen
Added ending at notification
c35377f
@sproogen
Show results for ended poll with no responses
f658ca1
@sproogen
Fixed linting and tests
61b93e1
@sproogen
Fixed codacy issue
9b6e6d6
@sproogen
Merge pull request #124 from sproogen/f/#40-answer-time-limit
b131864 
F/#40 answer time limit
@sproogen
Moved tests
7a11dc4
@sproogen
Merge pull request #125 from sproogen/f/#122-move-tests
6a740ef 
Moved tests
@sproogen
Added tests for Footer
3440279
@sproogen
Added tests for back component
72d8c80
@sproogen
Fixed some code styling issues
f09421c
@sproogen
Merge pull request #127 from sproogen/f/#103-back-tests
2950416 
Added tests for back component
@sproogen
Merge pull request #126 from sproogen/f/#106-footer-tests
d20f8fb 
Added tests for Footer
@sproogen
Decreased global font size and fixxed issues
c587a49
@sproogen
Merge pull request #128 from sproogen/f/#121-decrease-font-size
2361170 
Decreased global font size and fixxed issues
@sproogen
Merge branch 'master' into develop
5df3e04
@sproogen
Reverted button back to develop
9b0b8cd
@sproogen sproogen temporarily deployed to itsgoingtobe-dev-pr-129 November 7, 2017 23:49 Inactive
@sproogen sproogen temporarily deployed to itsgoingtobe-dev November 7, 2017 23:53 Inactive
@sproogen
Copy link
Owner Author

sproogen commented Nov 8, 2017

Need to fix this shit ton of code styling issues Codacy has suddenly thrown up...

@sproogen sproogen temporarily deployed to itsgoingtobe-dev-pr-129 November 14, 2017 20:59 Inactive
@sproogen sproogen merged commit fddb646 into master Nov 14, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@sproogen