Dominik Kundel
f09b3c4792
Merge remote-tracking branch 'upstream/master'
2014-08-04 23:03:28 +02:00
Dominik Kundel
50517431db
added support for inserting snippets by shift+click
2014-08-04 23:02:54 +02:00
Dominik Kundel
86eea93e2f
merged changes
2014-08-04 22:37:15 +02:00
Ruben Vereecken
3266e3b46b
intermediate
2014-08-04 22:21:43 +02:00
Nick Winter
85011d1ed4
No need to explicitly track subviews for determining what the current view is.
2014-08-04 13:21:42 -07:00
Darredevil
a11649b12b
Typo fix
2014-08-04 23:15:01 +03:00
Nick Winter
0bcaf70d56
Merge pull request #1406 from rubenvereecken/forms_fix
...
Fixed missing errors bug
2014-08-04 12:49:22 -07:00
Nick Winter
8a86e86012
Merge pull request #1390 from Imperadeiro98/master
...
Update pt-PT.coffee
2014-08-04 12:45:13 -07:00
Ruben Vereecken
c165d46e17
Fixed missing errors bug
2014-08-04 20:02:26 +02:00
Ruben Vereecken
fb3848359e
Merge branch 'master' into achievements
2014-08-04 17:55:44 +02:00
Ruben Vereecken
6267352c6e
Drastically changed the way achievements get grayscaled
2014-08-04 15:29:46 +02:00
Jayant Jain
549f2657ea
Styles add button for addComponentsTreema
2014-08-04 07:53:24 +05:30
Jayant Jain
06875ce2b8
Resolves bug with mouseenter and mouseleave callbacks for add components treema
2014-08-04 07:21:02 +05:30
Jayant Jain
9e1513eb56
Add button on hover for addComponentsTreema
2014-08-04 07:05:22 +05:30
Jayant Jain
98f43b679f
Adds component upon double click, newly added components are automatically selected
2014-08-04 06:04:35 +05:30
Jayant Jain
03d696c3df
Components can now be added to thangs by dragging and dropping
2014-08-04 05:51:12 +05:30
Ruben Vereecken
26085f9f3e
Added a bunch of achievements to the script. Restyled big parts.
2014-08-03 23:58:51 +02:00
Imperadeiro98
0663dbc414
Update pt-PT.coffee
2014-08-01 10:39:30 +01:00
Imperadeiro98
4b932593be
Update pt-PT.coffee
2014-07-31 18:39:13 +01:00
Imperadeiro98
96fb84362a
Update pt-PT.coffee
2014-07-31 18:21:23 +01:00
Imperadeiro98
c7212226ae
Update pt-PT.coffee
2014-07-31 18:01:09 +01:00
Imperadeiro98
68e3110e74
Update pt-PT.coffee
2014-07-31 17:38:14 +01:00
Michael Schmatz
ca7b8ca10a
Merge pull request #1401 from rubenvereecken/test_fix
...
Repaired TestView by only loading js files once
2014-07-31 08:14:59 -07:00
Michael Schmatz
e7de8e3282
Merge pull request #1396 from rubenvereecken/refactoring
...
[Urgent] Finished refactoring of LevelGuideModal (renamed from docs_modal)
2014-07-31 08:12:18 -07:00
Michael Schmatz
2ebc7f5aa6
Merge pull request #1398 from jayant1992/master
...
Updates for script tab in level editor
2014-07-31 08:12:04 -07:00
Michael Schmatz
52b8dd8db3
Merge pull request #1400 from rubenvereecken/moment_update
...
Added Moment i18n support
2014-07-31 08:11:01 -07:00
Michael Schmatz
0b9df5150d
Merge pull request #1393 from Melondonut/patch-3
...
Korean translation - patch3
2014-07-31 08:10:22 -07:00
Ruben Vereecken
0e5accb707
Repaired TestView by only loading js files once
2014-07-31 13:15:57 +02:00
Imperadeiro98
3d71d155b6
Update pt-PT.coffee
2014-07-31 10:50:01 +01:00
Ruben Vereecken
41729f9700
Added Moment i18n support
2014-07-30 23:19:21 +02:00
Ruben Vereecken
871149b2bc
Rechecked and added cool stuff for achievements
2014-07-30 22:23:43 +02:00
Imperadeiro98
1f8ce2eaf2
Update pt-PT.coffee
2014-07-30 20:47:03 +01:00
Jayant Jain
2690ef9a59
Reorders script ids upon deletion
2014-07-30 01:05:04 +05:30
Jayant Jain
f0940308ea
Newly inserted scripts are automatically assigned id
2014-07-30 00:52:59 +05:30
Jayant Jain
632d9a666e
Shows all autocomplete values on click instead of having to type initially
2014-07-30 00:52:59 +05:30
Jayant Jain
0555c2ec14
Initial autocomplete for event checks in scripts tab
2014-07-30 00:52:59 +05:30
Ruben Vereecken
d4043ac3db
Implemented singleplayer and multiplayer games played on profile
2014-07-29 20:11:45 +02:00
Ruben Vereecken
39c01c0bcb
Finished refactoring of LevelGuideModal (renamed from docs_modal)
2014-07-29 19:50:50 +02:00
Ruben Vereecken
30a6cf1cca
Merged in name changes from master
2014-07-29 17:28:13 +02:00
Ruben Vereecken
026e6e6378
Added some support to fetch level sessions for the user profile page
2014-07-29 16:50:07 +02:00
Ruben Vereecken
7987e1d05b
Did a bunch related to achievements and user profile page
2014-07-28 20:04:44 +02:00
Ruben Vereecken
194463c113
Greatly redid achievement styling for various scenarios
2014-07-28 17:40:20 +02:00
Ruben Vereecken
a8df3df095
Default image for achievements. Redid border logic
2014-07-28 15:14:11 +02:00
Ruben Vereecken
15c1939657
Started on achievement setup script
2014-07-28 14:17:25 +02:00
Melondonut
9b830fff26
Update ko.coffee
2014-07-28 18:58:48 +09:00
Melondonut
9d93d871e1
Update ko.coffee
2014-07-28 13:35:05 +09:00
Melondonut
5307515553
Update ko.coffee
2014-07-28 13:07:18 +09:00
Melondonut
53dd446db1
Update ko.coffee
2014-07-28 12:44:20 +09:00
Imperadeiro98
3ffeda8bbc
Update pt-PT.coffee
2014-07-27 19:31:56 +01:00
Michael Schmatz
d7cb76d10c
Merge branch 'pr/1387'
...
Conflicts:
app/views/editor/level/LevelEditView.coffee
2014-07-25 19:17:16 -07:00
Jayant Jain
69713f5603
Adds randomize button in case of level with no thangs
2014-07-26 01:55:28 +05:30
Jayant Jain
df554360fe
Updates glyphicons for undo-redo, adds placeholder text for add thangs search
2014-07-26 01:55:15 +05:30
Darredevil
3b704330d6
Documentation tab for Level Editor
2014-07-25 23:06:04 +03:00
Darredevil
b77b796cef
Merge branch 'codecombat-master'
...
Conflicts:
app/views/docs/ComponentDocumentationView.coffee
app/views/editor/level/LevelEditView.coffee
2014-07-25 22:48:13 +03:00
Darredevil
e3a0ea400c
Docs tab v2
2014-07-25 22:33:55 +03:00
Jayant Jain
3e9dbe0d0b
Fixes bug in undo/redo on SystemsTabView
2014-07-25 18:07:09 +05:30
Jayant Jain
d3962c19bd
Ensures randomised thang clusters do not overlap each other
2014-07-25 18:07:01 +05:30
Jayant Jain
f700ddea0c
Adds temporary hack for infinite loops in randomise
2014-07-25 18:06:54 +05:30
Jayant Jain
1790215fea
Adds rooms and doors to dungeon preset
2014-07-25 18:06:44 +05:30
Jayant Jain
dc66218c00
Adds undo and redo buttons in editor topbar
2014-07-25 18:06:34 +05:30
Jayant Jain
9a24341fa5
Prevents overlapping of randomly generated thangs
2014-07-25 18:06:25 +05:30
Jayant Jain
3df2de8bec
Number of decorations scales appropriately with preset size
2014-07-25 18:06:13 +05:30
Jayant Jain
dce6254d4a
Fix for flickering thangs due to exact same coordinates
2014-07-25 18:06:03 +05:30
Jayant Jain
598e727500
Adds an initial dungeon preset, refactors border code to properly create dungeon walls
2014-07-25 18:05:49 +05:30
Jayant Jain
80da704d19
Background image paths automated, adds preset image files
2014-07-25 17:54:10 +05:30
Jayant Jain
c33491b04d
Presets in terrain_generate_modal shown from a list instead of hardcoded
...
Conflicts:
app/templates/editor/level/modal/terrain_randomize.jade
2014-07-25 17:51:48 +05:30
Jayant Jain
af23c09799
Refactors some code for presets in terrain generator
2014-07-25 17:50:21 +05:30
Jayant Jain
86cf344f28
Adds preset images to preview the generated terrain
2014-07-25 17:50:02 +05:30
Darredevil
f78c48c893
Docs tab v2
2014-07-25 01:26:34 +03:00
Imperadeiro98
19f257f1d0
Update pt-PT.coffee
2014-07-24 22:43:39 +01:00
Michael Schmatz
d773c301fb
Add message if no player code in profile
2014-07-24 10:47:27 -07:00
Michael Schmatz
2120657e5b
Add login link to profile login prompt
2014-07-24 10:16:43 -07:00
Melondonut
26ab77b1ae
Update ko.coffee
2014-07-24 15:43:23 +09:00
Melondonut
f082aa6e9b
Update ko.coffee
2014-07-24 15:30:54 +09:00
Michael Schmatz
e0d7392c1f
Merge pull request #1386 from codecombat/pr/1376
...
Pr/1376
2014-07-23 15:27:13 -07:00
Michael Schmatz
be28f3e6a0
Uncommented some commented translated lines
2014-07-23 15:23:53 -07:00
Michael Schmatz
7910c5d9cc
Implement #1370
2014-07-23 15:10:51 -07:00
Michael Schmatz
c4e3044a81
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-23 14:44:17 -07:00
Michael Schmatz
07cc01332d
Merge branch 'pr/1383'
...
Conflicts:
app/views/play/level/tome/SpellListTabEntryView.coffee
2014-07-23 14:44:15 -07:00
Ruben Vereecken
cde87e4fe5
Covered general patches with tests
2014-07-23 20:00:28 +02:00
Nick Winter
26ac94367e
Fixed #1372 . Minor fixes.
2014-07-23 08:59:42 -07:00
Dominik Kundel
5279b01483
fixed showing pinned popover
2014-07-23 17:39:16 +02:00
Scott Erickson
beef508e76
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-23 07:09:12 -07:00
Scott Erickson
65375aa5fc
Renamed problem and spell to their new, capitalized names.
2014-07-23 07:09:05 -07:00
Scott Erickson
1c3404d03e
Refactored views. View file names now match view class names. Router lists routes explicitly rather than routing automagically. Hacking my way to renaming problem, spell.
2014-07-23 07:02:45 -07:00
Dominik Kundel
4f6ca5335f
fixed spell palette sliding behind HUD
2014-07-23 15:50:47 +02:00
Dominik Kundel
72c1bb28b3
fixed artefact
2014-07-23 15:26:22 +02:00
Dominik Kundel
9cb704a843
last fix for dimming the editor
2014-07-23 15:09:15 +02:00
Dominik Kundel
be50927fb6
disabled editor works again
2014-07-23 14:38:12 +02:00
Melondonut
cb3f547b9e
Update ko.coffee
2014-07-23 14:32:11 +09:00
Melondonut
dbb3d92b81
Update ko.coffee
2014-07-23 13:56:18 +09:00
Ruben Vereecken
8969311d82
Butons on profile page now nicer
2014-07-22 21:52:52 +02:00
Dominik Kundel
5db634d6a8
fullscreen on keyboard shortcut
2014-07-22 21:47:36 +02:00
George Saines
8982c7ea5b
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-22 09:11:30 -07:00
George Saines
574252df32
subbing in Pavel's better tiny programming language icons
2014-07-22 09:11:25 -07:00
greyhusky
a313c3ab27
More translations
...
Translated the "about" page and parts of "legal" page as well as some other stuff
2014-07-22 15:01:47 +02:00
Ruben Vereecken
411bb87985
Added contributor categories to user profile page
2014-07-22 12:50:56 +02:00
Melondonut
8476aa33f9
Update ko.coffee
2014-07-22 18:21:00 +09:00
Melondonut
e266f403ff
Update ko.coffee
2014-07-22 10:13:24 +09:00
Michael Schmatz
283108da1e
Added login message for anonymous users on job profile
2014-07-21 16:59:42 -07:00
Michael Schmatz
f100c4ebbe
Add filter alerts to employer page
2014-07-21 16:10:02 -07:00
Michael Schmatz
e8ffb8980f
Removed filterActive from filter alerts
2014-07-21 14:47:44 -07:00
Ruben Vereecken
ebdbc0f891
Basis for user view is finished
2014-07-21 22:02:08 +02:00
Ruben Vereecken
972d231ff5
Refactored router and views to anticipate the renameViews feature
2014-07-21 19:49:16 +02:00
Ruben Vereecken
0d87209fa8
Recently played is now shown on account page
2014-07-21 19:06:22 +02:00
Michael Schmatz
735a7082ee
Correction to filter schema
2014-07-21 10:01:49 -07:00
Michael Schmatz
6bc436aec2
Added saved employer filter alerts to schema
2014-07-21 09:44:40 -07:00
Ruben Vereecken
1c6da9711b
Added the Recently Played collection and endpoint
2014-07-21 14:36:10 +02:00
Ruben Vereecken
023a7adc81
Half the account page is there
2014-07-21 13:40:11 +02:00
Nick Winter
ac7e663418
Merge pull request #1359 from Melondonut/patch-2
...
translation Update ko.coffee
2014-07-20 22:44:05 -07:00
Melondonut
fed5f3bce0
uncommented line 485
2014-07-21 14:11:17 +09:00
Darredevil
61ebc4d15b
Docs tab
2014-07-21 03:52:34 +03:00
Nick Winter
20df6b4ebe
Merge pull request #1360 from Darredevil/master
...
Docs page enhancement
2014-07-20 17:00:37 -07:00
Darredevil
e43afcc0a9
Docs page enhancement
2014-07-21 02:23:01 +03:00
Nick Winter
99e1a8b30a
Merge pull request #1357 from TheSecretSquad/issue#1213crosshair
...
Changed point marker to crosshair, made it bigger, and changed color to white
2014-07-20 16:04:29 -07:00
Nick Winter
a7905db316
Inferring and documenting cooldown, action/spell name, damage, range, radius, and duration when possible.
2014-07-20 15:51:48 -07:00
Melondonut
f5ac5423f8
Update ko.coffee
...
I translated a bit more. I corrected some of word spacing, too. Please let me know if there is anything wrong.
2014-07-21 06:03:53 +09:00
Darredevil
f8cc64dc4c
fix for no user logged
2014-07-20 22:14:33 +03:00
Melondonut
9724c4f218
Update ko.coffee
...
Hi there.
I'm not sure that if it is okay to to this .. but anyway I thought there were a lot of thing that I could help so I did translate a bit. I checked out the code combat website but they just says "go to github, and translate."
thank you,
Melondonut.
안녕하세요. 제가 이래도 되는 건지는 모르겠지만, 제가 도움이 될 수 있을 것 같아 시험삼아 조금 번역해보았습니다. 코드 컴뱃 사이트를 확인했는데, 깃헙에 가서 번역한 다음 리퀘스트하라는 말만 있더라구요; 확인해주시면 감사하겠습니다.
2014-07-20 23:19:41 +09:00
Nick Winter
1537754a16
A few bugfixes, plus gigantic child window convenience for me editing levels.
2014-07-19 20:26:13 -07:00
Pete DiSalvo
9ca3563eed
Changed point marker to crosshair, and changed color to white
2014-07-19 20:12:56 -04:00
Nick Winter
d45c2d31de
New language icons.
2014-07-18 20:14:41 -07:00
Scott Erickson
e7a70bbd0b
Merge conflict handling.
2014-07-18 17:09:41 -07:00
Scott Erickson
97964f7853
More work on renaming. Cleaned out sprite_parser_test_view, and fixed the TeachersView.
2014-07-18 17:06:20 -07:00
Scott Erickson
574e9e7804
Removed the deprecated ErrorView.
2014-07-18 16:56:08 -07:00
Scott Erickson
00c11fd70e
Minor defensive bug handling for the LevelSessionCodeView for when teamSpells has invalid, old data.
2014-07-18 16:46:28 -07:00
Scott Erickson
9ad166048d
Some work the job profile page. Added a demo view, mainly added a modal view for viewing raw player code.
2014-07-18 16:12:28 -07:00
Scott Erickson
74425103d1
Fixed some DemoView issues, mainly clicking links from one demo to another.
2014-07-18 16:12:27 -07:00
Scott Erickson
90a4a1b635
Added setProjection so CocoModels can more easily get subsets of data.
2014-07-18 16:12:27 -07:00
George Saines
18631ec5b1
upgrading our level icons
2014-07-18 15:42:53 -07:00
Michael Schmatz
321bce121c
Edited task schema
2014-07-18 14:50:31 -07:00
Imperadeiro98
3ac1d6c77c
Update pt-PT.coffee
2014-07-18 15:48:36 +01:00
Imperadeiro98
051fd9ecbc
Update pt-PT.coffee
2014-07-18 13:40:05 +01:00
Nick Winter
207f0adf11
Propagated i18n tags for code language blurbs.
2014-07-17 20:13:30 -07:00
Nick Winter
2d7b6eb145
Updated code language logos. Added code language blurb i18n tags.
2014-07-17 20:12:59 -07:00
Scott Erickson
708f67ebd5
Merge branch 'master' into renameViews
2014-07-17 17:24:09 -07:00
Scott Erickson
cdf65d4f42
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-17 17:23:56 -07:00
Scott Erickson
59b723b890
Refactoring View to ModalView.
2014-07-17 17:22:26 -07:00
Scott Erickson
e18b4de583
Refactoring View to CocoView.
2014-07-17 17:20:11 -07:00
Scott Erickson
0e042ee61c
Refactoring View to RootView. Refactoring some RootViews to be routed manually.
2014-07-17 17:16:32 -07:00
Nick Winter
079d336881
Stopped .nano from overriding Bootstrap's column width for component docs page.
2014-07-17 16:36:59 -07:00
Scott Erickson
2b4b91733c
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-17 16:31:03 -07:00
Scott Erickson
45a8278e7e
Work on the job profile view, initial work on the code modal.
2014-07-17 16:30:56 -07:00
Nick Winter
a1aa71084d
Merge pull request #1344 from Darredevil/master
...
fix for no user logged
2014-07-17 16:30:51 -07:00
Scott Erickson
51e63ddbc3
Fixed some DemoView issues, mainly clicking links from one demo to another.
2014-07-17 16:29:26 -07:00
Scott Erickson
4818a81854
Added setProjection so CocoModels can more easily get subsets of data.
2014-07-17 16:22:06 -07:00
Nick Winter
e412a7b73f
Merge pull request #1341 from Imperadeiro98/master
...
Update pt-PT.coffee
2014-07-17 16:00:54 -07:00
Nick Winter
769c26229e
Merge pull request #1340 from sunzenshen/master
...
Fixed typo: Chose -> Choose
2014-07-17 15:59:08 -07:00
Nick Winter
8813a7f545
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-17 15:50:38 -07:00
Nick Winter
6b028513fd
Fixed issues with level previews and localStorage model loading. Disabled break animations on code error for now. Stopped multiple ThangType load on multiple missiles. Stopped trying to connect to Redis on local production setup.
2014-07-17 15:50:29 -07:00
Michael Schmatz
a9d664b8ec
Restored legacy candidates view
2014-07-17 13:16:17 -07:00
Scott Erickson
590626d5f8
Centered social link icons.
2014-07-17 09:30:27 -07:00
Scott Erickson
6f09e95d68
Removed background from job profile view.
2014-07-17 09:22:52 -07:00
Darredevil
b6469ff45b
fix for no user logged
2014-07-17 19:12:26 +03:00
Darredevil
80b420ebbf
fix for no user logged
2014-07-17 19:11:23 +03:00
Michael Schmatz
ccb2ad67ac
Merge pull request #1342 from codecombat/feature/mail-system
...
Feature/mail system
2014-07-17 07:18:39 -07:00
Imperadeiro98
17a4a689e4
Update pt-PT.coffee
2014-07-17 14:18:29 +01:00
Imperadeiro98
991ef61d62
Update pt-PT.coffee
2014-07-17 13:44:14 +01:00
Imperadeiro98
1b6fc95d77
Update pt-PT.coffee
2014-07-17 13:25:25 +01:00
Alan Shen
c56be02222
Fixed typo: Chose -> Choose
...
It may be late to describe incoming targets with past tense.
2014-07-17 01:16:08 -06:00
Darredevil
83177c5f00
language sensitive docs added
2014-07-17 03:19:09 +03:00
Darredevil
8da06f6c6b
language sensitive docs added
2014-07-17 03:18:06 +03:00
Michael Schmatz
ae23679a26
Hard code mail tasks and add unsubscribe
2014-07-16 16:37:06 -07:00
Nick Winter
781e1da93e
Fixed typo: massword -> password.
2014-07-16 16:14:48 -07:00
Nick Winter
42af807e5c
Merged in geometry work from #51 .
2014-07-16 16:01:37 -07:00
Nick Winter
855461a67e
Don't let test view interfere with normal body styles.
2014-07-16 16:01:37 -07:00
Michael Schmatz
b74bdfbf51
Added metadata to mail sent schema
2014-07-16 12:12:11 -07:00
Michael Schmatz
bb3c583300
Add approved date to job profile
2014-07-16 10:51:45 -07:00
nemoyatpeace
f17112ecf8
Minor adjustment to the aoe script
2014-07-17 00:53:52 +08:00
Nick Winter
5ce0cff538
Propagated i18n. Added password repeat to base en.coffee.
2014-07-16 08:03:25 -07:00
Nick Winter
1fd28c0181
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-16 07:54:23 -07:00
Nick Winter
bf0e1ead92
Merge pull request #1335 from rubenvereecken/settings_patch
...
Did UX changes, added an error and fixed a job profile editing bug
2014-07-16 07:52:04 -07:00
Nick Winter
085951fa4a
Removed more counselor stuff.
2014-07-16 07:47:41 -07:00
Nick Winter
5b693d02cf
Merge pull request #1330 from Imperadeiro98/master
...
Update pt-PT.coffee
2014-07-16 07:47:08 -07:00
Ruben Vereecken
bfc4ef58b0
Did UX changes, added an error and fixed a job profile editing bug
2014-07-16 14:47:55 +02:00
Imperadeiro98
4dbb49aa72
Update en.coffee
2014-07-16 13:24:16 +01:00
Nick Winter
6e9091fdf0
More fixes to documentation popovers.
2014-07-15 19:25:53 -07:00
Nick Winter
906ab3ac2b
Stopped language-excluded docs from showing up undocumented in the 'this' area of the spell palette.
2014-07-15 18:54:55 -07:00
Nick Winter
03cc2d1af0
Fixed Grass01-Grass05 scaling issues.
2014-07-15 18:08:00 -07:00
George Saines
8c9c41f477
copy tweak on the employer homepage
2014-07-15 17:27:26 -07:00
Jayant Jain
fa595fcb32
Better positioned level border trees
2014-07-16 05:03:18 +05:30
Jayant Jain
741956b251
Borders and floors are placed inside positive axes
2014-07-16 05:03:18 +05:30
Imperadeiro98
7d476470c7
Corrected a mistake
2014-07-15 20:17:50 +01:00
Imperadeiro98
32d4408f67
Update pt-PT.coffee
...
Delete lines 747-753 and 775-776.
2014-07-15 20:02:23 +01:00
Scott Erickson
3325332626
Fixes #1328 .
2014-07-15 11:23:55 -07:00
Scott Erickson
fb83028d87
Added watchers to list of properties to skip in deltas/patches.
2014-07-15 11:23:35 -07:00
Nick Winter
e06f9132d1
Fixed #469 .
2014-07-15 10:24:18 -07:00
Nick Winter
da73975f20
Fixed #1095 .
2014-07-15 09:47:13 -07:00
Nick Winter
3318d4a171
Fixed #1010 .
2014-07-15 09:35:14 -07:00
Nick Winter
39bea855d1
Propagated new i18n tags with the script.
2014-07-15 08:22:02 -07:00
Ruben Vereecken
0288786098
Merge branch 'master' into achievements
2014-07-15 16:16:46 +02:00
Ruben Vereecken
c423fe989b
Merge branch 'navbar' into achievements
2014-07-15 16:16:01 +02:00
Ruben Vereecken
40ba28f49b
Basics for account and user home pages
2014-07-15 16:15:21 +02:00
Nick Winter
b3e8eb8504
Working on something for #1327 .
2014-07-14 19:32:35 -07:00
Nick Winter
7b39bd06f3
Fixed #1321 .
2014-07-14 17:54:32 -07:00
Scott Erickson
d8d40ab0f6
Fixes #1116
2014-07-14 17:46:12 -07:00
Scott Erickson
b113e126a3
Fixes #1316 and #1318
2014-07-14 17:18:48 -07:00
Scott Erickson
888ee6c0bb
Fixed deltas in the version history modal.
2014-07-14 16:37:10 -07:00
Scott Erickson
9d22a35194
Merge branch 'nameable_users2' of https://github.com/rubenvereecken/codecombat
2014-07-14 15:13:52 -07:00
Nick Winter
f2f3817e10
Fixed Thang Editor scaling.
2014-07-14 14:10:46 -07:00
Nick Winter
cfeb6c34a4
Merge pull request #1324 from Darredevil/master
...
docs page minor update
2014-07-14 13:23:52 -07:00
Ruben Vereecken
1f1ff25a5a
merge
2014-07-14 20:27:47 +02:00
Nick Winter
23dc8d2947
Removed a bad log.
2014-07-14 11:21:03 -07:00
Darredevil
c579742955
docs page update
2014-07-14 21:18:17 +03:00
Ruben Vereecken
e748417007
GET /auth/name/<name> now serves possible free names
...
anonymous users are now warned if their new name is already chosen
User Settings is now without auto-save
Upon name conflict, a user will be suggested a new name which is then submitted if the user chooses to save after all.
Refactored conflicted name checking so it can be used in more places
Signup form now has an optional name field
Covered extra case where the debounced check happened too late. Support for submitting on enter.
Worked in scott's comments and got tests working again
2014-07-14 20:07:58 +02:00
Nick Winter
d7586025d9
Improved behavior of lint/runtime/transpilation problem error alert showing when not in JS mode.
2014-07-14 11:05:59 -07:00
Ruben Vereecken
a60451368e
Merged in master
2014-07-14 18:58:25 +02:00
Ruben Vereecken
ae4a5eb460
Deduplicated bootstrap include
2014-07-14 18:52:23 +02:00
Ruben Vereecken
5aa6db7696
Made the sass more snappy
2014-07-14 18:40:23 +02:00
Nick Winter
7446c9ee08
Don't break as badly on long method names and small windows. Make sure we can always see the spell tool buttons.
2014-07-14 09:38:55 -07:00
Nick Winter
f1c8983de2
Don't ask for team again if we already have a child window.
2014-07-14 08:40:36 -07:00
Nick Winter
364ff4fc00
Merge branch 'jayant1992-master'
2014-07-14 07:33:59 -07:00
Nick Winter
42cf0b5cce
Added missing starting quote.
2014-07-14 07:30:18 -07:00
Nick Winter
d27dbdddbb
Merge branch 'patch-13' of git://github.com/kinez/codecombat into kinez-patch-13
2014-07-14 07:29:47 -07:00
Ruben Vereecken
7a52c195eb
More user navbar styling! Also need to investigate browser reflow
2014-07-14 15:32:02 +02:00
Ruben Vereecken
1aa566e4f7
Layout of navbar user dropdown about finished
2014-07-14 14:56:44 +02:00
Ruben Vereecken
5f2c7665ea
Navbar refactored, starting to look good already.
2014-07-14 14:20:13 +02:00
Ruben Vereecken
d261f888d7
Refactored profile view to be a userView. Would still like to test remarks though
2014-07-14 12:18:28 +02:00
Tery Lim
0f4a7df982
Use spl instead of trailing space for spacing
2014-07-14 13:56:27 +08:00
Inez KEMENES
ca3a2b620b
Update hu.coffee
...
I must have made a mistake again. I have deleted a star instead of a double cross and some lines disappeared. Sorry! Please correct.
2014-07-14 07:22:19 +02:00
Nick Winter
1a016394fe
Starting to show opponent code languages.
2014-07-13 20:19:51 -07:00
Jayant Jain
c13c7db4ed
Less geometric random borders for the terrain generator
2014-07-14 08:11:33 +05:30
Nick Winter
bd47b3bc83
Fixed #1210 based on #1313 .
2014-07-13 18:53:01 -07:00
Nick Winter
1d9afbabd2
Fixes for duplicate Thang IDs and reverting randomized Thangs.
2014-07-13 18:38:24 -07:00
Nick Winter
f9822b65e4
Merge branch 'master' of git://github.com/jayant1992/codecombat
2014-07-13 18:21:27 -07:00
Nick Winter
b1b9f87ebe
Fixed root test view URL to not need the trailing slash.
2014-07-13 17:34:51 -07:00
Jayant Jain
493ebd07e6
Changes randomise to randomize
2014-07-14 06:01:09 +05:30
Nick Winter
f92b29a4a3
Added rotate to Vector APIs.
2014-07-13 17:25:24 -07:00
Michael Schmatz
2a5a366c12
Made language selection in opponent modal
2014-07-13 17:22:06 -07:00
Nick Winter
daff7a2640
Merge pull request #1314 from TheSecretSquad/issue#1213
...
Added point marker shape, and split updateSize method into helpers.
2014-07-13 17:08:11 -07:00
Nick Winter
a076822a08
Merge pull request #1306 from kerradus/master
...
update ru.coffee
2014-07-13 17:07:45 -07:00
Nick Winter
01fdc5b520
Merge pull request #1311 from rubenvereecken/pretty_wizard_modal
...
Bootstrappified Wizard Settings modal
2014-07-13 17:07:07 -07:00
Nick Winter
6eea28dc19
Error handling for syntax errors in component code.
2014-07-13 16:40:03 -07:00
Pete DiSalvo
ffb8f9575e
Added point marker shape, and split updateSize method into helpers.
2014-07-13 19:31:34 -04:00
Nick Winter
6dc2a48b75
Tracking time spent reading initial guides.
2014-07-13 16:07:15 -07:00
Ruben Vereecken
bd7c2d0d36
Bootstrappified Wizard Settings modal
2014-07-14 00:25:24 +02:00
Ruben Vereecken
9db84befa6
Set up a 301 Redirect for account/profile instead of a backbone redirect
2014-07-13 22:34:32 +02:00
Scott Erickson
ebfb329da7
Fixed a bug where pressing escape would not properly end scripts in the session state.
2014-07-13 13:11:45 -07:00
Jayant Jain
deecd7d2ff
Deletes previously randomised thangs when generating again
2014-07-14 01:34:32 +05:30
Jayant Jain
b934d22cbd
Batches insertion of thangs to treema to speed up terrain generation
2014-07-14 01:34:32 +05:30
Jayant Jain
1e5edb5efd
Moves randomise modal template and view to editor/level/modal
2014-07-14 01:34:32 +05:30
Jayant Jain
be223197df
Updates i18n tags and en.coffee
2014-07-14 01:33:45 +05:30
Scott Erickson
667ea14442
Merge branch 'mediator-schema' of https://github.com/jthemphill/codecombat into jthemphill-mediator-schema
2014-07-13 12:20:11 -07:00
Scott Erickson
3b6d17286b
Small tweak to lower the number of repeated calls to SpriteBoss.updateSounds.
2014-07-13 12:19:51 -07:00
Ruben Vereecken
9c0353a2f0
Merged in master
2014-07-13 21:18:32 +02:00
Dmitry
e60832bcfa
Update ru.coffee
...
some fixes
2014-07-13 23:13:42 +04:00
Nick Winter
202a562c51
Merge pull request #1303 from maryannv/patch-1
...
Add space before "Contribute"
2014-07-13 12:08:27 -07:00
Scott Erickson
843ed97643
Another fix for mongoose i18n locale object hack.
2014-07-13 10:05:58 -07:00
Nick Winter
868a6ed43b
Fixed a couple i18n issues. Fixed #1302 .
2014-07-13 09:31:56 -07:00
Nick Winter
49e6ed13ba
Fixed LatestVersionReferenceNode's collection initialization.
2014-07-13 09:11:06 -07:00
Nick Winter
373c1688ed
Merge pull request #1287 from rubenvereecken/user_patch
...
Noty errors don't show up on user save fails anymore
2014-07-13 08:54:20 -07:00
Nick Winter
8a7e7e82a0
Let's try a heads-up whenever there's a JS error.
2014-07-13 08:37:39 -07:00
Nick Winter
83248f039c
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-13 07:52:35 -07:00
Nick Winter
39f6874682
Merge pull request #1304 from Imperadeiro98/master
...
Update pt-PT.coffee
2014-07-13 07:48:42 -07:00
Dmitry
b1aa0a1973
update ru.coffee
2014-07-13 15:33:50 +04:00
Maryann Vellanikaran
f9c92d2731
Add space before "Contribute"
...
Before: http://cl.ly/image/0p1f1P1D0P2d
After: http://cl.ly/image/3a0x12070C28
2014-07-12 15:45:53 -07:00
Nick Winter
d48f5256a7
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-12 10:19:19 -07:00
Scott Erickson
f4b22fedc9
Tweaking the visuals for the i18n treema node to mostly ignore the property required to get around mongoose not handling empty objects.
2014-07-12 09:58:28 -07:00
Scott Erickson
8cb7cd770c
Fixed i18n population because mongoose has problems with empty objects.
2014-07-12 09:58:28 -07:00
Jeff Hemphill
a8d369ed1a
Add schemas for tome subscriptions
2014-07-12 01:55:35 -07:00
Imperadeiro98
178e147565
Update pt-PT.coffee
2014-07-12 08:54:16 +01:00
Nick Winter
89dc724d31
Merge pull request #1298 from TheSecretSquad/issue#1213CoordinateDisplay
...
Centered CoordinateDisplay background and label
2014-07-11 20:48:53 -07:00
Pete DiSalvo
e3183650c5
Centered CoordinateDisplay background and label
2014-07-11 22:10:13 -04:00
Nick Winter
c62f5f3fa0
Skipping docs for language-inappropriate entries in spell palette.
2014-07-11 18:42:55 -07:00
Nick Winter
f13f0ddfef
Merge pull request #1296 from dreamist/patch-1
...
Update th.coffee
2014-07-11 18:11:57 -07:00
Nick Winter
17ba4bc8a7
Starting to limit some property documentation to specific code languages. Fixed Criss-Cross squares on frame 0. Removed comment box highlighting from the gutter.
2014-07-11 18:07:00 -07:00
Nick Winter
788562f2ea
Merge pull request #1295 from Imperadeiro98/master
...
Updated some strings
2014-07-11 14:28:29 -07:00
Michael Schmatz
fede037e89
Fixed time NaN
2014-07-11 13:55:31 -07:00
dreamist
ca78638a21
Update th.coffee
...
One fix and a few more translations
2014-07-12 03:07:58 +07:00
Imperadeiro98
bad11f0eea
Update pt-PT.coffee
2014-07-11 19:08:14 +01:00
Imperadeiro98
d4c21e0349
Update pt-PT.coffee
2014-07-11 18:34:22 +01:00
Imperadeiro98
ef9ea0c489
Fixed a issue with headers
...
There was a issue with the headers that is now corrected.
2014-07-11 18:12:12 +01:00
Imperadeiro98
6f94b0ce6f
Update pt-PT.coffee
2014-07-11 15:18:26 +01:00
Imperadeiro98
a979c32567
Update pt-PT.coffee
2014-07-11 15:17:16 +01:00
Nick Winter
65e39ad4e3
Propagated i18n updates.
2014-07-10 19:24:44 -07:00
Nick Winter
45545796a0
Fixes, tweaks, and i18n for the employers page.
2014-07-10 19:17:51 -07:00
Nick Winter
3d5cd29519
Removed some logging.
2014-07-10 17:35:59 -07:00
Michael Schmatz
80e7b7664e
Changed employer artisanal message font
2014-07-10 15:42:45 -07:00
Nick Winter
f17e24013b
Fixed #1217 (scaleFactor, debug shapes).
2014-07-10 14:22:15 -07:00
Jayant Jain
d6928eb1c4
Removes okay button, hides modal upon generation
2014-07-11 01:43:51 +05:30
Jayant Jain
a76a79bb9d
Fixes bug with placing addThang after randomise
2014-07-11 01:07:24 +05:30
Jayant Jain
5fb4f161d0
Removes console logs
2014-07-11 00:01:19 +05:30
Jayant Jain
da0b0d9830
Big terrain generator commit -
...
1.Adds method for randomising decorations/doodads
2.Creates presets
3.Adds thang clusters which can be used to create presets easily
2014-07-11 00:01:19 +05:30
Jayant Jain
dbe464df16
Removes console logs
2014-07-11 00:01:19 +05:30
Jayant Jain
b401b04893
Adds randomiseFloor and randomiseBorder functions
2014-07-11 00:01:19 +05:30
Jayant Jain
38bed0ee93
Random thangs are now created and positioned in the thangs view
2014-07-11 00:01:19 +05:30
Jayant Jain
74205b31d2
Adds code for passing randomised thangs to thang view
2014-07-11 00:01:18 +05:30
Jayant Jain
1436a4dac7
Cleans up some css for terrain generator modal
2014-07-11 00:01:18 +05:30
Jayant Jain
813ecaa59c
Adds randomise option to dropdown on editor page
2014-07-11 00:01:18 +05:30
Jayant Jain
c40da260f0
Adds initial modal and view for terrain generator
2014-07-11 00:01:18 +05:30
Jayant Jain
efa2bee08c
Adds shortcuts for undo/redo for thangs tab view
2014-07-11 00:01:18 +05:30
Scott Erickson
a3c524424c
Merge branch 'nameable_users' of https://github.com/rubenvereecken/codecombat into rubenvereecken-nameable_users
2014-07-10 11:13:28 -07:00
Nick Winter
9ee373428f
Fixed some schema issues related to snippets and code languages.
2014-07-10 08:31:40 -07:00
Ruben Vereecken
750d94c478
Noty errors don't show up on user save fails anymore
2014-07-10 10:30:23 +02:00
nemoyatpeace
8700da6570
Update play_view.coffee
...
Added my level to the page.
2014-07-10 09:19:59 +08:00
Michael Schmatz
013ace65f6
Basic email structure plus distributed locking system
2014-07-09 16:24:14 -07:00
Nick Winter
a48fe4f18f
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-09 15:34:22 -07:00
Nick Winter
bcf3c19f81
Some slight improvements to the components docs page; still don't know how to get it to be full-height with independently scrolling columsn, though.
2014-07-09 15:32:57 -07:00
Nick Winter
833d59fb1f
Merge pull request #1282 from Alphir/patch-1
...
Update fr.coffee
2014-07-09 14:17:51 -07:00
Nick Winter
4b16e2fc57
Merge branch 'master' of git://github.com/Darredevil/codecombat into Darredevil-master
2014-07-09 13:53:58 -07:00
Nick Winter
ca847329b1
Merge branch 'dkundel-feature/fullscreen-editor'
2014-07-09 13:41:57 -07:00
Nick Winter
0ed8d2b371
Merged in the full-screen editor, and fixed a spell palette multi-language bug while at it.
2014-07-09 13:41:42 -07:00
Alphir
0ee0b2d5e3
Update fr.coffee
2014-07-09 22:13:05 +02:00
Darredevil
4309bfbe67
new Documentation page
2014-07-09 23:01:53 +03:00
Scott Erickson
d74a778f67
Made creating components open to everyone!
2014-07-09 12:21:32 -07:00
Nick Winter
44e5c2826c
Proper Treema node behavior for different code languages in default code, property documentation, and snippets.
2014-07-09 11:59:27 -07:00
Ruben Vereecken
ac95d775e6
Users can now be gotten by slug
2014-07-09 20:23:05 +02:00
Scott Erickson
3fbce8334d
Fixed #1276
2014-07-09 10:47:02 -07:00
Ruben Vereecken
5dc54c784d
Added case and demo for user not found. Should be made prettier as soon as users can be queried by name
2014-07-09 18:13:22 +02:00
Ruben Vereecken
b065a524c1
Got down the basic layout for achievement overview
...
Achievement style is now compatible between overview and popup
2014-07-09 15:06:47 +02:00
gosnat
4d50a6d76a
Update play_view.coffee
...
Added "Guide Everyone Home" level
2014-07-09 08:02:58 -05:00
Nick Winter
928e4362ba
Made some style tweaks to the employers page to move the filters into a sidebar when authorized.
2014-07-08 20:47:22 -07:00
Nick Winter
c19a31a58c
Fixed some wizard positioning issues in multiplayer.
2014-07-08 18:51:10 -07:00
Nick Winter
31be904b03
Working on flippable tile highlight bounds marks.
2014-07-08 16:43:36 -07:00
Michael Schmatz
21d056ff01
Instant application of filters
2014-07-08 11:19:14 -07:00
Michael Schmatz
bbc793b003
Fixed modal popping up when logging out sometimes
2014-07-08 10:42:36 -07:00
Michael Schmatz
aa40257034
Table styling/ copy edit
2014-07-07 23:23:36 -07:00
Michael Schmatz
e71ca28f02
Implement candidate filter counts next to filters
2014-07-07 21:43:30 -07:00
Michael Schmatz
e294f344c4
Move featured candidates to top of sort
2014-07-07 21:29:48 -07:00
Michael Schmatz
08b9a8fdaa
Various changes to education filter
2014-07-07 21:04:12 -07:00
Michael Schmatz
30745a25ca
Consolidated iOS and Android into Mobile
2014-07-07 20:24:29 -07:00
Nick Winter
9381a4dec6
Merged in some Russian translations from a1ip and fixd a merge conflict in server.coffee style cleanups.
2014-07-07 20:16:00 -07:00
Nick Winter
d414ed64ec
Merge pull request #1264 from kinez/patch-12
...
Update hu.coffee
2014-07-07 20:13:36 -07:00
Michael Schmatz
285c7ff049
Added school changes to schema
2014-07-07 20:05:28 -07:00
Michael Schmatz
cef8fe074a
Add mobile developer to the schema
2014-07-07 20:03:02 -07:00
Michael Schmatz
9313541f9f
Fixed targeting on employers CSS
2014-07-07 20:02:01 -07:00
Michael Schmatz
30671d82f6
Removed PM and Management from filters
2014-07-07 19:52:31 -07:00
Michael Schmatz
05560662dd
Various fixes to employer page/profile view
2014-07-07 19:34:36 -07:00
Scott Erickson
fd564fa2d4
Merge pull request #1261 from Imperadeiro98/master
...
Translated some more strings
2014-07-07 18:50:20 -07:00
Scott Erickson
c1f77e3f07
Merge branch 'supermodel_patch' of https://github.com/rubenvereecken/codecombat into rubenvereecken-supermodel_patch
2014-07-07 18:48:26 -07:00
Scott Erickson
5d00aedac7
Widened the click area on the wizard settings view for color config.
2014-07-07 18:13:19 -07:00
Scott Erickson
1263d4724a
Fixed the title in the gold view to handle when goldEarned isn't available.
2014-07-07 16:56:47 -07:00
Scott Erickson
49c8360d5b
Fixed me emitting 'me:synced' and anything listening for that.
2014-07-07 16:53:34 -07:00
Scott Erickson
908772d8fe
Fixed an instance where a level loading callback was erroring if called before the surface was built.
2014-07-07 16:44:18 -07:00
Scott Erickson
61e6c8dfc3
Fixed the gold view not showing numbers until the first change.
2014-07-07 16:05:23 -07:00
Scott Erickson
2a309c149c
Enabled submitting patches for thangs and articles.
2014-07-07 15:19:22 -07:00
Michael Schmatz
0305374580
Add featured field to curation
2014-07-07 10:42:16 -07:00
Michael Schmatz
b76239b4e9
Replaced candidate avatars on employer page
2014-07-07 10:29:35 -07:00
Scott Erickson
12543cf4dd
Added the foundation of a component docs view.
2014-07-07 10:11:02 -07:00
Scott Erickson
86a3fbacd1
Made the CocoCollection more strict about setting the model property.
2014-07-07 10:11:02 -07:00
Michael Schmatz
3151db6fc5
Hide briefcase when no work history
2014-07-07 09:49:13 -07:00
Ruben Vereecken
ea3d1fee74
Starting on achievement overview style
2014-07-07 15:03:28 +02:00
Imperadeiro98
d9d1d25c3c
Update pt-PT.coffee
2014-07-07 13:31:03 +01:00
Ruben Vereecken
9055612b24
Fixtures set up, demo start
2014-07-07 12:47:32 +02:00
Ruben Vereecken
b5702bc314
Added simple demo page
2014-07-07 12:11:43 +02:00
Ruben Vereecken
75b738f126
User loading now have async callbacks
2014-07-07 12:03:48 +02:00
Scott Erickson
aea1d0e8f2
Changed the angel logigng to use info instead of log, to more easily differentiate.
2014-07-06 15:01:39 -07:00
Scott Erickson
850712442d
Added underscore.string to the worker.
2014-07-06 15:01:20 -07:00
Scott Erickson
a2740279bc
Added styling for tables in the guide.
2014-07-06 15:00:51 -07:00
Ruben Vereecken
ec78f95da1
Prepared things for Scott
2014-07-06 23:16:00 +02:00
Ruben Vereecken
1b9c8b0066
Got users and achievements to load in a neat way
2014-07-06 22:48:33 +02:00
Ruben Vereecken
128008daa1
Hid the progress bar on load failed
2014-07-06 21:48:31 +02:00
Ruben Vereecken
10735867a4
Got some basic hierarchy set up for user view and template inheritance
2014-07-06 21:10:28 +02:00
Ruben Vereecken
e33bb44ffc
Start of new user routing and views are there
2014-07-06 20:45:27 +02:00
Ruben Vereecken
51bc8e5a7c
Merged master
2014-07-06 20:07:47 +02:00
Ruben Vereecken
1f02b99942
Refactored showNotFound into notFoundView
2014-07-06 20:01:47 +02:00
Scott Erickson
d640dac33a
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-06 09:36:12 -07:00
Scott Erickson
37a28cf826
Tweaked the styling for guides to only center emphasized lines immediately after an image. Made the styling also show up on the level editor.
2014-07-06 09:35:28 -07:00
Inez KEMENES
cc0e818824
Update hu.coffee
2014-07-06 16:26:51 +02:00
Imperadeiro98
21c180e206
Update pt-PT.coffee
2014-07-06 11:11:44 +01:00
Imperadeiro98
e3bb93c4f5
Update pt-PT.coffee
2014-07-06 10:01:55 +01:00
Imperadeiro98
183b744d07
Update pt-PT.coffee
2014-07-05 22:10:21 +01:00
Scott Erickson
94a6e3961b
Added a button in the level editor to choose which team to play when editing a ladder level.
2014-07-05 13:54:41 -07:00
Imperadeiro98
cc8fec9283
Update pt-PT.coffee
2014-07-05 19:11:58 +01:00
Imperadeiro98
b5ef1742f4
Update pt-PT.coffee
2014-07-05 19:11:06 +01:00
Ruben Vereecken
601c4e2731
Merged with master
2014-07-05 16:47:16 +02:00
Tery Lim
a5476f90ed
Minor cleanup for convention and readability
2014-07-05 18:48:08 +08:00
Scott Erickson
b635c4cf16
Fixes #1220 . Passing in the raw attributes to the component settings treema would edit the data before the component's set method would get a snapshot of the original data for whatever was the first change in the data.
2014-07-04 20:45:42 -07:00
Scott Erickson
dc49499679
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-04 18:12:10 -07:00
Scott Erickson
41a8d21bfe
Merged conflicts.
2014-07-04 18:11:50 -07:00
Scott Erickson
c76032b0af
Merged conflicts.
2014-07-04 18:11:26 -07:00
Scott Erickson
92948e64b5
Merge pull request #1245 from greyhusky/patch-2
...
new translations
2014-07-04 18:09:02 -07:00
Scott Erickson
be3a428b50
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-04 18:02:12 -07:00
Scott Erickson
eed521fb8c
Merged conflicts.
2014-07-04 17:54:30 -07:00
Scott Erickson
85a6b648a5
Merged conflicts.
2014-07-04 17:54:24 -07:00
Scott Erickson
81121faebf
Merge pull request #1242 from differentmatt/master
...
Fix Placement Agreement typo
2014-07-04 17:39:38 -07:00
Scott Erickson
4e284d81b7
Handled conflicts, throwing out changes to ladder_tab.coffee.
2014-07-04 17:36:10 -07:00
Scott Erickson
1ce55e356c
Making the ladder tab reload when social network friends load. See #1196 .
2014-07-04 17:32:16 -07:00
Scott Erickson
ca8394621d
Fixes #1223
2014-07-04 11:46:33 -07:00
Scott Erickson
f553a1c493
Merge pull request #1256 from rubenvereecken/patch_fix
...
Patch fix: applyDelta now always called
2014-07-04 11:45:22 -07:00
Ruben Vereecken
08030dc785
Cleaned up patch rendering logic
2014-07-04 20:18:26 +02:00
Ruben Vereecken
44c84b3689
proofed the SearchView's runSearch
2014-07-04 19:36:55 +02:00
Ruben Vereecken
a367082cc4
Corrected statistic logic, wrote test case
2014-07-04 19:27:41 +02:00
Ruben Vereecken
bb1c07570d
added isTranslationPatch method to patches
2014-07-04 19:27:41 +02:00
Ruben Vereecken
fce9f0031b
All edits are now tracked
...
intermediate
intermediate
2014-07-04 19:27:38 +02:00
Ruben Vereecken
7a4c6daec8
stats.gamesCompleted is now tracked in users
2014-07-04 19:27:37 +02:00
Ruben Vereecken
39fb2cb1b4
Added achievement preview, exp test, stuff
2014-07-04 19:27:37 +02:00
Ruben Vereecken
45798aab02
added images for achievements! Demo is now operational
2014-07-04 19:27:37 +02:00
Ruben Vereecken
a933f9737d
Creating achievement demo
...
intermediate
2014-07-04 19:27:37 +02:00
Ruben Vereecken
fe5b675d18
Achievement polling now successfully tested
...
Intermediate
2014-07-04 19:27:37 +02:00
Ruben Vereecken
1fe2c67ffe
Added tests for repeatable achievements, including complicated xp
...
Intermediate
2014-07-04 19:27:37 +02:00
Ruben Vereecken
6e4170012f
Made sure applyDelta is called in all cases
2014-07-04 18:38:15 +02:00
Tery Lim
9090ce7714
Merge master into branch
2014-07-04 22:37:16 +08:00
Tery Lim
329f0e7e22
Clean up for coffeescript convention
2014-07-04 22:23:47 +08:00
Ruben Vereecken
63401025f6
proofed the SearchView's runSearch
2014-07-04 15:13:06 +02:00
Scott Erickson
2855d2a402
Made the deltas lib conflict identifying library able to handle many-to-many conflicts.
...
Made conflict finding a bit more liberal, in that any messing with arrays (adding, removing or moving things inside) will conflict with any other such change.
2014-07-03 17:41:58 -07:00
Michael Schmatz
cc917162a7
Fixed doober alignment
2014-07-03 17:01:09 -07:00
Michael Schmatz
6a33ca0892
Removed autoscrolling
2014-07-03 16:40:00 -07:00
Michael Schmatz
d3cc9ae179
10 pixel margin on photos
2014-07-03 16:33:10 -07:00
Michael Schmatz
45e3da0945
Hover on logout button
2014-07-03 16:32:20 -07:00
Michael Schmatz
615303395c
Various fixes for recruiting page
2014-07-03 16:30:27 -07:00
Michael Schmatz
6c31f08853
Unchecked all by default
2014-07-03 15:48:50 -07:00
George Saines
4d12aff35e
removing the counselor from the contribute page and all other links
2014-07-03 15:42:24 -07:00
George Saines
6d438319ab
Merge branch 'employer-redesign' of https://github.com/codecombat/codecombat into employer-redesign
2014-07-03 15:17:41 -07:00
George Saines
88b0a0a97b
making changes to the employer page icon dimensions
2014-07-03 15:17:38 -07:00
Michael Schmatz
52ddb8db62
Add login link and rounded corners for pics
2014-07-03 15:10:09 -07:00
Michael Schmatz
3f1547488c
Added login button and fixed bg color
2014-07-03 14:40:39 -07:00
Michael Schmatz
538344094b
Fixed filter behavior
2014-07-03 13:59:10 -07:00
Michael Schmatz
ae63461ef3
Filter functional
2014-07-03 11:39:44 -07:00
Michael Schmatz
b58f2c49eb
Fix description
2014-07-03 10:22:50 -07:00
Michael Schmatz
49e4dd71ae
Merge branch 'master' into employer-redesign
...
Conflicts:
app/schemas/models/user.coffee
2014-07-03 10:15:31 -07:00
Michael Schmatz
ed30d3292a
Filter button
2014-07-03 10:14:32 -07:00
Michael Schmatz
e54b190918
Added shortDescription
2014-07-03 10:02:42 -07:00
Imperadeiro98
dbdd8c672c
Update pt-PT.coffee
2014-07-03 14:11:30 +01:00
Imperadeiro98
3b04343034
Update pt-PT.coffee
2014-07-03 14:06:40 +01:00
Imperadeiro98
08a9b4f05b
Update pt-PT.coffee
2014-07-03 13:55:50 +01:00
Michael Schmatz
397140d9b0
Basic filtering
...
Only visas work
2014-07-02 16:47:02 -07:00
Michael Schmatz
fe328a766b
Basic filtering functionality
...
Still has a few bugs
2014-07-02 15:48:26 -07:00
Dominik Kundel
484749400e
Merge remote-tracking branch 'upstream/master'
2014-07-02 20:54:46 +02:00
Dominik Kundel
004a14ae3c
fixed autocomplete issue related to switching the programming language
2014-07-02 20:52:16 +02:00
Michael Schmatz
1adefbb3b6
Update user schema (to avoid cherry picking)
2014-07-02 11:50:44 -07:00
Michael Schmatz
c6cc28b976
Various fixes to enable employers page to function correctly
2014-07-02 11:45:00 -07:00
Michael Schmatz
7eeb964d3e
Restyled employers page
2014-07-02 11:44:45 -07:00
Michael Schmatz
8e6807ab60
Redesigned layout of employers page
2014-07-02 11:44:33 -07:00
Michael Schmatz
fe08fdb2b0
Made new recruitment base styles
2014-07-02 11:43:39 -07:00
Michael Schmatz
5da1db8f6e
Made new recruitment base layout
2014-07-02 11:43:26 -07:00
Michael Schmatz
ebc79668ef
Added image assets for recruitment page
2014-07-02 11:42:02 -07:00
Michael Schmatz
f756a16aa4
Added curated section to user schema
2014-07-02 11:41:14 -07:00
greyhusky
467b9adf74
new translations
...
i translated some parts, will translate more later
2014-07-02 11:33:19 +02:00
Dominik Kundel
3f57644b0b
Merge remote-tracking branch 'upstream/master'
2014-07-01 19:58:01 +02:00
Tery Lim
618ade4946
Clean up mixed quotes
2014-07-01 12:23:22 +08:00
Michael Schmatz
2dd4ba6203
Increased max skills from 30 to 40
2014-06-30 16:43:31 -07:00
Matt Lott
ffdd73a503
Fix Placement Agreement typo
2014-06-30 16:01:00 -07:00
Dominik Kundel
568e334f13
Merge remote-tracking branch 'upstream/master'
2014-06-28 12:53:20 +02:00
Dominik Kundel
6ea2f1c76d
added title for tab trigger
2014-06-28 12:53:09 +02:00
Nick Winter
66da53f8f9
Launching the language selector on the front page.
2014-06-27 10:21:38 -07:00
Nick Winter
58bf85d234
Simulator handles when there are no Greed matches to randomly simulate.
2014-06-27 08:50:04 -07:00
Nick Winter
802d43651e
Exposing Vector z property. Getting ready to use new builtin property documentation.
2014-06-27 00:36:18 -07:00
Philippe Rigovanov
dd6209cd99
Update ru.coffee
...
With @M-r-A fixes
2014-06-27 04:33:05 +04:00
Philippe Rigovanov
e138d2eed6
Update ru.coffee
...
With fixes from [M-r-A](https://github.com/M-r-A )
2014-06-27 04:11:46 +04:00
Michael Schmatz
28bb28cf85
Fixed employer view for manually created candidates
2014-06-26 17:07:17 -07:00
George Saines
a94053fd1d
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-06-26 10:38:18 -07:00
George Saines
e294133bcf
adding the files I forgot
2014-06-26 10:38:13 -07:00
Nick Winter
d360ecac94
Merged in the language-war branch.
2014-06-25 23:00:03 -07:00
Nick Winter
aee95ac5c0
Improved per-language spell palette and tab documentation.
2014-06-25 22:56:39 -07:00
Nick Winter
4cebf1f434
Merge pull request #1232 from Darredevil/patch-11
...
Added new tip tag
2014-06-25 21:23:41 -07:00
Darredevil
c6f19f7d3a
Added new tip tag
2014-06-26 06:23:36 +03:00
Nick Winter
8c6ee66684
Better handling of alternate spell palette documentation syntax for other code languages.
2014-06-25 20:19:11 -07:00
Darredevil
a127cb7a5b
Added a joke tip
2014-06-26 02:11:15 +03:00
Philippe Rigovanov
f2898e3bc0
Update diplomat.jade
...
added myself to diplomats
2014-06-26 00:56:41 +04:00
Inez KEMENES
96f74183a5
Update hu.coffee
2014-06-25 17:28:13 +02:00
Nick Winter
04976a7b14
Working on the Tome displaying the proper syntax for the selected programming language. Fixed #1225 .
2014-06-24 21:08:01 -07:00
Nick Winter
512e287b6a
Merge pull request #1184 from greyhusky/patch-1
...
Update de-CH.coffee
2014-06-24 17:41:32 -07:00
George Saines
b5ec38f811
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-06-24 16:43:32 -07:00
George Saines
68d7b3997a
modifying the employer page to be more explanatory
2014-06-24 16:43:27 -07:00
Nick Winter
dd9b8a0018
Migrating from tileGroupNumber to tileGroupLetter.
2014-06-24 16:32:44 -07:00
Nick Winter
580d002a98
Messing with marks.
2014-06-24 15:45:33 -07:00
Michael Schmatz
e3a87156a2
Send BCC email to employer when contacting candidates
2014-06-24 14:35:30 -07:00
Scott Erickson
9b873cfab4
Patch modal handles invalid patches.
2014-06-24 17:25:01 -04:00
Scott Erickson
ee0b14eb61
Changed the versions history modal to show name and date.
2014-06-24 16:41:55 -04:00
Scott Erickson
327d273cbe
Fixed gplus login.
2014-06-24 14:44:37 -04:00
Michael Schmatz
988ad6ffda
Attempting to fix G+
2014-06-24 11:29:43 -07:00
Scott Erickson
0363166736
Some tweaks to the guide for the benefit of the criss-cross docs, and hopefully others as well.
2014-06-24 13:23:31 -04:00
Nick Winter
6a31e0bcd3
Fixed bug showing spell palette for languages missing any code snippets.
2014-06-24 10:17:38 -07:00
Nick Winter
8719b80663
Showing expired profiles to admins.
2014-06-24 10:15:38 -07:00
Nick Winter
abcc75a6f2
A bit of error logging for #1220 .
2014-06-24 09:43:20 -07:00
Nick Winter
3862bd2376
Clearing backups of old models when saving new versions of versioned models.
2014-06-24 09:43:20 -07:00
Scott Erickson
dde43d5df3
Fixed a case where the supermodel was overriding what a previous supermodel had set for saveBackups.
2014-06-23 16:57:54 -04:00
Nick Winter
815ef88e78
Fixed bugs with camera bobbing with bobbing units and gold views showing up when empty.
2014-06-23 10:36:42 -07:00
Michael Schmatz
27774cdf0f
Fix #1207
2014-06-23 09:46:39 -07:00
Darredevil
4ca1d2bfeb
Added new level "K-means++ Cluster Wars"
...
Added new level "K-means++ Cluster Wars"
2014-06-23 03:43:54 +03:00
Nick Winter
a267933f0b
Merge pull request #1200 from Airunedz/patch-1
...
Improve Spanish (Spain) translations
2014-06-22 15:39:43 -07:00
Philippe Rigovanov
f7ec30a586
Update ru.coffee
2014-06-23 01:55:45 +04:00
Nick Winter
105d22c802
Merge pull request #1202 from kumabotz/minor-cleanup
...
Minor cleanup
2014-06-22 07:56:15 -07:00
Nick Winter
8698589625
Applying Scott's fix for #1198 .
2014-06-22 07:55:29 -07:00
Tery Lim
f03f8da50a
Remove extra spaces
2014-06-22 16:42:06 +08:00
Tery Lim
32868b565d
Fix typo
2014-06-22 16:39:51 +08:00
Tery Lim
88c84911b7
Remove trailing comma
2014-06-22 16:39:07 +08:00
Nick Winter
81f8334f37
Some fixes for CocoSprite alphas.
2014-06-21 22:31:10 -07:00
Airunedz
dfff43d66a
Improve Spanish (Spain) translations
...
Changes: Add some translations to Spanish (I'm from Spanin)
2014-06-22 01:07:05 +02:00
Nick Winter
1f29a923cf
Fixed playing multiplayer levels without an opponent, against the AI.
2014-06-21 12:24:14 -07:00
Nick Winter
6813279871
Fixed an infinite loop timeout issue.
2014-06-21 10:56:55 -07:00
Nick Winter
a8f4baebbc
Restricted some more analytics.
2014-06-21 09:47:48 -07:00
Nick Winter
564c463431
Stop tracking Simulator events to Mixpanel.
2014-06-21 09:17:56 -07:00
Nick Winter
52b2e756ef
Merge pull request #1195 from thanosme/patch-1
...
Update el.coffee
2014-06-21 08:44:43 -07:00
Thanasis Manousos
5e2dececb5
Update el.coffee
2014-06-21 18:31:26 +03:00
Nick Winter
dde71485bf
A bit of cleanup.
2014-06-20 20:52:50 -07:00
Nick Winter
17366af245
Merge pull request #1188 from a1ip/master
...
Update ru.coffee
2014-06-20 20:49:19 -07:00
Nick Winter
d8e1fa880c
Merge pull request #1181 from djsmith85/patch-1
...
Update de.coffee
2014-06-20 20:45:27 -07:00
Nick Winter
d3d9908ef2
Merge pull request #1180 from djsmith85/patch-2
...
Update de-DE.coffee
2014-06-20 20:45:02 -07:00
Nick Winter
ac0f6e74aa
Merged.
2014-06-20 20:41:34 -07:00
Nick Winter
60ca6e46d3
Ooops, that's a function.
2014-06-20 18:45:57 -07:00
Nick Winter
c9dcc290cb
Fixed some bugs where Aether wasn't getting the proper submittedCodeLanguage or functionParameters sometimes.
2014-06-20 17:19:18 -07:00
Fergus Leen
88aa8d234c
Facebook friends patch
2014-06-20 02:18:40 +01:00
Nick Winter
bb8b9b2e93
bid -> makeBid.
2014-06-19 17:27:41 -07:00
Michael Schmatz
34f5377754
Increased infinite loop timeout
2014-06-19 17:16:08 -07:00
Michael Schmatz
40fd1674ad
Temporary fix for bid function in hover debugger
2014-06-19 17:09:45 -07:00
Nick Winter
7b59c42f5d
Added stupid method argument compilation info for bid(blockNumber) to various Aether compilation steps.
2014-06-19 15:41:35 -07:00
thanosme
625750614a
Update el.coffee
...
Added some tranlations with minor corrections
2014-06-20 01:14:30 +03:00
Nick Winter
1e9b403ce5
More zazz for home page code language selection.
2014-06-19 14:55:16 -07:00
Nick Winter
cf57411b5c
Added another logging message for more easily seeing when transpiled code might be misfiring.
2014-06-19 13:42:38 -07:00
Nick Winter
666c020389
Switching code language based on selection now.
2014-06-19 13:42:25 -07:00
Scott Erickson
20589db6be
Fixed a bug with logging missing documentation.
2014-06-19 16:15:38 -04:00
Nick Winter
a58f3e0fb6
More styling work on code language selector.
2014-06-19 12:31:56 -07:00
Michael Schmatz
51923459e0
Changed autocomplete to on by default
2014-06-19 10:44:44 -07:00
Michael Schmatz
2559a73244
Merge pull request #1186 from dkundel/master
...
Initial Autocomplete Version
2014-06-19 10:10:26 -07:00
Michael Schmatz
a1b7025730
Emergency linkedin hot fix
2014-06-19 08:36:22 -07:00
Nick Winter
2e850dba78
Working on home language selection.
2014-06-19 08:06:34 -07:00
Philippe Rigovanov
ebaeac7e80
Some translations
2014-06-19 05:42:15 +04:00
Dominik Kundel
7e8845332e
updated Ace minified
2014-06-18 23:27:05 +02:00
Dominik Kundel
69959b6b05
updated Ace
2014-06-18 23:18:58 +02:00
Michael Schmatz
548eaefae1
Add debug variable inspection progress bar
2014-06-18 13:43:04 -07:00
Dominik Kundel
33d68fab6e
Merge remote-tracking branch 'upstream/master'
2014-06-18 21:50:55 +02:00
Nick Winter
ac6c7292c8
Fixed Gridmancer session linking on profile view.
2014-06-18 12:05:40 -07:00
Scott Erickson
50fea7e937
Added a method for returning all requests in mock-ajax.
2014-06-18 12:04:39 -04:00
Scott Erickson
d651885524
Maybe fixing the toggleModal system once and for all.
2014-06-18 12:04:38 -04:00
Dominik Kundel
d3e0299465
merge conflict solved
2014-06-18 17:59:26 +02:00
Dominik Kundel
f6355b034b
integrated autocomplete
2014-06-18 17:57:42 +02:00
greyhusky
6fe9623244
Update de-CH.coffee
...
Hoi zeme, i übersetze mega gern und wieni gseh ha isches no es reechts Stück wo z übersetze isch. Ha mol agfange, i hoff ihr findeds guet. :)
2014-06-18 11:09:10 +02:00
Nick Winter
59654da24b
Starting more work on integrating additional languages. Improved Component code editing performance with a trusty debounce.
2014-06-17 22:17:44 -07:00
Nick Winter
4bd02ba6dc
ModelModal now grants real ultimate power.
2014-06-17 15:17:25 -07:00
djsmith85
2fff271200
Update de-DE.coffee
...
Updated a few translations in the German locale file.
2014-06-17 23:52:57 +02:00
djsmith85
5a90a7c880
Update de.coffee
...
Updated a few translations in the German locale file and merged the translations from de-DE.coffee
2014-06-17 23:52:54 +02:00
Nick Winter
0b8a0c8f6f
Added UserRemarks.
2014-06-17 13:03:13 -07:00
Scott Erickson
3e24b2f86e
Fixed tests running in karma.
2014-06-16 11:40:09 -07:00
Scott Erickson
d6bb7ffe81
Fixing tests. Somehow segmentio loading was making the jasmine test runner load properly in WebKit browsers. No idea why.
2014-06-16 11:40:09 -07:00
Scott Erickson
ee791da34c
Moved services into their own folder, and made no services run for both testing and demo pages.
2014-06-16 11:40:09 -07:00
Ruben Vereecken
1c671a3c25
Refactored vendor loading
2014-06-16 11:40:09 -07:00
Ruben Vereecken
2e40a53674
Extracting third party scripts out of main
2014-06-16 11:40:08 -07:00
Scott Erickson
4932317982
Finally got the demo view working (mostly). Need to turn off third party ajax requests.
2014-06-16 11:40:08 -07:00
Scott Erickson
1786eab09d
Initial work on a demo view. But brunch won't build demo-app.js for some reason.
2014-06-16 11:40:08 -07:00
Nick Winter
9a64ca5973
A few misc fixes.
2014-06-16 10:49:20 -07:00
Nick Winter
3d2bee3256
Merge pull request #1168 from kinez/patch-9
...
Update hu.coffee
2014-06-16 08:22:21 -07:00
Nick Winter
7198a8fc42
Merge pull request #1166 from ChrisLightman/patch-6
...
Upsate /// Translate
2014-06-16 08:21:56 -07:00
Nick Winter
0418d80c6d
Merged.
2014-06-16 08:12:52 -07:00
Inez KEMENES
c611cafa25
Update hu.coffee
2014-06-16 16:39:02 +02:00
Dominik Kundel
9a3ba70ea2
Merge remote-tracking branch 'upstream/master'
2014-06-16 14:30:22 +01:00
Dominik Kundel
25a0447d77
autocomplete
2014-06-16 14:29:01 +01:00
Clement
931f3ea330
Upsate /// Translate
...
Enjoy
2014-06-16 11:38:25 +02:00
barbuddha
ff5f46e5fb
Update ru.coffee
2014-06-16 08:43:27 +04:00
Nick Winter
66e2805a9a
Added StackLead integration. Employerified profile backgrounds.
2014-06-14 20:59:28 -07:00
Nick Winter
babfa04a9e
Fixed a tiny typo.
2014-06-14 18:02:22 -07:00
djsmith85
a22a098fdc
Update de-DE.coffee
2014-06-14 14:02:42 +02:00
Nick Winter
ff0d842871
Better employer contact message.
2014-06-13 16:04:11 -07:00
Michael Schmatz
84601d2927
Added more info email field to employer signup
2014-06-13 15:38:47 -07:00
Nick Winter
21e7487132
Showing more skills in employer table for better searching. Hid employer selling copy after sold.
2014-06-13 14:52:50 -07:00
Scott Erickson
a1dd9a714e
Fixed #1153 .
2014-06-13 13:35:57 -07:00
Scott Erickson
8f4e1b4bf0
Making the ModelModal look better.
2014-06-13 10:11:01 -07:00
Scott Erickson
6c87d5792d
One last fix to the search url.
2014-06-13 09:52:34 -07:00
Nick Winter
79cbc4bb25
Propagated i18n.
2014-06-13 08:50:52 -07:00
Nick Winter
4c57ff7501
Fixed LevelComponent search collection in level editor.
2014-06-13 08:48:29 -07:00
Nick Winter
1502cdc64b
Merge branch 'jayant1992-master'
2014-06-13 08:17:12 -07:00
Dominik Kundel
e756c83d9e
preliminary autocomplete. THIS IS NOT A WORKING STATUS. ONLY COMMIT TO PULL CHANGES
2014-06-13 16:14:31 +01:00
Dominik Kundel
603766b8c5
preliminary autocomplete. THIS IS NOT A WORKING STATUS. ONLY COMMIT TO PULL CHANGES
2014-06-13 16:12:55 +01:00
Nick Winter
27f2b9acb1
Merge pull request #1151 from kumabotz/remove-unicode
...
Remove unicode from url regex pattern
2014-06-13 08:11:59 -07:00
Nick Winter
2bda60796a
Copy / i18n tweaks for tournament ending and employers blurb.
2014-06-13 08:08:13 -07:00
Tery Lim
c3b72e025a
Remove unicode from url regex pattern
2014-06-13 10:30:29 +08:00
Nick Winter
1b2c4e078c
Fixed candidates viewing their own code and resetting it.
2014-06-12 17:52:08 -07:00
Nick Winter
28264d5ace
Added tournament results and a way to email them out.
2014-06-12 17:52:08 -07:00
George Saines
03aa0783b1
a few copy edits
2014-06-12 16:13:48 -07:00
George Saines
3415b62663
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-06-12 16:01:39 -07:00
George Saines
fb7b3f8580
adding a top info arena on top of the employers page
2014-06-12 16:01:34 -07:00
Michael Schmatz
32a041a5a7
Made max size of canvas much bigger for spectate view
2014-06-12 15:48:11 -07:00
Scott Erickson
152b860a23
Hotfix for the profile view.
2014-06-12 14:44:55 -07:00
Scott Erickson
994e4773ca
Reverting the objectId schema.
2014-06-12 13:19:06 -07:00
Scott Erickson
8ab69cf833
Merge pull request #1138 from rubenvereecken/search-endpoint
...
Search endpoint is now without the /search prefix
2014-06-12 11:33:28 -07:00
Scott Erickson
c855327cef
Merge pull request #1150 from rubenvereecken/achievements
...
Achievements - Update with some tests and admin endpoint
2014-06-12 11:28:25 -07:00
Ruben Vereecken
dcdcca751f
Fiddled with creating xp functions
2014-06-12 19:44:56 +02:00
Ruben Vereecken
aecf937722
Cleaned up achievement testing environment
...
Made sure server sided tests work completely
2014-06-12 19:41:07 +02:00
Ruben Vereecken
2a5c2020ca
Added recalculation button to the achievement editor
2014-06-12 19:41:07 +02:00
Ruben Vereecken
509be067c3
Added support for the operator in LocalMongo
2014-06-12 19:41:00 +02:00
Ruben Vereecken
bd2b289943
Recalculate script mainly finished
2014-06-12 19:40:59 +02:00
Ruben Vereecken
a61d0e5569
Added support for diminished exp for repeatables. Needs tweaking though.
2014-06-12 19:40:59 +02:00
Ruben Vereecken
7096a07ce8
Improved logging (winston) and admin-only'd the achievement editor
2014-06-12 19:40:59 +02:00
Ruben Vereecken
5aa211cabd
Got repeatables working flawlessly and improved the achievement popup by a great deal
2014-06-12 19:40:59 +02:00
Ruben Vereecken
2c04025a5a
Created a test environment for repeatables
2014-06-12 19:40:59 +02:00
Ruben Vereecken
b0666ace0d
Refactorings performed necessary to have searchable for more uses
2014-06-12 19:40:59 +02:00
Ruben Vereecken
0751581113
Search endpoint is now without the /search prefix
...
Intermediate commit for search refactoring
2014-06-12 19:19:30 +02:00
Lucas Castro
ebf0cba45d
Update pt-BR.coffee
2014-06-12 10:11:49 -03:00
oaugereau
f7ee40a3a2
Update fr.coffee
2014-06-12 14:39:41 +02:00
oaugereau
0d5e213daa
Update fr.coffee
2014-06-12 14:17:36 +02:00
oaugereau
028feaafc6
Update fr.coffee
2014-06-12 09:42:57 +02:00
Nick Winter
77920b5416
Improvements to profile views. Added links to players' code.
2014-06-11 19:38:47 -07:00
Scott Erickson
8a728cbb64
More switching of user objects from save to patch.
2014-06-11 14:17:31 -07:00
Scott Erickson
4ecbc73c1c
Fixed client side testing on karma/travis with the new FacebookHandler tests.
2014-06-11 13:43:07 -07:00
Jayant Jain
ed95206868
Enables moving around the map while an addThang is selected
2014-06-12 01:50:24 +05:30
Scott Erickson
6d15b5e631
Working on User patching.
2014-06-11 13:16:17 -07:00
Scott Erickson
e6dc896bab
Reworking some code to use the new CocoModel.patch method.
2014-06-11 11:34:52 -07:00
Lucas Castro
60a0a6ee80
Update pt-BR.coffee
2014-06-11 14:04:19 -03:00
Lucas Castro
fe9e584767
Update pt-BR.coffee
2014-06-11 14:00:52 -03:00
Nick Winter
cb378c13e2
Fixed employer list template typo.
2014-06-11 09:15:41 -07:00
Nick Winter
a9356fdc93
Merge pull request #1142 from Xercoy/patch-1
...
Added more names for #53
2014-06-11 07:24:55 -07:00
Jayant Jain
d5d20377a2
Removes panning upon right click in editor
2014-06-11 15:05:59 +05:30
barbuddha
d361ab5809
Update ru.coffee
2014-06-11 09:56:15 +04:00
Scott Erickson
389d530eaa
Built a new 'patch' method for CocoModel, which saves only changed values to the server.
2014-06-10 20:59:37 -07:00
Nick Winter
69fc378930
Final tournament update blurb.
2014-06-10 16:51:36 -07:00
Nick Winter
f3d18efa90
Added employer_list and activity tracking.
2014-06-10 16:30:13 -07:00
Scott Erickson
f0ff8c242e
Migrating language to codeLanguage on systems and components because they conflict with the search system.
2014-06-10 13:20:14 -07:00
Corey Prak
8448061f7b
Added more names for #53
2014-06-10 12:52:06 -04:00
Nick Winter
86223167af
Re-added significant trailing whitespace.
2014-06-10 07:46:43 -07:00