Commit Graph

Select branches

Hide Pull Requests

Fix-translations

d3summaryChart

l10n_master

master

metadata

ramdomize

release

revert-11-add-override-of-check-button

revert-29-max_score

set-xapi-data

stable

#1

#10

#11

#12

#13

#13

#14

#15

#16

#18

#19

#19

#2

#20

#21

#21

#22

#23

#26

#27

#29

#3

#30

#31

#32

#33

#34

#34

#35

#36

#37

#38

#39

#4

#4

#40

#41

#42

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#55

#56

#57

#58

#59

#6

#6

#60

#61

#62

#63

#64

#65

#66

#67

#69

#7

#7

#70

#72

#72

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#84

#85

#86

#87

#88

#88

#9

1.0.57

1.0.58

1.0.60

1.1.0

1.10.0

1.10.1

1.10.2

1.11.0

1.12.0

1.12.1

1.12.2

1.13.2

1.13.3

1.13.4

1.14.1

1.15.0

1.15.1

1.15.2

1.15.3

1.16.2

1.16.3

1.16.4

1.16.5

1.17.0

1.17.1

1.17.2

1.17.3

1.17.4

1.17.5

1.17.6

1.17.7

1.3.2

1.4.0

1.4.1

1.4.2

1.5.0

1.5.1

1.5.2

1.6.2

1.6.4

1.7.0

1.8.3

1.8.4

1.9.0

release-2016-nov-01

release-2016-nov-16

Mono Color

