Scott Erickson
93c7072d8d
Refactor ConfirmModal for #3138 and #3488
2016-03-18 11:03:55 -07:00
Scott Erickson
1c629a3181
Fix options in forms.objectToForm
2016-03-18 11:03:55 -07:00
Scott Erickson
f21baa7af5
Migrate /db/trial.request for #3469
2016-03-18 11:03:55 -07:00
Scott Erickson
356523dd4b
Add .btn-burgandy
2016-03-18 11:03:54 -07:00
Scott Erickson
46afe40637
Fix forms.scrollToFirstError when there is no error to scroll to
2016-03-18 11:03:54 -07:00
Scott Erickson
2e96a387e9
Add User.logout to client
2016-03-18 11:03:54 -07:00
Matt Lott
2091a47801
Merge branch 'master' into production
2016-03-18 10:35:42 -07:00
Matt Lott
255ebbc048
Ads for free campaign players
...
Display leaderboard ads on campaign and play views.
Do no show ads in classroom, picoCTF, or to teachers.
Add no ads blurb to subscription features matrix.
Scale game UI for ads on short screens.
Closes #3491
2016-03-18 10:29:31 -07:00
Matt Lott
1bab6cee88
Add school classroom search script
2016-03-17 17:36:45 -07:00
Matt Lott
f14575ece6
Update subscribe modal level counts
2016-03-17 17:29:47 -07:00
Scott Erickson
8e6faaf66c
Have index.js check node version is >= 4 before continuing, for #3495
2016-03-17 12:48:07 -07:00
Maikel Langezaal
49d7028e2e
Cleanup
2016-03-17 11:30:19 +01:00
Imperadeiro98
9a36267ba7
Cleanup i18n in some files
2016-03-16 21:49:19 +00:00
Imperadeiro98
1bff279ea6
Merge pull request #3493 from Zeldaretter/patch-2
...
Update de-DE.coffee
2016-03-16 19:39:25 +00:00
Zeldaretter
d565d5bc0b
Update de-DE.coffee
...
i added and translated all lines that where missing from the original English en.coffee
I would like to Copy my changes to the Austrian German version, because it is nearly the same and if some Austrian Translator finds an error or a better word than he can edit it, but its like british and american English and both understand each others well and here I think its better to have German than English, what do you think?
2016-03-16 18:36:53 +01:00
Imperadeiro98
e6b0eb6401
Merge pull request #3492 from JurianLock/patch-7
...
Update nl-NL.coffee
2016-03-16 12:59:22 +00:00
Imperadeiro98
1b1ac3028f
Merge pull request #3490 from Zeldaretter/patch-1
...
Update de-DE.coffee
2016-03-16 12:58:26 +00:00
JurianLock
3a46ada802
Update nl-NL.coffee
...
Another set of updates.
2016-03-16 13:02:20 +01:00
Zeldaretter
10dc03bc7e
Update de-DE.coffee
...
Added some new strings from the English original
2016-03-16 10:12:35 +01:00
Zeldaretter
0ec23f025c
Update de-DE.coffee
...
new updated strings, I finished translating. Next I will check if all strings are correct by comparing with the English original because some strings were allready translated and may not fit with the new layout.
Greetings and Thank you for a great game
2016-03-16 09:09:21 +01:00
Nick Winter
4f44d4e19d
Merge branch 'master' into production
2016-03-15 15:52:43 -07:00
Nick Winter
42e1ab6c99
Fix wall collision coalescing code
2016-03-15 15:52:15 -07:00
Zeldaretter
07f21d44bd
Update de-DE.coffee
...
New strings translated. Nearly done, till Eastern I will finish this and start comparing with the english strings again.
2016-03-15 22:01:03 +01:00
Nick Winter
ab29f7e10e
Don't try to use Arvo for Cyrillic language headline fonts
2016-03-15 10:15:16 -07:00
Matt Lott
4e0ee60dce
Use trial request name for Close.io leads
2016-03-15 09:25:36 -07:00
Nick Winter
d37627ad59
Merge branch 'lazydogP-master'
2016-03-15 08:47:30 -07:00
Nick Winter
db813bd77e
Merge zh-HANS.coffee
2016-03-15 08:47:20 -07:00
Imperadeiro98
c07b100712
Merge pull request #3489 from JurianLock/patch-6
...
Update nl-NL.coffee
2016-03-15 15:32:55 +00:00
Imperadeiro98
e5348e665c
Merge pull request #3485 from MatiasOlivera/master
...
Update es-419.coffee
2016-03-15 15:26:45 +00:00
Imperadeiro98
719e45a084
Merge pull request #3481 from Zeldaretter/patch-1
...
Patch 1
2016-03-15 15:23:30 +00:00
Imperadeiro98
f659d22fa5
Merge pull request #3480 from delftswa2016/Chinese-translation
...
Chinese translation
2016-03-15 15:20:31 +00:00
Nick Winter
8a93374a87
Fix silly ancient math mistake
2016-03-15 08:05:00 -07:00
JurianLock
c1fb0c53a9
Update nl-NL.coffee
...
Another set of updates and tweaks.
2016-03-15 01:22:02 +01:00
Nick Winter
9404dcdb32
Merge branch 'master' into production
2016-03-14 16:58:28 -07:00
Nick Winter
e5dda556c6
Add Mandate configuration for session save delays
2016-03-14 16:39:05 -07:00
Matt Lott
57e8e61b1c
🐛 Fix update sales leads script URL encoding
2016-03-14 14:24:18 -07:00
Scott Erickson
07aad0ca18
Merge pull request #3463 from delftswa2016/maximize-button-fix
...
Fix the fullscreen-code button and beautiful-code button
2016-03-14 10:45:08 -07:00
Matt Lott
16e84c3a23
Merge branch 'master' into production
2016-03-14 09:40:50 -07:00
Scott Erickson
cb8987de58
Merge pull request #3482 from delftswa2016/fix-misaligned-login
...
fix misaligned login
2016-03-14 09:40:13 -07:00
Matt Lott
97f7026a4f
Update Close.io sales lead creation
...
Moving lead upserting to background script
2016-03-14 09:35:57 -07:00
Jacob Boon
ce8f7f2c14
include iDeal offer for Dutch (nl) users
2016-03-14 16:39:16 +01:00
Zeldaretter
d9e271da4a
Update de-DE.coffee
...
Just did the changes. I don't know if it is good to translate the job benefits, because some of them don't work in Germany and I think if someone wants to work for you they have to at least speak enough English to understand this benefits.
2016-03-14 07:05:01 +01:00
lazydogP
bdf59fe430
Update zh-HANS.coffee
2016-03-14 13:00:44 +08:00
Matías Olivera
d5b8f5c726
Update teachers_quote
2016-03-13 21:56:06 -03:00
Matías Olivera
147db289fb
Update about
2016-03-13 21:06:11 -03:00
Chengxin Ma
d2cefce7da
Update zh-HANS.coffee
2016-03-13 22:42:12 +01:00
Chengxin Ma
286b8161ca
Update zh-HANS.coffee
2016-03-13 22:37:26 +01:00
Yu Liang
3dfb0c04b8
add margin-left for id 'create-account-btn'
2016-03-13 16:36:36 +01:00
Jan van den Berg
e449571139
Update nl-NL.coffee
...
Minor language fixes
2016-03-13 12:11:18 +01:00
yuliang123
c875c8c5ec
fix misaligned login
2016-03-13 00:22:19 +01:00
