Commit Graph

815 Commits (master)

Author SHA1 Message Date
Frode Petterson 3fa4b0486c Merge branch 'master' of b.amendor.com:h5p
Conflicts:
	.gitmodules
2013-04-04 15:44:46 +02:00
Frode Petterson 785f787913 Removed submodules 2013-04-04 15:44:06 +02:00
Svein-Tore Griff With 5f8e1a9f54 Adding back the modules that used to be submodules 2013-04-04 15:18:08 +02:00
Svein-Tore Griff With 04f5d0357d Fix library loading bug 2013-04-03 15:44:43 +02:00
Svein-Tore Griff With fae5693ace Fix library.json bugs 2013-04-03 15:15:55 +02:00
Frode Petterson 084924935e Dropped window in favor of var to increase readability, usability and prevent IE8 from crashing. 2013-04-02 17:04:35 +02:00
Frode Petterson 8ddc2ec148 Converted to widget system. 2013-04-02 14:22:15 +02:00
Frode Petterson 9097c8e310 Removed version number from semantics. 2013-03-08 13:49:22 +01:00
Frode Petterson eaf45ee1d3 Tried to make H5P work again.. 2013-03-08 11:51:28 +01:00
Frode Petterson c79bb54c4e Merge branch 'master' of intern.amendor.com:h5plibs/questionset 2013-03-07 12:33:53 +01:00
Frode Petterson 52e043d036 Added class to libraries. 2013-03-07 12:33:44 +01:00
Svein-Tore Griff With c7ecbdb0ae Remove file relevant for the boardgame styles 2013-03-07 11:15:55 +01:00
Svein-Tore Griff With 76723a6ec8 Remove insane default styles 2013-03-07 05:01:37 +01:00
Svein-Tore Griff With 75eaa9fa68 Adding versioning support 2013-03-07 04:09:44 +01:00
Svein-Tore Griff With d82f8ef1e7 Adding full versioning support 2013-03-06 15:58:30 +01:00
Svein-Tore Griff With c502efd675 Remove comma 2013-03-06 08:03:05 +01:00
Svein-Tore Griff With 16d690c722 Add versioning support 2013-02-27 23:03:35 +01:00
Frode Petterson a9d205b799 Fixed video format. 2013-02-25 14:15:06 +01:00
Frode Petterson 368e085940 Fixed slider. 2013-02-21 16:28:53 +01:00
Frode Petterson 0a6d93c317 Made field common. 2013-02-19 14:42:05 +01:00
Svein-Tore Griff With 31f3f52567 Fix problems with the new content.json 2013-02-08 00:54:02 +01:00
Svein-Tore Griff With 914a5ec991 Merge conflick 2013-02-08 00:52:57 +01:00
Frank Ronny Larsen 069314313f Merge branch 'master' of intern.amendor.com:h5plibs/questionset 2013-02-07 19:08:59 +01:00
Frank Ronny Larsen fbda4843fa BUGFIX: Don't use rgba() before url(). IE does not understand, and shouldn't be there anyway 2013-02-07 19:08:52 +01:00
Frode Petterson 1d8dada558 Added another wrapper to make lists more flexible. 2013-02-07 18:59:42 +01:00
Frank Ronny Larsen c69c75f601 Updated to new json syntax 2013-02-07 18:02:34 +01:00
Frank Ronny Larsen 511bf37c1f DEVELOPMENT: Use H5P.playVideo 2013-02-07 18:01:08 +01:00
Frank Ronny Larsen 45d59b82fe Increased patch version 2013-02-07 14:17:00 +01:00
Frank Ronny Larsen 344a356529 CSS fixes, Show video before result page 2013-02-07 14:08:44 +01:00
Frank Ronny Larsen bd1125de0f Change to use library/params instead of machineName/options 2013-02-07 13:11:42 +01:00
Frank Ronny Larsen 929e71fa38 Styling for result page. Better button states 2013-02-06 20:25:06 +01:00
Frank Ronny Larsen 44ef62eb90 Updated to use image objects from options 2013-02-06 15:49:15 +01:00
Frode Petterson e6add04473 Minor adjustments to semantics. 2013-02-01 13:38:35 +01:00
Frank Ronny Larsen c508b712fd Converted buttons to a's 2013-01-30 19:55:33 +01:00
Frank Ronny Larsen be754296e6 Updated semantics to new syntax 2013-01-30 17:58:50 +01:00
Svein-Tore Griff With 22468e93fd Add semantics.json, should have been a renaming... 2013-01-27 23:11:17 +01:00
Svein-Tore Griff With 8533068dc7 Rename init to main_library and remove init from libraries, add schema to db 2013-01-27 23:11:09 +01:00
Svein-Tore Griff With bbb9d071d2 Pointer as cursor for buttons 2013-01-26 16:34:23 +01:00
Svein-Tore Griff With 5832446bc6 Avoid confusion with the progress colors. Ppl think they tell them whether they have answered right or wrong. 2013-01-26 15:58:06 +01:00
Svein-Tore Griff With c17e35eb9b Temporary styles for the start quiz button 2013-01-26 15:50:11 +01:00
Frank Ronny Larsen 4f11ac94f9 Better transition/transform for FF/Opera too 2013-01-25 14:35:02 +01:00
Frank Ronny Larsen 3cfbd5f586 Changes to default styles for QuestionSets 2013-01-25 10:22:47 +01:00
Frank Ronny Larsen f23160d67b Preload video, to avoid wait when pressing finish-button 2013-01-24 09:25:17 +01:00
Frank Ronny Larsen 393379884b Added video playback on QuestionSet finish 2013-01-23 23:05:22 +01:00
Frank Ronny Larsen 55e3af8dd1 BUGFIX: Missing commas and colons in schema.json 2013-01-23 21:39:14 +01:00
Svein-Tore Griff With e884959081 Remove questionset 2013-01-22 22:07:24 +01:00
Svein-Tore Griff With cb58c835e3 Add changes from h5p.git example_content 2013-01-22 21:59:14 +01:00
Svein-Tore Griff With e8ef20a995 Add temporary styling 2013-01-20 22:57:53 +01:00
Svein-Tore Griff With 6c8e2c57af Fix target bug in questionset 2013-01-20 22:25:34 +01:00
Svein-Tore Griff With 9ee3ee91f3 Store whether or not a library is runnable 2013-01-17 23:21:10 +01:00