• 2bc6b0598c Merge branch 'stable' Frode Petterson 2015-10-12 09:26:04 +0200
• 7e398ff1da Upped patch version. 1.5.1 Frode Petterson 2015-10-12 09:24:33 +0200
• 80c6b0678d Resize QS container when Q changes size. Frode Petterson 2015-10-12 09:22:37 +0200
• 767ec106a5 Merge branch 'stable' Frode Petterson 2015-10-08 13:06:01 +0200
• 7bb0a928f1 Merge branch 'release' into stable 1.5.0 Frode Petterson 2015-10-07 10:02:12 +0200
• 0b7d2e2b36 Merge branch 'release' falcon 2015-10-01 09:41:34 +0200
• a6299e94e4 Do not show try-again and show-solution button for questions inside a question set. [HFJ-1110] Thomas Marstrander 2015-09-27 19:12:40 +0200
• 198ae5fd3e Add 'finish' button as hidden, do not show it before all questions has been answered. [HFJ-1029] Thomas Marstrander 2015-09-26 17:38:07 +0200
• b00490bbe6 Added wysiwyg support to title field. Frode Petterson 2015-09-25 11:13:05 +0200
• 439f850729 Prevent crashing JS. Frode Petterson 2015-09-25 10:57:16 +0200
• 2e307e8e55 Increased minor version and dependency to JoubelUI. [HFJ-1088] Thomas Marstrander 2015-09-24 15:39:12 +0200
• e0f8afb3f9 Make sure content is resized after images in content types are laoded. [HFJ-1091] Thomas Marstrander 2015-09-24 13:16:54 +0200
• 848a680de4 Increase patch version Thomas Marstrander 2015-09-15 09:49:28 +0200
• e1ce82fcf4 Merge branch 'release' Thomas Marstrander 2015-09-10 13:30:12 +0200
• 4f7c4e7771 Increased dependencies to match other content types [HFJ-1007] Thomas Marstrander 2015-09-09 16:22:46 +0200
• 312a2a3874 Merge branch 'master' into release Thomas Marstrander 2015-09-04 09:39:56 +0200
• ef302b1173 Updated title and description. Frode Petterson 2015-08-28 10:41:49 +0200
• 5bd2d30b01 Merge pull request #1 from Stephlabaraque/patch-1 Frode Petterson 2015-08-26 11:01:11 +0200
• a6b11ba71c Update fr.json Stephlabaraque 2015-08-25 19:08:14 +0200
• 031b4bb8e8 Merge branch 'always-continue' Frode Petterson 2015-08-25 08:49:11 +0200
• 5e1874d9a8 Merge branch 'master' into always-continue Frode Petterson 2015-08-24 14:38:27 +0200
• 7da44eb0f9 Added French language support. Frode Petterson 2015-08-21 16:38:26 +0200
• 9b0844c480 Display error stack as well as useful error message. HFJ-946 Thomas Marstrander 2015-08-20 16:16:02 +0200
• 7c6aa504fd Replaced console logs with useful error messages. HFJ-946 Thomas Marstrander 2015-08-20 16:14:29 +0200
• b9cd56820f Adjusted paddings/margins for H5P.Question HFJ-942 Thomas Marstrander 2015-08-19 16:05:16 +0200
• 8623bb5670 Repositioned buttons, added bottom margin, repositioned feedback-text. HFJ-946 Thomas Marstrander 2015-08-18 14:16:07 +0200
• fdc91abcf8 Removed debugging lines HFJ-946 Thomas Marstrander 2015-08-18 14:02:13 +0200
• 0fb9b8882f Added Question design to QS HFJ-946 Thomas Marstrander 2015-08-18 13:58:33 +0200
• ad0acb2898 Changed retry icon for whole task for consistency. Accepts answered and attempted xapi verbs as well to mark a question as answered. HFJ-946 Thomas Marstrander 2015-08-13 10:35:55 +0200
• 396abf92b7 No left, right, top or bot margins for Questions inside QS without frame. HFJ-949 Thomas Marstrander 2015-08-12 15:30:10 +0200
• c4a78bfdcd Use new button design. Add navigation buttons to Question, instead of to QS. Added specific stylings for new button design. HFJ-946 Thomas Marstrander 2015-08-12 14:46:49 +0200
• b399f9530d xAPI update - add duration to xAPI Svein-Tore Griff With 2015-07-20 13:22:22 +0200
• 436b9d572c Sub content is not allowed to generate completed statements Svein-Tore Griff With 2015-07-10 13:41:16 +0200
• cce3af6078 Replace attempted with interacted Svein-Tore Griff With 2015-07-10 13:15:37 +0200
• b9d8321c3e Merge branch 'stable' Svein-Tore Griff With 2015-07-09 15:49:20 +0200
• 729842a41a Merge branch 'release' into stable 1.4.2 Svein-Tore Griff With 2015-07-09 15:20:31 +0200
• d38867bfd0 bump Svein-Tore Griff With 2015-07-09 15:19:18 +0200
• 18e2168383 Added missing translation. Frode Petterson 2015-07-08 15:27:16 +0200
• 56bb61352e Added missing translation. Frode Petterson 2015-07-08 15:27:16 +0200
• 02d3585425 Resize on video loaded and when results are already rendered. (cherry picked from commit b02fe7c) Thomas Marstrander 2015-07-08 11:01:20 +0200
• b02fe7c668 Resize on video loaded and when results are already rendered. Thomas Marstrander 2015-07-08 11:01:20 +0200
• 12818e2684 Merge branch 'stable' of github.com:h5p/h5p-question-set into stable Paal Joergensen 2015-06-22 14:52:17 +0200
• 3f0c1ee0bf bump 1.4.1 Svein-Tore Griff With 2015-06-22 14:49:16 +0200
• 997db862e7 Bump Paal Joergensen 2015-06-22 14:22:25 +0200
• 15c3e72c52 Merge branch 'release' into stable Paal Joergensen 2015-06-22 14:16:48 +0200
• e090c94444 Translations. Frode Petterson 2015-06-22 13:51:30 +0200
• 20e133b441 Get generic copyrights from content types that doesnt implement getCopyrights. Frode Petterson 2015-06-19 15:40:35 +0200
• c282dbf72f Merge branch 'stable' Svein-Tore Griff With 2015-06-12 11:06:37 +0200
• 25df26cdba Merge branch 'release' into stable Svein-Tore Griff With 2015-06-09 15:49:15 +0200
• ea6af64c31 New DragQ version dependency, version bump Thomas Marstrander 2015-05-15 10:42:20 +0200
• d28cba03a3 Merge branch 'master' into release 1.4.0 Svein-Tore Griff With 2015-05-12 14:15:22 +0200
• dda734b793 Merge branch 'stable' Svein-Tore Griff With 2015-04-22 23:38:41 +0200
• 85c5f54593 Merge branch 'release' into stable 1.3.2 Svein-Tore Griff With 2015-04-22 23:00:40 +0200
• 3cc6337c81 Question set minor version has been bumped twice, correct this Svein-Tore Griff With 2015-04-14 13:56:32 +0200
• d43fa38f29 Add upgrade script for adding sub content id Svein-Tore Griff With 2015-04-08 15:04:29 +0200
• 3cab3010fa Update call to newRunnable to use update api Svein-Tore Griff With 2015-04-07 19:16:44 +0200
• 4aef67c14f Update dependencies Svein-Tore Griff With 2015-04-07 19:00:11 +0200
• 10ab46e91e Merge branch 'aggregated-xapi' Svein-Tore Griff With 2015-04-07 18:41:59 +0200
• c64e8285a1 Added italian translation Frode Petterson 2015-04-07 10:21:35 +0200
• 2bd5843e97 Use correct mc version Svein-Tore Griff With 2015-03-22 20:59:59 +0100
• ab00c5cc94 Experiment with bubble system Svein-Tore Griff With 2015-03-21 16:48:32 +0100
• fffe9d318e Updated AR translation. Thanks to community user farrisimin for contributing. Frode Petterson 2015-03-20 14:35:34 +0100
• 8ab4bd5b76 Added AR language support. Big thanks to community user farrisimin for contributing. Frode Petterson 2015-03-18 15:21:22 +0100
• 84eea1e44a Merge branch 'master' into stable Svein-Tore Griff With 2015-02-19 02:18:17 +0100
• f064ad59d5 resize when displaying solution Svein-Tore Griff With 2015-02-18 18:08:57 +0100
• 061c15a2d6 Update to video 1.2 api Svein-Tore Griff With 2015-02-17 11:14:49 +0100
• d6ecc1705a xAPI update Svein-Tore Griff With 2015-02-13 10:37:59 +0100
• 8c6fb5c2e5 Resolve conflict Svein-Tore Griff With 2015-02-12 14:08:44 +0100
• aeee49e85e dependency version updates Svein-Tore Griff With 2015-02-12 14:07:07 +0100
• 186ef396e2 Merge branch 'text-editor' Svein-Tore Griff With 2015-02-05 12:11:47 +0100
• 9777d3964e Correct author Svein-Tore Griff With 2015-02-04 20:57:49 +0100
• 7c519e770d Update core version and minor version Svein-Tore Griff With 2015-02-04 18:13:03 +0100
• 00e5e81c0b Resolve conflicts and refine Svein-Tore Griff With 2015-02-04 16:40:29 +0100
• 5c158d235f Run in iframe since drag and drop needs iframe Svein-Tore Griff With 2015-01-29 13:13:07 +0100
• 2e3736c22b Merge branch 'text-editor' of github.com:h5p/h5p-question-set into text-editor Svein-Tore Griff With 2015-01-19 12:11:53 +0100
• 894220c525 Merge branch 'master' into text-editor Frode Petterson 2015-01-16 15:55:25 +0100
• 07e49c69e9 Merge branch 'master' into stable 1.1.0 Svein-Tore Griff With 2015-01-13 18:41:53 +0100
• 7f97c036ba Merge branch 'master' of github.com:h5p/h5p-question-set Svein-Tore Griff With 2015-01-13 15:02:57 +0100
• 1e2f94c15a Changed version to make upgraded question types work. Frode Petterson 2015-01-08 14:39:55 +0100
• fab802102e Minor css change d3summaryChart Thomas Marstrander 2015-01-07 12:29:40 +0100
• 1e2e1da644 D3 experimenting. A summary graph for questionset, only meant to illustrate what uses d3 has for our content types. Not a final product. Thomas Marstrander 2015-01-07 11:38:55 +0100
• b85f744541 Merge branch 'master' of github.com:h5p/h5p-question-set Svein-Tore Griff With 2014-12-17 13:37:44 +0100
• ab62111f31 Fixed nn and nb languge semantics Thomas Marstrander 2014-12-17 13:33:59 +0100
• e4491980bb Merge branch 'override-buttons' Svein-Tore Griff With 2014-12-16 09:12:38 +0100
• 82898e6fac Merge branch 'override-buttons' of github.com:h5p/h5p-question-set into override-buttons Svein-Tore Griff With 2014-12-15 09:09:44 +0100
• 41063026b4 Fixed so not all behaviour of subcontent will be overwritten. Thomas Marstrander 2014-12-05 11:55:36 +0100
• 3f7d5a52f8 Merge branch 'override-buttons' of github.com:h5p/h5p-question-set into override-buttons Svein-Tore Griff With 2014-12-04 12:44:56 +0100
• 33f9ea3ba1 Added the override settings into the correct subcontent semantics group. Thomas Marstrander 2014-12-04 10:26:52 +0100
• 1d5dd18742 Updated question minor versions. Thomas Marstrander 2014-12-04 10:13:06 +0100
• 0165ebb695 Added textual editor. Frode Petterson 2014-12-03 13:02:31 +0100
• 549216fd31 Merge branch 'override-buttons' of github.com:h5p/h5p-question-set into override-buttons Svein-Tore Griff With 2014-12-02 13:09:50 +0100
• 4897db48fd Semantics description for overrideRetry changed. Thomas Marstrander 2014-11-28 15:39:19 +0100
• e465c08953 Merge branch 'override-buttons' of github.com:h5p/h5p-question-set into override-buttons Svein-Tore Griff With 2014-11-28 14:55:59 +0100
• 587c593474 changed semantics enableRetryButton to enableRetry. Thomas Marstrander 2014-11-28 13:51:26 +0100
• 02589ff35a Textual improvements in semantics Svein-Tore Griff With 2014-11-27 13:39:39 +0100
• 5510959615 Added override-buttons branch. Thomas Marstrander 2014-11-27 11:01:47 +0100
• 6a064e70b5 Merge branch 'markTheWords' Svein-Tore Griff With 2014-11-25 13:07:44 +0100
• cd4fae18e4 Merge branch 'master' into markTheWords Svein-Tore Griff With 2014-11-25 13:07:36 +0100
• a6df5c670d Merge branch 'stable' of github.com:h5p/h5p-question-set into stable Svein-Tore Griff With 2014-11-18 16:48:56 +0100
• b69fd8c33b Merge branch 'master' of github.com:h5p/h5p-question-set Svein-Tore Griff With 2014-11-18 16:48:00 +0100