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.

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

E1804. OSS project Yellow: Topic management #1144

Closed
wants to merge 31 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
7789d9e
Initial commit - Begin implementation of issues 718, 926, 971
Mar 7, 2018
8fa5047
Merging JSGrid
dburcal Mar 25, 2018
4186188
Added Test: Can't edit assignment past due date.
dburcal Mar 26, 2018
e5f1e48
Modified test: Cannot edit topics once assignment due date is passed.
dburcal Mar 26, 2018
30306ae
Improved test: Topic can not be edited if assignment due date has pas…
dburcal Mar 26, 2018
15caa33
Added 2 tests: Cannot add topics or delete topics if due date has pas…
dburcal Mar 26, 2018
4355726
Added test: default number of slots for new topic is 1.
dburcal Mar 26, 2018
5716675
Added tests: can edit/delete/add topics when due date hasn't passed.
dburcal Mar 26, 2018
ef8ff0e
"Modifying tests"
dburcal Mar 27, 2018
603b2ba
Merge pull request #1 from dburcal/dburcal-testing_issue_971
dburcal Mar 27, 2018
a6e1c42
Working existing functionality; UI tweaks needed
Mar 18, 2018
cc1378f
Load edit and delete icons
Mar 18, 2018
b036edf
Add/Update functionality implemented
Mar 26, 2018
645c923
"Modified suggestion"
Pratik2611 Mar 18, 2018
bec2634
added edit comment
Pratik2611 Mar 26, 2018
636e1e1
Changing tests
dburcal Mar 27, 2018
34a8427
updated
Pratik2611 Apr 1, 2018
a98e6af
updated without test
Pratik2611 Apr 2, 2018
f54167a
Adding env var for Heroku java home
Mar 27, 2018
9bac31f
updated JAVA_HOME
Mar 27, 2018
8d9f317
Update to JAVA_HOME
Mar 27, 2018
20f17d0
Buttons for edit/delete
Mar 27, 2018
3fde9ce
Added text to Edit/Delete buttons
Mar 27, 2018
ca5779e
Added icons to edit/delete buttons
Mar 31, 2018
e2f0a44
Conditionally show table columns
Apr 2, 2018
a89fd02
Added conditional show to actions and bookmarks
Apr 3, 2018
4ce8610
Code cleanup
Apr 3, 2018
bba5322
Merge branch 'master' of https://www.github.com/dburcal/expertiza
dburcal Apr 3, 2018
3242de3
Added tests to test JSON output of controller.
dburcal Apr 3, 2018
b1928d7
Added tests to test JSON response from controller.
dburcal Apr 3, 2018
978c073
Removed commented areas and edited RSpec descriptions.
dburcal Apr 3, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions README.md
Expand Up @@ -60,3 +60,7 @@ When editing existing files:

Please do no go crazy changing old code to match these guidelines; it will just create lots of potential merge conflicts.
Applying style guidelines to code you add and modify is good enough. :-)

####################
Begin adding Issues 971, 926, 718
####################
2 changes: 2 additions & 0 deletions app/assets/javascripts/application.js
Expand Up @@ -33,6 +33,8 @@
//= require jquery-tablesorter
//= require awesome_input
//= require jquery-bar-rating/jquery.barrating
//= require js-grid/dist/jsgrid
//= require jquery-validation

// Eliminate the “element.dispatchEvent is not a function” error
jQuery.noConflict();
Expand Down