Frode Petterson
|
aa4c1d1035
|
Moved introduction in semantics.
|
2014-10-08 14:53:43 +02:00 |
Pål Jørgensen
|
8f85d4a5a7
|
Removed some nn-text from the nb-translation
|
2014-10-07 11:37:03 +02:00 |
|
Frode Petterson
|
8a71d3689e
|
Merge branch 'api-1.1' into api-1.2
|
2014-06-27 11:12:53 +02:00 |
|
Frode Petterson
|
1a6cc9b09d
|
Merge branch 'master' into api-1.1
|
2014-06-27 11:12:42 +02:00 |
|
Frode Petterson
|
76fb66317c
|
Added back text to finish button.
|
2014-06-27 11:12:31 +02:00 |
|
Frode Petterson
|
cdbcc3ad92
|
Merge branch 'api-1.1' into api-1.2
|
2014-06-26 16:23:46 +02:00 |
|
Frode Petterson
|
4c5c3ffe86
|
Merge branch 'master' into api-1.1
|
2014-06-26 16:23:35 +02:00 |
|
Frode Petterson
|
24f877cc8e
|
Removed text from nav buttons.
|
2014-06-26 16:23:12 +02:00 |
|
Frode Petterson
|
b39df78eeb
|
Merge branch 'api-1.1' into api-1.2
|
2014-05-23 11:12:51 +02:00 |
|
Frode Petterson
|
529f8405e7
|
Merge branch 'master' into api-1.1
Conflicts:
css/questionset.css
library.json
|
2014-05-23 11:12:16 +02:00 |
|
Frode Petterson
|
21535779a8
|
Added FontAwesome 4.1 as a dependency.
|
2014-05-23 11:09:49 +02:00 |
|
Pål Jørgensen
|
8185483de9
|
Merge branch 'api-1.1' into api-1.2
|
2014-05-06 12:21:59 +02:00 |
|
Pål Jørgensen
|
5d9ecfc9a0
|
Merge branch 'master' into api-1.1
|
2014-05-06 12:21:46 +02:00 |
|
Pål Jørgensen
|
ad2326f0aa
|
Updated language-fileas with translations for intropage background image
|
2014-05-06 12:21:26 +02:00 |
|
Frode Petterson
|
5ec069dad4
|
Merge branch 'api-1.1' into api-1.2
|
2014-04-30 12:20:51 +02:00 |
|
Frode Petterson
|
dd52d82dcf
|
Merge branch 'master' into api-1.1
|
2014-04-30 12:20:33 +02:00 |
|
Frode Petterson
|
ada5e81c87
|
Added support for custom background on intro page.
|
2014-04-30 12:19:55 +02:00 |
|
Pål Jørgensen
|
df90fb8e70
|
Merge branch 'api-1.1' into api-1.2
|
2014-04-15 14:48:53 +02:00 |
|
Pål Jørgensen
|
8f7c1b0817
|
Merge branch 'master' into api-1.1
|
2014-04-15 14:48:40 +02:00 |
|
Pål Jørgensen
|
b6ba0e4c34
|
Made title text div not beeing rendered if no title set
|
2014-04-15 14:48:28 +02:00 |
|
Pål Jørgensen
|
0bc40d1ef2
|
Merge branch 'api-1.1' into api-1.2
|
2014-04-15 11:33:31 +02:00 |
|
Pål Jørgensen
|
272f8febb1
|
Merge branch 'master' into api-1.1
|
2014-04-15 11:33:21 +02:00 |
|
Pål Jørgensen
|
61e62185a6
|
Made introduction text div not beeing rendered if no intro text set
|
2014-04-15 11:33:01 +02:00 |
|
Pål Jørgensen
|
f3df9e9923
|
Merge branch 'api-1.1' into api-1.2
|
2014-04-14 13:33:38 +02:00 |
|
Pål Jørgensen
|
cc1b424793
|
Merge branch 'api-1.2' of github.com:h5p/h5p-question-set into api-1.2
|
2014-04-14 13:33:30 +02:00 |
|
Pål Jørgensen
|
7207049c2c
|
Merge branch 'master' into api-1.1
|
2014-04-14 13:33:13 +02:00 |
|
Pål Jørgensen
|
8d58c88657
|
Updated texts
|
2014-04-14 13:32:54 +02:00 |
Pål Jørgensen
|
1209931228
|
Merge github.com:h5p/h5p-question-set into api-1.2
|
2014-04-13 19:03:39 +02:00 |
Frode Petterson
|
dc2da8b757
|
Merge branch 'api-1.1' into api-1.2
|
2014-04-11 15:51:29 +02:00 |
|
Frode Petterson
|
10f9a0b447
|
Merge branch 'master' into api-1.1
|
2014-04-11 15:50:48 +02:00 |
|
Frode Petterson
|
bc9b787e78
|
Fixed resize bug when embedded.
|
2014-04-11 15:50:22 +02:00 |
|
Frode Petterson
|
0dcc4503f9
|
Added ignore file.
|
2014-04-10 12:57:55 +02:00 |
|
Pål Jørgensen
|
f661237a12
|
Merge branch 'api-1.1' into api-1.2
|
2014-04-03 15:08:51 +02:00 |
|
Pål Jørgensen
|
94f1a9017e
|
Merge branch 'master' into api-1.1
|
2014-04-03 15:08:08 +02:00 |
|
Pål Jørgensen
|
ae8af678a2
|
Made rounded corners for background (title/description on intro page)
|
2014-04-03 15:07:50 +02:00 |
|
Pål Jørgensen
|
282e9e77e4
|
Merge branch 'api-1.1' into api-1.2
|
2014-04-03 10:21:02 +02:00 |
|
Pål Jørgensen
|
ce5d97b485
|
Merge branch 'master' into api-1.1
|
2014-04-03 10:20:35 +02:00 |
|
Pål Jørgensen
|
9179f6209a
|
Added transparent background-color to title and description fields on intro-page
|
2014-04-03 10:19:47 +02:00 |
|
Pål Jørgensen
|
6f13435445
|
Merge branch 'api-1.1' into api-1.2
|
2014-04-02 15:35:13 +02:00 |
|
Pål Jørgensen
|
e9835fd587
|
Merge branch 'master' into api-1.1
|
2014-04-02 15:34:55 +02:00 |
|
Pål Jørgensen
|
ef5670c5c4
|
Bumped patch version
|
2014-04-02 15:33:43 +02:00 |
|
Pål Jørgensen
|
b289d25949
|
Merge branch 'api-1.1' into api-1.2
|
2014-04-02 15:17:45 +02:00 |
|
Pål Jørgensen
|
8f62a51fe5
|
Merge branch 'master' into api-1.1
|
2014-04-02 15:17:25 +02:00 |
|
Pål Jørgensen
|
31ddbd8379
|
Made getCopyrights work with empty optional fields
|
2014-04-02 00:10:30 +02:00 |
|
Frode Petterson
|
b8a07e4996
|
Removed left overs from merge.
|
2014-03-28 17:06:59 +01:00 |
|
Frode Petterson
|
e2fd4e2ba4
|
Merged new repo into old sub module.
Conflicts:
css/questionset.css
js/questionset.js
library.json
semantics.json
|
2014-03-28 17:05:08 +01:00 |
|
Frode Petterson
|
bd67306b96
|
Merge branch 'master' into api-1.2
|
2014-03-26 15:59:15 +01:00 |
|
Frode Petterson
|
8088b40bab
|
Merge branch 'api-1.0'
|
2014-03-26 15:58:48 +01:00 |
|
Frode Petterson
|
1c749e63ec
|
Added README files.
|
2014-03-26 15:57:56 +01:00 |
|
Frode Petterson
|
5e31bb138f
|
Merge branch 'master' into api-1.2
|
2014-03-23 01:34:26 +01:00 |