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

Feature/manually add modules #37

Merged
merged 34 commits into from
Feb 4, 2020
Merged

Feature/manually add modules #37

merged 34 commits into from
Feb 4, 2020

Conversation

Lextum
Copy link
Collaborator

@Lextum Lextum commented Feb 4, 2020

adds a little popup to add custom modules

@Lextum
Revert "move some variables to a global level"
5c02260 
This reverts commit 9e06694.
@Lextum
add first prototype of a gui
41e6e52
@Lextum
every moduls gets now saved in its own object
a4fa67e
@Lextum
add Year , Grade and Mark to the CustomModul GUI
16ea43c
@Lextum
add CustomModuls to the normale(?) modules
a48ab67
@Lextum
first redesign of the popup
7445c29
@Lextum
show 'M' as character for manually added modules
9682ddb
@Lextum
add possibility to add no grade and mark(n/a)
fc953df
@Lextum
format document
ba613b2
@Lextum
let popup use css of the webpage
1fa5e09
@Lextum
some formating
3509003
@Lextum
Merge branch 'master' into feature/manuallyAddModules
44713b9
@Lextum
update popup stlye
c1589f6
@Lextum
fix the removal function
b64432e
@Lextum
change variables
0385978
@Lextum
change id of moduleList
cd96a39
@Lextum
cleanup
b87ad75
@Lextum
add getModuleList function
be2a77e
@Lextum
more cleanup and comments
b05f65f
@Lextum
Merge branch 'master' into feature/manuallyAddModules
db53f85
@Lextum
rename modul to module
e1c1e33
@Lextum
add browser detection function
fe32d3b
@Lextum
use the right browser api (firefox/chrome)
b403cc3
@Lextum
format document
cddaffe
@Lextum
remove reset button
652be39
@Lextum
show selected Module in popup form
531800b
@Lextum
fix custom module implementation
6e4a110
@Lextum Lextum requested a review from eddex February 4, 2020 17:16
eddex
eddex requested changes Feb 4, 2020
View reviewed changes
src/components/helpers.js Outdated Show resolved Hide resolved
src/components/helpers.js Show resolved Hide resolved
src/components/module_parser.js Outdated Show resolved Hide resolved
src/manifest.json Outdated Show resolved Hide resolved
src/popup/popup.html Outdated Show resolved Hide resolved
src/popup/popup.js Outdated Show resolved Hide resolved
src/popup/popup.js Outdated Show resolved Hide resolved
src/popup/popup.js Show resolved Hide resolved
src/popup/popup_style.css Show resolved Hide resolved
src/popup/popup_style.css Outdated Show resolved Hide resolved
@Lextum Lextum requested a review from eddex February 4, 2020 19:35
Lextum
Lextum commented Feb 4, 2020
View reviewed changes
Copy link
Collaborator Author

@Lextum Lextum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i hope i got everything

@eddex eddex merged commit 94b3bb3 into master Feb 4, 2020
@eddex eddex deleted the feature/manuallyAddModules branch February 4, 2020 22:02
@Lextum Lextum linked an issue Feb 5, 2020 that may be closed by this pull request
Add a way to manually add modules #23
Closed
@Lextum Lextum mentioned this pull request Feb 5, 2020
Closed
@vigi86 vigi86 mentioned this pull request Feb 6, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eddex eddex eddex approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add a way to manually add modules
2 participants
@Lextum @eddex