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

Dev/2.4.0 #50

Merged
merged 43 commits into from
Jun 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
2660fd5
Makes player height 0 scale like materia server does
iturgeon Jan 24, 2019
d71afd5
Fix tool placement via css
iturgeon Jan 24, 2019
1f6747a
Updated every reference to 'mdk' I could find to 'mwdk', and 'Materia…
FrenjaminBanklin Jan 27, 2019
095336b
#17 Any time a qset is being loaded, all blank IDs will be given values.
FrenjaminBanklin Jan 28, 2019
20f64be
#17 console.logs.
FrenjaminBanklin Jan 28, 2019
7a61f7b
#17 Use UUIDs instead of an incrementing number for new IDs.
FrenjaminBanklin Jan 28, 2019
b72d9d2
#38 Lied about the 'Materia Developer Kit' fixes last time. Should ha…
FrenjaminBanklin Jan 28, 2019
5334e84
update ngmodal in yarn.lock
nathaned Apr 11, 2019
ca131be
add loadGuideTemplate, which can process guides written in markdown
nathaned Apr 25, 2019
bfde6a9
prevent duplicate processing of guide html files
nathaned Apr 25, 2019
faaf734
updates msca to 1.3.0-alpha3 and syncs all related packages
iturgeon May 25, 2019
fe80b59
minor var name cleanup in webpack-widget
iturgeon May 28, 2019
491cee3
add widget_publish_perms_verify api and update js/css names from msca…
iturgeon May 28, 2019
283cc7a
webpack syntax and name cleanup
iturgeon May 28, 2019
9bad8ca
update travis to use node 12
iturgeon May 28, 2019
e2ca6f9
MSCA update and removing msca build from webpack
iturgeon May 28, 2019
b154796
Merge pull request #48 from iturgeon/issue/update-to-node-12
iturgeon May 28, 2019
09f3b4c
Merge remote-tracking branch 'upstream/dev/2.4.0' into issue/38-mdk-t…
iturgeon May 28, 2019
b481745
Merge pull request #42 from FrenjaminBanklin/issue/38-mdk-to-mwdk
iturgeon May 28, 2019
40885d9
fix merge issues from #42
iturgeon May 28, 2019
e6f8966
Merge remote-tracking branch 'upstream/dev/2.4.0' into issue/45-helpe…
iturgeon May 28, 2019
de7b89a
Merge pull request #46 from nathaned/issue/45-helper-markdown
iturgeon May 28, 2019
9aa06d7
Merge remote-tracking branch 'upstream/dev/2.4.0' into issue/17-quest…
iturgeon May 29, 2019
faba3ff
adds prettier command
iturgeon May 29, 2019
d1d654d
update prettier to run on js in top level dir
iturgeon May 29, 2019
ce7d883
Merge pull request #41 from FrenjaminBanklin/issue/17-question-answer…
iturgeon May 29, 2019
843b494
fix prettier:run syntax error
iturgeon May 29, 2019
c9ecd25
Merge remote-tracking branch 'upstream/dev/2.4.0' into issue/39-handl…
iturgeon May 29, 2019
b22e0a5
Merge pull request #40 from iturgeon/issue/39-handle-0-height
iturgeon May 29, 2019
75d8747
adds api mock for widget_instance_lock
iturgeon May 29, 2019
a2558e6
bump webpack-dev-server and coffeescript deps
iturgeon May 29, 2019
ca7af71
v2.4.0-alpha1
iturgeon May 29, 2019
bb6ac03
Bump sshpk from 1.13.1 to 1.16.1
dependabot[bot] Jun 4, 2019
132a02d
Merge pull request #52 from ucfopen/dependabot/npm_and_yarn/sshpk-1.16.1
iturgeon Jun 4, 2019
441dda0
v2.4.0-alpha2
iturgeon Jun 4, 2019
69bb943
MSCA updated to v2.0.0
clpetersonucf Jun 4, 2019
f1e8402
Updated coffee-loader to 0.9.0 to correct coffee-script dependency fa…
clpetersonucf Jun 5, 2019
37a4ae3
alpha3
clpetersonucf Jun 5, 2019
3c674f2
fixes install to materia docker button after materia ifrit changes
iturgeon Jun 7, 2019
925dacc
updates built in widget coffeescript rules for backwards compatability
iturgeon Jun 7, 2019
5fc37b8
Merge pull request #55 from iturgeon/issue/54-materia-ifrit-broke-the…
iturgeon Jun 7, 2019
681da27
v2.4.0-alpha4
iturgeon Jun 7, 2019
ffd76ca
Removed vestigial css file references
clpetersonucf Jun 12, 2019
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
6 changes: 5 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
language: node_js
node_js:
- '6'
- '12'
cache:
yarn: true
directories:
- node_modules
before_install:
- npm install -g yarn # make sure yarn is new
- npm config set spin false
- npm install -g npm@^6.9.0
deploy:
provider: npm
email: [email protected]
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Materia Widget Development Kit (MDK)
# Materia Widget Development Kit (MWDK)

