8000 Content Atom and Quiz models - updated after whiteboard discussion by paulmr · Pull Request #2 · guardian/content-atom · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Content Atom and Quiz models - updated after whiteboard discussion #2

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

Merged
merged 20 commits into from
Sep 4, 2015
Merged

Content Atom and Quiz models - updated after whiteboard discussion #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
bd8489a
first stab at creating the tenfour quiz model as
paulmr Aug 26, 2015
649fdf2
include the quiz/tenfour stuff in the main.js
paulmr Aug 26, 2015
e079ea9
tweaks to the build script
paulmr Aug 28, 2015
3e65b05
document required/optional fields
paulmr Aug 28, 2015
5a9cd8a
update generated code
paulmr Aug 28, 2015
2686b61
add types of content atom so they can fit into a union
paulmr Aug 28, 2015
e10d0ad
Merge branch 'master' into pr-quiz-model
paulmr Aug 28, 2015
3eedf30
remove the url from the event type
paulmr Aug 28, 2015
6938dde
dont build java code
paulmr Aug 28, 2015
0418bcd
use an enum for the atom type
paulmr Aug 28, 2015
77ae1ad
disambiguate naming
paulmr Aug 28, 2015
8242da3
minor changes
paulmr Sep 2, 2015
6560d21
updating model after whiteboard session
paulmr Sep 2, 2015
461ca4a
delete generated files no longer needed
paulmr Sep 2, 2015
42981ed
use weight for the answers to support multiple correct in the future
paulmr Sep 2, 2015
998a056
Merge branch 'master' into pr-quiz-model
paulmr Sep 3, 2015
3602a97
use ContentChangeDetails in content-atom model
paulmr Sep 3, 2015
0c63be0
polls etc will be separate atom type
paulmr Sep 3, 2015
3b39358
remove duplicated content metadata
paulmr Sep 3, 2015
f95323b
minor tweaks from pr
paulmr Sep 4, 2015
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
7 changes: 4 additions & 3 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/bash

LANGUAGES=("js:node" "java")
LANGUAGES=("js:node")

THRIFT_VERBOSE="-v"
THRIFT_VERBOSE=""

while getopts "q" OPT
do
Expand Down Expand Up @@ -53,8 +53,9 @@ function thrift {

LANG_OPTS=${LANGUAGES[@]/#/--gen }

for file in $THRIFT_FILES
for file in "${THRIFT_FILES[@]}"
do
echo "FILE: $file"
$THRIFT_CMD $THRIFT_VERBOSE --recurse -o ${OUT_DIR} $LANG_OPTS "$file"
done
}
Expand Down
Loading
0