Matt Lott
50171a5b02
🐛 Fix admin trial requests page
...
Server refactoring exposed incorrect server parameters.
2016-03-21 11:39:15 -07:00
Nick Winter
eec50c8e44
Only collapse collision shapes for walls
2016-03-21 10:57:38 -07:00
Matt Lott
6a4132e057
Update campaign ads test groups
2016-03-21 08:07:22 -07:00
Matt Lott
3dd322986a
Update Slack message destinations
...
Using ops and dev-feed more, reducing noise on general.
2016-03-21 05:36:44 -07:00
Matt Lott
d1ae4adfbb
Merge pull request #3499 from IC-Induja/master
...
Added 9 new loading screen comments
2016-03-20 05:40:17 -07:00
Matt Lott
2bf028cc4a
Update /about page team section
2016-03-20 05:30:52 -07:00
IC-Induja
57bd7ab5f8
Update level_loading.jade
2016-03-20 01:20:42 -04:00
Matt Lott
5d71acba05
Replace HipChat with Slack
2016-03-18 17:05:21 -07:00
Nick Winter
905c9cdb93
Use victory text and next level data on level completion. Update picoCTF logo.
2016-03-18 14:18:41 -07:00
Nick Winter
dc3ba40a45
One more change from #3483
2016-03-18 11:35:56 -07:00
Nick Winter
cf00ab83f0
Merge branch 'koozz-patch-1'
2016-03-18 11:35:09 -07:00
Nick Winter
c42f2512e9
Merge nl-NL.coffee
2016-03-18 11:35:04 -07:00
Nick Winter
13928884b0
Merge iDEAL link for nl on home
2016-03-18 11:16:28 -07:00
Nick Winter
2d670c4680
Merge branch 'wearelandscape-master'
2016-03-18 11:14:27 -07:00
Nick Winter
4a737d3045
Merge iDEAL link for nl on home
2016-03-18 11:14:10 -07:00
Scott Erickson
d6a46826e6
Add top margin to base-flat footer
2016-03-18 11:03:55 -07:00
Scott Erickson
61953219a4
Have user avatar endpoint check that id is valid
...
To limit errors for client tests which send invalid ids
2016-03-18 11:03:55 -07:00
Scott Erickson
461fb14f37
TestView styling and responsive tweaks
2016-03-18 11:03:55 -07:00
Scott Erickson
ecfb148b3c
Add spacing classes to style-flat
2016-03-18 11:03:55 -07:00
Scott Erickson
2a399e71fa
Add CocoView.scrollToTop
2016-03-18 11:03:55 -07:00
Scott Erickson
e6593dea8d
Refactor FacebookHandler and GPlusHandler
...
* Move api loading to FacebookHandler
* Use success callbacks
* Use same, properly named events
* Use same functions and property names
* Refactor related social button, out of use rendering system
* Remove the now unnecessary form split from CreateAccountModal
2016-03-18 11:03:55 -07:00
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
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
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
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