Materia Widget Development Kit (MDK) is a local dev environment for quickly building Materia Widgets.
Materia Widget Development Kit (MWDK) is a local dev environment for quickly building Materia Widgets.

## Features

Expand All @@ -12,5 +12,5 @@ Materia Widget Development Kit (MDK) is a local dev environment for quickly buil

## Setup

> @TODO
* Require as a dependency for any Materia widget

15 changes: 0 additions & 15 deletions assets/css/mdk-creator.css

This file was deleted.

File renamed without changes.
File renamed without changes.
22 changes: 18 additions & 4 deletions assets/css/mdk-main.css → assets/css/mwdk-main.css
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ body {
border-bottom: solid 4px #0093e7;
}

.tools {
margin-top: -12px;
float: right;
}

.creator {
margin-left: 0px;
margin-top: 200px;
Expand All @@ -76,8 +81,12 @@ body {
}

.center {
width: calc(100% - 330px);
height: 600px;
/*
Default to 100% in creator and player
In the player, the js will set the size according
*/
width: 100%;
height: 100%;
}

.center.full {
Expand All @@ -102,7 +111,7 @@ body {
justify-content: space-around;
}

#mdk_dialog {
#mwdk_dialog {
position: relative;
background: #fff;

Expand All @@ -112,7 +121,7 @@ body {
margin: 0 auto;
}

#mdk_dialog pre {
#mwdk_dialog pre {
font-size: 10px;
}

Expand Down Expand Up @@ -252,3 +261,8 @@ h2 {
height: 360px;
display: block;
}

#container {
height: 100%;
width: 100%;
}
14 changes: 7 additions & 7 deletions assets/css/mdk-player.css → assets/css/mwdk-player.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#body.player_mdk .logo {
#body.player_mwdk .logo {
color: #fff;
}

Expand All @@ -10,24 +10,24 @@
margin-left: 120px;
}

#body.player_mdk .widget[ng-app="materia"]{
#body.player_mwdk .widget[ng-app="materia"]{
display: block;
width: 100%;
height: 100%;
box-shadow: 0 0 30px rgba(0, 0, 0, 0.5);
margin-top: 20px;
}

#body.player_mdk #build-options hr,
#body.player_mdk #test-options hr {
#body.player_mwdk #build-options hr,
#body.player_mwdk #test-options hr {
margin-top: 20px;
}

#body.player_mdk #build-options p.disclaimer,
#body.player_mdk #test-options p.disclaimer {
#body.player_mwdk #build-options p.disclaimer,
#body.player_mwdk #test-options p.disclaimer {
font-size: 11px;
}

#body.player_mdk #rebuild button {
#body.player_mwdk #rebuild button {
margin-left: 10px;
}
Loading