Nick Winter
8349578057
Fixed #786 .
2014-04-12 12:35:45 -07:00
Scott Erickson
30f785f7cf
Moved the model schemas into a models folder.
2014-04-12 10:51:02 -07:00
Scott Erickson
5a794306fe
Merge branch 'refactorSchemas' of https://github.com/adi2412/codecombat into adi2412-refactorSchemas
2014-04-12 08:53:24 -07:00
Scott Erickson
775821feec
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-12 08:52:50 -07:00
Scott Erickson
6eab5003f8
Merge branch 'feature/jsondiffpatch'
2014-04-12 08:52:35 -07:00
Scott Erickson
10b1660419
Fixed the level editor so you can save again.
2014-04-12 08:48:49 -07:00
julycoolwind
9078061af2
Update zh-HANS.coffee
...
Translate items under editor.
2014-04-12 17:56:56 +08:00
Aditya Raisinghani
e04787475c
Rebased master to get updated schemas and added patch schema
2014-04-12 15:16:42 +05:30
Aditya Raisinghani
b932bf1e7c
Deleted schemas from /server and modified files to point to /app/schemas
2014-04-12 14:45:59 +05:30
Aditya Raisinghani
6fb5b59a01
Refactored schemas to be in /app
2014-04-12 14:33:55 +05:30
Nick Winter
059b5e9b66
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-11 23:08:26 -07:00
Nick Winter
a4284e6209
Fixed #776 with some CSS/font fixes and \@therealbond's admin footerization.
2014-04-11 23:07:48 -07:00
Scott Erickson
35fe47bbac
Merge branch 'feature/jsondiffpatch'
2014-04-11 22:52:58 -07:00
Scott Erickson
53579b2632
Merge branch 'master' into feature/jsondiffpatch
...
Conflicts:
app/templates/editor/level/save.jade
app/templates/editor/thang/edit.jade
2014-04-11 22:52:05 -07:00
Scott Erickson
308adec7c7
Merge branch 'master' into feature/jsondiffpatch
...
Conflicts:
app/templates/editor/level/save.jade
app/templates/editor/thang/edit.jade
2014-04-11 22:52:00 -07:00
Scott Erickson
0eb74ab287
Added buttons for performing actions on patches.
2014-04-11 22:33:09 -07:00
Nick Winter
a792286161
Ameliorated #468 , maybe. At least, it doesn't erroneously show the name errors any more.
2014-04-11 22:30:28 -07:00
Scott Erickson
34bf484bf2
Added data merge conflict handling.
2014-04-11 21:11:52 -07:00
Ting-Kuan
65a32a262d
Before change dependency without name.
2014-04-12 00:03:56 -04:00
Nick Winter
fc9d30ccae
Smarter fix for #810 , since not all 24-character strings are like MongoDB ids.
2014-04-11 20:38:34 -07:00
Nick Winter
99ead5d193
#223 is done, since goals aren't in scripts, and I just removed some goals-of-scripts stuff.
2014-04-11 19:51:20 -07:00
Ting-Kuan
a6235842b6
Change populate model to accept resource name.
2014-04-11 22:35:20 -04:00
Nick Winter
f0aa5e1d5e
Fixed #681 by removing full-screen button in Safari.
2014-04-11 18:19:52 -07:00
Nick Winter
99b430c1b4
Fixed #714 with a hack.
2014-04-11 17:55:47 -07:00
Nick Winter
91c2f0fa33
Fixed #715 , and some misc cleanup.
2014-04-11 17:36:15 -07:00
Michael Schmatz
7ddd84248b
Simulator fixes!
...
Fixed memory bug with aggregation framework
2014-04-11 17:11:57 -07:00
Nick Winter
97d4017869
Hacky way to get play background to fit with new loading image.
2014-04-11 16:15:26 -07:00
Scott Erickson
177dd2c8cd
Set up Bootstrap 3 glyphicons.
2014-04-11 15:37:04 -07:00
Nick Winter
bbf26ecc9c
Fixed lcoale line endings again.
2014-04-11 15:02:01 -07:00
Nick Winter
72d1a6fe5a
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-11 14:59:19 -07:00
Nick Winter
1607790ea3
Updated jQuery UI from 1.10.3 to 1.10.4 for Treema autocomplete bug.
2014-04-11 14:59:09 -07:00
George Saines
96f4f1a3d2
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-11 14:51:25 -07:00
Glen De Cauwsemaecker
7a866981f7
Merge https://github.com/codecombat/codecombat
2014-04-12 01:30:40 +02:00
Glen De Cauwsemaecker
e9715f078f
Fixed merge conflicts for Jasper's commits.
2014-04-12 01:28:25 +02:00
George Saines
722165b0ad
adding ladder buttons and new load screen
2014-04-11 14:51:21 -07:00
Scott Erickson
bbb9fb7a64
Added a patches view.
2014-04-11 14:19:17 -07:00
Nick Winter
10bb17c38a
Added getThangByID method to Thang. Handled a few error corner cases with the time popup.
2014-04-11 14:03:13 -07:00
Nick Winter
82b47f6c0f
Added i18n for #809 .
2014-04-11 13:37:39 -07:00
Nick Winter
b330e783bf
Merge branch 'signupSocialButtons' of git://github.com/adi2412/codecombat into adi2412-signupSocialButtons
2014-04-11 13:28:11 -07:00
Nick Winter
b2da399e29
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-11 13:20:14 -07:00
Nick Winter
5ccdf680db
Updated all i18n tags.
2014-04-11 13:19:38 -07:00
Scott Erickson
0e26f317b3
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-11 13:18:28 -07:00
Scott Erickson
cce2fe3153
Removed an import that no longer exists.
2014-04-11 13:18:05 -07:00
Nick Winter
ae65f07e7e
Added some i18n and improved employer page.
2014-04-11 12:49:44 -07:00
Scott Erickson
d11b6a5751
Merge branch 'mediator' of https://github.com/rubenvereecken/codecombat into rubenvereecken-mediator
...
Conflicts:
bower.json
2014-04-11 12:44:29 -07:00
Nick Winter
ca13324e99
Resolved merge conflicts.
2014-04-11 11:32:51 -07:00
Scott Erickson
e3a1f170cf
Merge branch 'master' into gintau-feature/change-supermodel-to-general-resource-loader
...
Conflicts:
app/views/kinds/CocoView.coffee
app/views/play/level/level_loading_view.coffee
2014-04-11 11:19:16 -07:00
Ruben Vereecken
a07457acac
Finished minor refactorings
2014-04-11 20:09:50 +02:00
Nick Winter
3751bf903e
Merge pull request #806 from 1c7/master
...
New features: chinese language version use Youku
2014-04-11 10:33:10 -07:00
Scott Erickson
97a7bc7614
Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch
...
Conflicts:
app/initialize.coffee
bower.json
2014-04-11 10:32:19 -07:00
Nick Winter
8d5e129c2c
Merged the jobs in. Look out for Treema bugs from the last four months.
2014-04-11 10:20:12 -07:00
Nick Winter
26266963f4
Updated to jQuery 2.1.
2014-04-11 10:12:39 -07:00
Ruben Vereecken
f94dfeae6d
Reached a steady state without bower component backbone mediator
2014-04-11 15:00:16 +02:00
Ruben Vereecken
fc8684967d
Added initialization of the schema files
2014-04-11 14:37:08 +02:00
Ruben Vereecken
c2c0496883
Added schema stubs for about everything
2014-04-11 14:22:49 +02:00
Jasper D'haene
f2332b0694
Completed + reviewed latest Dutch locale changes
2014-04-11 09:11:12 +02:00
Jasper D'haene
23cb736d71
resolved merge conflicts
2014-04-11 08:05:11 +02:00
Nick Winter
a68f3efb99
Added specific job profile photo support. Improved right column design a bit.
2014-04-10 17:54:28 -07:00
Nick Winter
7a35a6248f
Adding contact form for employers to contact candidates.
2014-04-10 14:59:32 -07:00
Michael Schmatz
e17fbdae73
Fixed common programmables not being saved
2014-04-10 14:08:20 -07:00
Ting-Kuan
a5e6496a7c
Make resources as static class to avoid loading multiple times.
...
Clean debug message.
2014-04-10 16:59:08 -04:00
Scott Erickson
a3951b0fa7
Extended the save version modal to allow submitting patches.
2014-04-10 13:09:44 -07:00
Nick Winter
e9416ee128
Added some autocompleters for job profile Treema. Projects are now entirely links.
2014-04-10 11:58:51 -07:00
Michael Schmatz
a796d88967
Fixed tutorial modal for nonexistent tutorials
2014-04-10 11:42:22 -07:00
Scott Erickson
3c832d3707
Added delta views to the other save modals. Fixed modified deltas in delta views. A few style tweaks.
2014-04-10 11:13:33 -07:00
Michael Schmatz
42bf2996af
Made Aether ignore variable hoisting
...
See #813
2014-04-10 10:36:32 -07:00
Scott Erickson
5629284c76
Added text diff library to delta view.
2014-04-10 10:24:14 -07:00
Scott Erickson
66d455285e
Integrated the delta view into the save view for levels.
2014-04-09 19:07:44 -07:00
Nick Winter
26cebf7e7e
Fixing some recruitment profile bugs.
2014-04-09 18:10:30 -07:00
Nick Winter
dd46f9d039
Ripped out Gravatar profiles in favor of our own photo uploads, with Gravatar and Wizard portrait fallbacks.
2014-04-09 16:46:44 -07:00
Scott Erickson
b15380047c
Tweak to view.
2014-04-09 16:09:53 -07:00
Scott Erickson
f2d21b960f
Added a delta subview for displaying deltas of schema'd data.
2014-04-09 16:09:35 -07:00
Nick Winter
f17775cc10
Implemented George's jobs page design.
2014-04-09 13:14:52 -07:00
Aditya Raisinghani
b3804e7445
Minor corrections in format
2014-04-10 01:07:48 +05:30
Aditya Raisinghani
495d1be620
Added social buttons to Sign up modal
2014-04-10 01:01:30 +05:30
Ting-Kuan
3ea4d1677c
able to load level editor.
2014-04-09 15:11:59 -04:00
Nick Winter
76054345d7
Fixed #805 .
2014-04-09 09:04:59 -07:00
DjBRINE
7f4c251f43
Update ru.coffee
2014-04-09 03:57:40 -07:00
Alper ALIN
a2ebcc6433
Update tr.coffee
...
a few changes
2014-04-09 12:31:25 +03:00
1c7
56c18441e4
use youku for Chinese Version
2014-04-09 13:50:13 +08:00
Nick Winter
c226835ff2
Fixed a couple bugs in custom TreemaNodes.
2014-04-08 17:13:05 -07:00
Nick Winter
54cceb4311
Merge pull request #796 from adi2412/master
...
Moved nanoscroller to bower components
2014-04-08 15:59:28 -07:00
Nick Winter
3325c55c3f
Fixed #759 .
2014-04-08 14:58:34 -07:00
Ting-Kuan
354e3570e2
Merge branch 'feature/loading-views-ResourceManager' into feature/change-supermodel-to-general-resource-loader
2014-04-08 12:03:59 -04:00
Ting-Kuan
6729cfc292
First commit.
2014-04-08 12:03:03 -04:00
Glen De Cauwsemaecker
4bd058d1be
Merge branch 'master' of https://github.com/1c7/codecombat
2014-04-08 16:25:29 +02:00
1c7
102c707fa9
Chinese Translate(zh-HANS.coffee)
2014-04-08 22:17:40 +08:00
Glen De Cauwsemaecker
e02087f4ed
Merge pull request #798 from endrilian/patch-1
...
Update uk.coffee
2014-04-08 15:15:58 +02:00
Alexei Nikitin
33f26c3da0
Sync i18n
2014-04-08 12:23:16 +04:00
Glen De Cauwsemaecker
afbfa08416
fixed errors made in last contribution to the Turkish translation.
2014-04-08 09:06:11 +02:00
Alexei Nikitin
f8d6857633
Fix crlf
2014-04-08 10:50:58 +04:00
Nick Winter
b96bca8c18
Finished most of basic features for job profiles.
2014-04-07 17:58:02 -07:00
Alex
f798142b87
Update uk.coffee
2014-04-08 01:51:40 +03:00
Alexei Nikitin
e87c0c4b91
Work on thang tab
2014-04-08 02:49:27 +04:00
Nick Winter
9af6694054
More work on the job profiles.
2014-04-07 15:21:05 -07:00
Alper ALIN
51847c77ce
Update tr.coffee
2014-04-08 00:40:25 +03:00
Alexei Nikitin
5f062ad25c
Work on revert, save modal
2014-04-08 01:38:46 +04:00
Aditya Raisinghani
89670526ba
Removed nanoscroller code from main.html
2014-04-08 03:08:16 +05:30
Aditya Raisinghani
7cc9d22254
Moved nanoscroller to bower components and related fixes.
2014-04-08 03:04:36 +05:30
Alexei Nikitin
d64690e8d9
Work on fork modal
2014-04-08 00:29:40 +04:00
Ting-Kuan
16fe28ff55
Add ResourceManager.
2014-04-07 16:27:50 -04:00
Alexei Nikitin
69406df0ed
Work on create_new modal
2014-04-07 23:27:42 +04:00
Alexei Nikitin
630c44135a
Work on wizard settings
2014-04-07 21:44:47 +04:00
Alexei Nikitin
9dab4b39e6
Update ru.coffee
2014-04-07 19:46:01 +04:00
OlenaGapak
780541ea58
Update uk.coffee
...
ukrainian localization
2014-04-07 15:35:09 +03:00
Nick Winter
1b79de0d86
Loading active candidate profiles from the database into a table for employers.
2014-04-06 17:01:56 -07:00
Nick Winter
4ae8927d09
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-06 15:08:27 -07:00
Nick Winter
d8999fb4f3
Got rid of the css of antiscroll in favor of nanoscroller.
2014-04-06 15:08:13 -07:00
Nick Winter
13f34341b2
Merge branch 'doubleScrollbars' of git://github.com/adi2412/codecombat
2014-04-06 14:55:14 -07:00
Nick Winter
4070aab48a
Merge pull request #777 from Digot/patch-1
...
Update de.coffee
2014-04-06 14:37:43 -07:00
Nick Winter
06d846ccbf
Fixed bugs with some i18n from #793 ; copied new i18n tags over.
2014-04-06 14:35:40 -07:00
Nick Winter
8f1ef4e3bb
Merge pull request #793 from kinez/patch-4
...
Update hu.coffee
2014-04-06 14:26:06 -07:00
Nick Winter
31a170bf67
Merge pull request #771 from kinez/patch-2
...
Update hu.coffee
2014-04-06 14:24:38 -07:00
Nick Winter
69ba442261
Merge pull request #770 from kinez/patch-1
...
Update hu.coffee
2014-04-06 14:24:32 -07:00
Ting-Kuan
ac51404d4c
remove debug msg.
2014-04-06 16:40:06 -04:00
Ting-Kuan
20c624e0b8
Refactor CocoView.
2014-04-06 16:37:00 -04:00
Aditya Raisinghani
634ed82938
Fixed the background for spectate view
2014-04-07 01:00:35 +05:30
Ting-Kuan
d7fabd7133
Merge branch 'master' of https://github.com/codecombat/codecombat
...
Conflicts:
scripts/windows/coco-dev-setup/batch/localisation/zh-HANS.coco
2014-04-06 13:43:59 -04:00
Inez KEMENES
7d3b7de8b4
Update hu.coffee
2014-04-06 16:49:00 +02:00
Glen De Cauwsemaecker
3feb694756
Merge pull request #788 from 1c7/master
...
Chinese translate for windows automatic tool
2014-04-06 12:17:01 +02:00
Glen De Cauwsemaecker
9ea8282b89
Merge pull request #790 from zloysmiertniy/patch-1
...
Update es-419.coffee
2014-04-06 12:12:44 +02:00
1c7
13cfba91a8
add myself into diplomat.jade
2014-04-06 11:56:25 +08:00
Vindurrin
7a8f3849a6
Update es-ES.coffee
...
Line #231 , “Atajos de teclado” means “Keyboard Shortcuts” — let me know if this isn’t close enough to what is meant by “Key Bindings”: the reason that I chose this phrase is because I don’t know of an exact or approximate translation of “key bindings” into Spanish, but several other software platforms have used the phrase “atajos de teclado” to express this meaning.
2014-04-05 21:09:10 -04:00
Nick Winter
5c8c7fff1d
Starting work on simple recruitment listings. Moved Treema and the JS parts of Bootstrap to bower.
2014-04-05 17:05:03 -07:00
Evelyn Solorzano
af887fd4b8
Update es-419.coffee
...
Translated some commented lines up to play: category
2014-04-05 18:21:05 -05:00
Scott Erickson
8fe568d3a4
Fixed schema loading.
2014-04-05 11:48:21 -07:00
Ting-Kuan
4e41676219
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-05 10:51:40 -04:00
1c7
51142627d4
translate app/locale/zh-HANS.coffee
2014-04-05 14:34:21 +08:00
Scott Erickson
abaf32fc7a
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-04 14:57:55 -07:00
Michael Schmatz
2411269f2b
Added rank/number of sessions text
2014-04-04 14:55:55 -07:00
Michael Schmatz
0684bcff9c
Improved styling on graphs
2014-04-04 14:22:30 -07:00
Scott Erickson
2093049f5c
Fixed a bug with the profile view caused by the new page loading system.
2014-04-04 13:59:40 -07:00
Michael Schmatz
06f164525f
Merge branch 'master' of https://github.com/codecombat/codecombat
...
Conflicts:
app/views/play/ladder/ladder_tab.coffee
2014-04-04 13:48:39 -07:00
Michael Schmatz
7019bb6dea
Added score histogram to ladder tab
2014-04-04 13:38:36 -07:00
Ting-Kuan
2f5f65314d
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-04 15:35:44 -04:00
Ting-Kuan
de9337820b
Merge branch 'master' of https://github.com/codecombat/codecombat
...
Conflicts:
app/assets/main.html
scripts/windows/coco-dev-setup/batch/config/finished_header.coco
scripts/windows/coco-dev-setup/batch/config/github_header.coco
scripts/windows/coco-dev-setup/batch/config/install_header.coco
scripts/windows/coco-dev-setup/batch/config/npm_and_brunch_header.coco
scripts/windows/coco-dev-setup/batch/config/readme.coco
scripts/windows/coco-dev-setup/batch/localisation/de.coco
scripts/windows/coco-dev-setup/batch/localisation/fr.coco
scripts/windows/coco-dev-setup/batch/localisation/languages.coco
scripts/windows/coco-dev-setup/batch/localisation/zh-HANS.coco
scripts/windows/coco-dev-setup/batch/localisation/zh-HANT.coco
scripts/windows/coco-dev-setup/batch/localisation/zh.coco
scripts/windows/coco-dev-setup/batch/scripts/ask_question.bat
scripts/windows/coco-dev-setup/batch/scripts/download_and_install_app.bat
scripts/windows/coco-dev-setup/batch/scripts/download_and_install_applications.bat
scripts/windows/coco-dev-setup/batch/scripts/get_array.bat
scripts/windows/coco-dev-setup/batch/scripts/get_config.bat
scripts/windows/coco-dev-setup/batch/scripts/get_download.bat
scripts/windows/coco-dev-setup/batch/scripts/get_extension.bat
scripts/windows/coco-dev-setup/batch/scripts/get_extension.ps1
scripts/windows/coco-dev-setup/batch/scripts/get_language.bat
scripts/windows/coco-dev-setup/batch/scripts/get_local_text.bat
scripts/windows/coco-dev-setup/batch/scripts/get_path_safe.bat
scripts/windows/coco-dev-setup/batch/scripts/get_system_information.bat
scripts/windows/coco-dev-setup/batch/scripts/get_text.bat
scripts/windows/coco-dev-setup/batch/scripts/get_var.ps1
scripts/windows/coco-dev-setup/batch/scripts/get_variables.bat
scripts/windows/coco-dev-setup/batch/scripts/get_variables.ps1
scripts/windows/coco-dev-setup/batch/scripts/github_setup.bat
scripts/windows/coco-dev-setup/batch/scripts/npm_and_brunch_setup.bat
scripts/windows/coco-dev-setup/batch/scripts/open_readme.bat
scripts/windows/coco-dev-setup/batch/scripts/open_text_file.bat
scripts/windows/coco-dev-setup/batch/scripts/print_dashed_seperator.bat
scripts/windows/coco-dev-setup/batch/scripts/print_exit.bat
scripts/windows/coco-dev-setup/batch/scripts/print_file.bat
scripts/windows/coco-dev-setup/batch/scripts/print_finished_header.bat
scripts/windows/coco-dev-setup/batch/scripts/print_github_header.bat
scripts/windows/coco-dev-setup/batch/scripts/print_header.bat
scripts/windows/coco-dev-setup/batch/scripts/print_info.bat
scripts/windows/coco-dev-setup/batch/scripts/print_install_header.bat
scripts/windows/coco-dev-setup/batch/scripts/print_license.bat
scripts/windows/coco-dev-setup/batch/scripts/print_npm_and_brunch_header.bat
scripts/windows/coco-dev-setup/batch/scripts/print_seperator.bat
scripts/windows/coco-dev-setup/batch/scripts/print_tips.bat
scripts/windows/coco-dev-setup/batch/scripts/run_script.bat
scripts/windows/coco-dev-setup/batch/scripts/setup.bat
scripts/windows/coco-dev-setup/batch/scripts/sign_license.bat
scripts/windows/coco-dev-setup/batch/setup.bat
2014-04-04 14:32:42 -04:00
Scott Erickson
1971ddcefb
Moved somethingLoaded calls until after calls that would register more to load. A probably suboptimal way of making sure the progress numerator never reaches the progress denominator until it's actually time.
2014-04-04 10:12:22 -07:00
Alexei Nikitin
63f72cb454
Update ru.coffee
2014-04-04 10:01:03 -07:00
Ting-Kuan
fe27756b06
Pull from upsatream.
2014-04-04 12:52:22 -04:00
Vindurrin
79d19d61db
Update pt-BR.coffee
2014-04-04 00:14:28 -04:00
Scott Erickson
978c84bc89
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-03 18:43:36 -07:00
Scott Erickson
3b3b825be0
Set up a new loading/progress system for views.
2014-04-03 18:43:29 -07:00
Nick Winter
ef8388dac2
Merge pull request #781 from Darredevil/patch-6
...
Update ro.coffee
2014-04-03 16:38:04 -07:00
Nick Winter
9a70abb104
Don't need to explicitly skip Mobile Artillery's next level now.
2014-04-03 16:37:24 -07:00
Nick Winter
255cef83fb
Fixed #738 .
2014-04-03 16:16:53 -07:00
Darredevil
df3b51e5bd
Update ro.coffee
2014-04-04 02:15:50 +03:00
Nick Winter
62f91d14b0
Merged.
2014-04-03 16:06:32 -07:00
Nick Winter
0ad4cc7c04
Merge branch 'patch-1' of git://github.com/Vindurrin/codecombat into Vindurrin-patch-1
2014-04-03 16:05:27 -07:00
Michael Schmatz
9bb109dd7d
First iteration of mobile styling!
2014-04-03 15:10:24 -07:00
Vindurrin
d58c70b456
Update es-ES.coffee
2014-04-03 16:11:09 -04:00
Digot
eca934d6a5
Update de.coffee
2014-04-03 21:58:12 +02:00
Aditya Raisinghani
1c3117836f
Shifted nanoscroller to vendor.
2014-04-04 00:13:09 +05:30
Michael Schmatz
c434325ec0
Fixed line endings and locale error
2014-04-03 10:53:29 -07:00
Michael Schmatz
75b278b333
Fixed table overflow, added wrapper for histogram
2014-04-03 09:57:35 -07:00
Glen De Cauwsemaecker
12cf298467
Merge conflicts master
2014-04-03 17:42:08 +02:00
Glen De Cauwsemaecker
a2ac89094a
Merge conflicts: ms.coffee
2014-04-03 17:38:46 +02:00
Michael Schmatz
3aa31c7246
Graphs with D3!
2014-04-02 18:41:11 -07:00
Nick Winter
52de546727
Merged.
2014-04-02 15:09:40 -07:00
Nick Winter
6a51bd6837
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-02 14:43:09 -07:00
Nick Winter
670f94cc22
Fixed #418 , no more print/save dialogues evaaarr.
2014-04-02 14:42:34 -07:00
Aditya Raisinghani
44979c074d
Integrated nanoscroller.
2014-04-03 03:10:06 +05:30
Scott Erickson
0a78368217
Refactored user authentication again. Now the user object is inserted into main.html, which was renamed from index.html so the express static middleware wouldn't serve it.
2014-04-02 13:12:24 -07:00
Inez KEMENES
70d42b6eae
Update hu.coffee
2014-04-02 16:00:15 +02:00
Inez KEMENES
9acde85c8c
Update hu.coffee
2014-04-02 15:24:26 +02:00
Nick Winter
ae9769e3ce
Added read only notification in editors. Fixed #374 .
2014-04-01 13:15:30 -07:00
Nick Winter
ba3c4af536
Fixed last piece of #673 .
2014-04-01 10:51:03 -07:00
Nick Winter
7807fdbbc6
Merged pt-PT locale conflicts.
2014-04-01 10:41:40 -07:00
Nick Winter
99c4704e1f
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-01 10:31:42 -07:00
Nick Winter
bfa71d01ff
Merged.
2014-04-01 10:31:22 -07:00
Nick Winter
477545d50d
Merge pull request #763 from OlenaGapak/patch-1
...
Update uk.coffee
2014-04-01 10:26:55 -07:00
Nick Winter
b316a3e078
Merge branch 'dev/Warn_when_a_depended-on_System_is_missing' of git://github.com/gintau/codecombat into gintau-dev/Warn_when_a_depended-on_System_is_missing
2014-04-01 09:44:06 -07:00
Nick Winter
785cb342a2
Merge branch 'master' of git://github.com/tmrdja/codecombat into tmrdja-master
2014-04-01 09:12:48 -07:00
Dominik Kundel
45f1d8d408
added two programming quotes
2014-04-01 17:16:35 +02:00
swapnesh
497563bc0a
Added more names for #53
2014-04-01 17:50:33 +05:30
OlenaGapak
1799310261
Update uk.coffee
...
ukrainian localization
2014-04-01 14:59:46 +03:00
jaudhaen
be9edb74af
updated dutch locale
2014-04-01 09:26:42 +02:00
Ting-Kuan
e076440d1b
Move Noty to vendor folder.
2014-04-01 02:41:04 -04:00
Ting-Kuan
085d181ed3
Use Noty to produce warning message while adding component with not added system.
2014-04-01 00:47:50 -04:00
Michael Schmatz
f084588adf
Merge pull request #758 from dkundel/master
...
update de.coffee
2014-03-31 16:06:38 -07:00
Nick Winter
0bd8321345
Updated Mondo Bizarro i18n comma.
2014-03-31 16:02:56 -07:00
Dominik Kundel
a9b225ec03
fixed indentation de.coffee
2014-04-01 00:55:45 +02:00
Nick Winter
8c013c1192
Fixed 101: added level completion status to /play.
2014-03-31 15:48:22 -07:00
Dominik Kundel
069a7a41e4
update de.coffee
2014-04-01 00:34:51 +02:00
Michael Schmatz
b021b65ee1
Copied new i18n tags to all languages
2014-03-31 15:31:38 -07:00
Alexei Nikitin
0473ce2df1
Update ru.coffee
2014-03-31 15:11:56 -07:00
Alexei Nikitin
6ff8d0fbe3
Update en.coffee
2014-03-31 15:10:51 -07:00
Bia41
898018ac91
Updated pt-PT locale
...
Added some translations for European Portuguese.
2014-03-31 22:53:08 +01:00
Jazzis18
c3e4b4d279
Update ru.coffee
...
Добавил пробел в начало строки переменной join_desc_3, а то в тексте получалось слитно всё.
2014-04-01 03:34:45 +06:00
Nick Winter
a319e183b6
Fixed a little mistake with user signup.
2014-03-31 14:02:15 -07:00
Nick Winter
382422829e
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-31 13:56:17 -07:00
Nick Winter
389323953b
Fixed #180 .
2014-03-31 13:56:13 -07:00
Alexei Nikitin
4c3e8671a3
Update ru.coffee
2014-03-31 13:33:22 -07:00
Alexei Nikitin
9e1e59bb3f
Update en.coffee
2014-03-31 13:32:11 -07:00
Nick Winter
d8a194f895
Actually using loading screen template.
2014-03-31 13:21:08 -07:00
Nick Winter
0af05176f6
Re-added a minor fix that got lost.
2014-03-31 13:00:40 -07:00
Nick Winter
a9a0a55331
Merge branch 'master' of git://github.com/dkundel/codecombat into dkundel-master
2014-03-31 12:42:53 -07:00
Dominik Kundel
725a8bc2d9
updated locales
2014-03-31 20:48:07 +02:00
Dominik Kundel
1c6aea9c1c
Merge remote-tracking branch 'upstream/master'
2014-03-31 20:35:32 +02:00
Alexei Nikitin
1719358856
Update ru.coffee
2014-03-31 11:32:01 -07:00
Alexei Nikitin
aeddb64f90
Update base.jade
2014-03-31 11:09:44 -07:00
tmrdja
dfe6bce351
Added contextmenu
...
Added contextmenu
2014-03-31 18:33:14 +02:00
Bia41
167ee90a70
#673 Replaced .once with @listenToOnce
...
Replaced .once with @listenToOnce on CocoModel, as requested on Issue #673
2014-03-31 05:02:13 +01:00
Nick Winter
cb27124285
Fixed #135 .
2014-03-30 17:24:07 -07:00
Nick Winter
8df80ad1bc
Merged AKeeper's ru.coffee additions, taking into account M-r-A's suggestions.
2014-03-30 13:33:21 -07:00
Nick Winter
b0a4a97ff1
Merged
2014-03-30 12:54:48 -07:00
Bia
53c20d3b9d
Added Thang names
2014-03-30 20:43:48 +01:00
tmrdja
f8de6162d1
Added contextmenu
...
Added contextmenu with Delete and Duplicate button
2014-03-30 19:38:54 +02:00
tmrdja
470a79e6b0
Added contextmenu
2014-03-30 19:33:21 +02:00
Nick Winter
6bff295d2e
Linking up Prabh's Coin Mania level.
2014-03-29 18:04:29 -07:00
Nick Winter
1b92654a44
Merged.
2014-03-29 17:45:01 -07:00
Nick Winter
54f4e8d1e9
Merge branch 'dev/error_message_for_editor' of git://github.com/gintau/codecombat into gintau-dev/error_message_for_editor
2014-03-29 17:38:14 -07:00
Nick Winter
a79fe37ca1
Merged; made a couple tweaks.
2014-03-29 17:30:12 -07:00
Alexei Nikitin
ee5ee4bc88
Update ru.coffee
2014-03-29 17:28:44 -07:00
Dominik Maier
78c18b03b6
Merged new tips
2014-03-30 00:48:31 +01:00
Dominik Maier
fb607d06fa
Implemented popover for playback scrubber that will show the time the mouse is hovering over, the current time as well as the total ime of the level. Fixing #670
2014-03-30 00:38:45 +01:00
Nick Winter
c58a1682f4
Fixed #519 for real, I think.
2014-03-29 14:09:45 -07:00
Nick Winter
e08265a725
Merge pull request #730 from Darredevil/master
...
Added setGoalState
2014-03-29 14:04:33 -07:00
Nick Winter
b6e0f9037f
Merge pull request #731 from herby/locale
...
some more Slovak
2014-03-29 14:02:38 -07:00
Nick Winter
bd0ecd76e5
Fixed SearchView projections.
2014-03-29 13:22:21 -07:00
Ting-Kuan
130d322d60
Move error_view's dom to template file.
2014-03-28 23:51:15 -04:00
Herbert Vojčík
f0298f4596
some more Slovak
2014-03-29 03:18:45 +01:00
Darredevil
c4de6ef996
Added setGoalState
2014-03-29 03:54:16 +02:00
Darredevil
0a969bb103
Added setGoalState
2014-03-29 03:53:19 +02:00
Darredevil
e060d4b73d
Added setGoalState
2014-03-29 03:52:02 +02:00
Nick Winter
5bcaf2c746
Fixed #64 (I hope; let's UX test.)
2014-03-28 17:06:21 -07:00
Nick Winter
cf81d51a89
Fixed #46 .
2014-03-28 15:23:12 -07:00
Nick Winter
5e30ab091b
Updated i18n tags.
2014-03-28 13:19:17 -07:00
Nick Winter
13d5536eb3
Merged.
2014-03-28 13:08:30 -07:00
Jasper D'haene
7f6510823a
merged
2014-03-28 20:59:05 +01:00
Nick Winter
c4a56dc9a5
Added a thing which highlights the guide every 5 minutes until clicked. Fixed #11 .
2014-03-28 12:22:53 -07:00
Jasper D'haene
fa6ef5aa49
added authors to quotations
2014-03-28 19:58:33 +01:00
Nick Winter
62f2fe80c3
Updated CoordinateDisplay styles; fixed #10 .
2014-03-28 11:55:24 -07:00
Nick Winter
ff7e2d5d47
Fixed #728 .
2014-03-28 11:02:23 -07:00
Jasper D'haene
cd3019296c
added tips/quotes to loading bar
2014-03-28 19:01:31 +01:00
Nick Winter
62867534a7
Fixed #727 .
2014-03-28 09:52:07 -07:00
Scott Erickson
84cb0bfd0d
Merge pull request #713 from Sighne/master
...
Migrate .on, .once - ThangTypeEditView
2014-03-28 09:34:29 -07:00
Michael Schmatz
20c54400b8
Merge pull request #722 from dc55028/master
...
fr.coffee: fixed typos and translated glen_description
2014-03-28 09:16:35 -07:00
Michael Schmatz
e0f50d04a8
Uncomment translations
2014-03-28 09:13:08 -07:00
Dominik Kundel
267d033997
initial coffeescript support. No proper highlighting of executing parts and errors are not displayed inline
2014-03-28 14:42:08 +01:00
Dominik Kundel
35a16b47ff
Merge remote-tracking branch 'upstream/master'
2014-03-28 14:37:14 +01:00
Dom
15590252f1
Update fr.coffee
...
fixed other typos and translated a definition
2014-03-28 00:38:31 +01:00
Arni Mc.Frag
0388376d99
Update ca.coffee
2014-03-28 00:29:54 +01:00
Dom
6f02748311
Update fr.coffee
...
fixed typos
2014-03-28 00:29:31 +01:00
Nick Winter
5763cdca87
Merge pull request #718 from Darredevil/patch-4
...
Added funny tip
2014-03-27 15:19:28 -07:00
Darredevil
a91e067549
Added funny tip
2014-03-28 00:13:40 +02:00
Darredevil
f4a81f43a2
Added funny tip
2014-03-28 00:13:30 +02:00
Nick Winter
b0b37aa9d8
Made play/pause and scrubber look even more disabled when disabled.
2014-03-27 15:07:37 -07:00
Nick Winter
2677751dc5
Merge branch 'lbox-prog' of git://github.com/Shrihari/codecombat into Shrihari-lbox-prog
2014-03-27 14:58:06 -07:00
Nick Winter
31119f402a
Cleaned up readyToRank logic a bit.
2014-03-27 14:55:45 -07:00
Nick Winter
1cab83236c
Merge branch 'master' of git://github.com/jayant1992/codecombat into jayant1992-master
2014-03-27 14:22:44 -07:00
Nick Winter
7ab5adcdac
Merge pull request #700 from pedrofgsrj/loginAutocomplete
...
Fixed issue #597
2014-03-27 14:20:58 -07:00
Nick Winter
127c4a4e0f
Refactored defaults for Aether's fancy options, and overriding them with query parameters. Reduced non-dev-mode script debug logging.
2014-03-27 13:36:33 -07:00
Laura Lebbah
5d894ea053
Migrate .on, .once - ThangTypeEditView
2014-03-27 21:33:59 +01:00
Nick Winter
c076bb1da8
Tweaking some styles; perhaps fixed #6 .
2014-03-27 13:15:22 -07:00
Ting-Kuan
6012a3ce9e
Show error message when editor fails to initiate.
2014-03-27 14:35:20 -04:00
AKeeper
d21fbbfe4d
Update ru.coffee
2014-03-27 16:48:30 +02:00
Aditya Raisinghani
deb3ddeece
Longer modals are now scrollable.
2014-03-27 12:31:29 +05:30
Pedro Sobrinho
38bf27020a
Fixed issue #597
2014-03-26 20:55:03 -04:00
Alexei Nikitin
780743a40d
Update ru.coffee
2014-03-26 15:57:16 -07:00
Alexei Nikitin
2ffc2efaa5
Update ru.coffee
2014-03-26 15:42:03 -07:00
Jayant Jain
648df5eb41
Updated rank my game check, fixes #666
2014-03-27 03:36:27 +05:30
Scott Erickson
37beb1bc6b
Made the ladder tab better able to handle unloaded gplus and facebook apis.
2014-03-26 14:53:09 -07:00
Scott Erickson
092810eba2
Fixed a small error in the migration.
2014-03-26 14:44:11 -07:00
Scott Erickson
8001e58848
Merge branch 'master' of https://github.com/swapkh91/codecombat into swapkh91-master
...
Conflicts:
app/models/SuperModel.coffee
2014-03-26 14:39:01 -07:00
Scott Erickson
fae9034dfc
Merge branch 'master' of https://github.com/swapkh91/codecombat into swapkh91-master
...
Conflicts:
app/models/SuperModel.coffee
2014-03-26 14:29:16 -07:00
Scott Erickson
462d365ce0
Sorted the friend sessions a bit.
2014-03-26 14:22:04 -07:00
Scott Erickson
781b33092c
Added a google plus connect button.
2014-03-26 14:19:05 -07:00
Scott Erickson
132b22f14a
Got the gplus friends loading now.
2014-03-26 13:50:01 -07:00
Nick Winter
544070e578
Fix for infinite loop fix.
2014-03-26 12:34:45 -07:00
Nick Winter
515b8723a3
Simulator handles more errors.
2014-03-26 12:12:43 -07:00
Nick Winter
ac222c27e8
"Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-26 12:12:18 -07:00
Scott Erickson
ad70a7f0c6
Merge branch 'master' of https://github.com/jayant1992/codecombat into jayant1992-master
2014-03-26 11:48:47 -07:00
Scott Erickson
3b8cba291d
Removed some unnecessary callbacks.
2014-03-26 11:48:40 -07:00
Nick Winter
127eb3cef6
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-26 11:32:49 -07:00
Nick Winter
aec4669780
Merge pull request #687 from kgy01/master
...
Hide arrow's shadow if buried
2014-03-26 11:27:11 -07:00
Nick Winter
cab343b0b3
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-26 11:25:20 -07:00
Nick Winter
773df44b14
Added infinite loop handling to Simulator.
2014-03-26 11:25:05 -07:00
Jayant Jain
71294f14b2
Updates fb and g+ functions to be called on api load, fixes #695
2014-03-26 22:03:20 +05:30
Glen De Cauwsemaecker
5825b2676b
Added myself to the signature.
2014-03-26 04:46:49 +01:00
swapnesh
1118324b41
Migrate from .on, .once to .listenTo, .listenToOnce
2014-03-26 03:25:11 +05:30
Dominik Kundel
fe8a4901de
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
app/locale/de.coffee
bower.json
2014-03-25 17:07:36 +01:00
Michael Schmatz
06f46af603
Merge pull request #688 from 1c7/master
...
Translate some word from English -> Chinese. (zh-HANS.coffee)
2014-03-25 08:44:29 -07:00
1c7
ed2e17aedc
Translate some word from English -> Chinese. (zh-HANS.coffee)
2014-03-25 23:15:17 +08:00
kgy01
29aad01697
hide Arrow and Spear if buried use ['Arrow', 'Spear'] for condition
2014-03-25 08:48:26 -04:00
kgy01
a420064bc1
hide spear's shadow if buried
2014-03-25 08:31:38 -04:00
Glen De Cauwsemaecker
305e2f6d68
Merge pull request #685 from JasperDhaene/master
...
Added myself to the diplomate list, fixed typos and made corrections to Dutch locale
2014-03-25 13:27:13 +01:00
kgy01
3cc422a281
Merge remote-tracking branch 'upstream/master'
2014-03-25 08:10:30 -04:00
kgy01
c48863fae6
Hide arrow's shadow if buried
2014-03-25 08:06:37 -04:00
Aditya Raisinghani
6208e8e324
Additional fixes for double scrollbars of modals.
2014-03-25 16:50:02 +05:30
Aditya Raisinghani
84db5289f9
Fixed issue with two scroll bars appearing.
2014-03-25 16:36:24 +05:30
JasperDhaene
748081b4a7
Added myself to the diplomate list, fixed typos and made corrections to Dutch locale
2014-03-25 09:25:20 +01:00
Shrihari
aee18523b0
Fix for #506
2014-03-25 13:28:22 +05:30
Darredevil
4bb1ee5c74
Update ro.coffee
2014-03-25 02:55:07 +02:00
Glen De Cauwsemaecker
3382750c7e
Merge branch 'dutch_diff' of github.com:rubenvereecken/codecombat
2014-03-25 01:13:30 +01:00
Scott Erickson
bda499b561
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-24 14:43:08 -07:00
Scott Erickson
2c329a256f
Removed all the setting properties to null in destroy methods that don't need them since destroy nullifies all properties.
2014-03-24 14:42:56 -07:00
Nick Winter
97613f12b4
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-24 14:38:35 -07:00
Nick Winter
a42e33764e
Merged, fixed.
2014-03-24 14:38:18 -07:00
Scott Erickson
53118984ff
Undid a listenTo on a jQuery elem.
2014-03-24 14:29:53 -07:00
Scott Erickson
57f6f4d244
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-24 14:27:28 -07:00
Scott Erickson
e9b3db2eb9
Fixed destroy to not break stopListening, which uses off.
2014-03-24 14:27:10 -07:00
Ruben Vereecken
a3f65ace7a
Created differentation between nl-BE and nl-NL
2014-03-24 22:21:34 +01:00
Nick Winter
e6e216fcd3
Mergred Diplomats.
2014-03-24 14:20:40 -07:00
Ruben Vereecken
3f3eeab02a
Fixed NaN in ladder in case a player has never played before
2014-03-24 19:46:50 +01:00
Michael Schmatz
83bfc28a9e
Partially refactored scoring callback pyramid of hell
2014-03-24 10:58:43 -07:00
Scott Erickson
f55cef5ced
Merge branch 'migrateBBevents' of https://github.com/Shrihari/codecombat into Shrihari-migrateBBevents
2014-03-24 10:38:57 -07:00
Shrihari
093cc66fa0
Reverted few wrong migrations
2014-03-24 22:56:32 +05:30
Shrihari
f085b0d319
Refactored cast-button events
2014-03-24 22:41:27 +05:30
Shrihari
0160538b44
More migrations
2014-03-24 22:28:34 +05:30
Scott Erickson
bf039ed485
Merge pull request #642 from gintau/feature_-_select_dependents_(extant_component_treema)
...
Select dependents when a extant component is selected.
2014-03-24 09:31:27 -07:00
Scott Erickson
6de62154bd
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-24 09:28:06 -07:00
Shrihari
69ee16f77f
Fixed wrong migrations
2014-03-24 21:37:09 +05:30
Nick Winter
92c87dc4ad
Merge branch 'fix/scroll-spell-debug-view' of git://github.com/gintau/codecombat into gintau-fix/scroll-spell-debug-view
2014-03-24 08:28:48 -07:00
Ting-Kuan
e9118142db
Fix issue #662
2014-03-24 10:54:59 -04:00
Shrihari
5845125b43
Migrate .on, .once - Fixed a small error
2014-03-24 12:32:29 +05:30
Shrihari
67f5270bfc
Migrate .on, .once - Batch 1
2014-03-24 12:23:41 +05:30
Akaza Akari
3e4d7d745a
Script-based movement for all CocoSprites for #140
2014-03-23 23:19:18 -07:00
Nick Winter
5852b87aa3
A little longer debounce is better.
2014-03-23 18:55:44 -07:00
Nick Winter
808762c229
Merge pull request #663 from domenukk/master
...
fixes codecombat/codecombat#655
2014-03-23 18:11:40 -07:00
Dominik Maier
f66e210c73
regarding codecombat/codecombat#655 debounce debounces.
2014-03-24 01:18:36 +01:00
Nick Winter
dbeb3d445b
Give focus back to spell view on palette click.
2014-03-23 16:48:30 -07:00
Dominik Maier
dcbd55a864
regarding codecombat/codecombat#655 -> adds asynchronous name checking that actually works.
2014-03-24 00:47:41 +01:00
Nick Winter
4a47c5b517
Dead Thangs sink down a bit in the layer order.
2014-03-23 16:21:36 -07:00
Nick Winter
656b34fc34
Fixed comment gutter icons jumping all over the place.
2014-03-23 16:00:23 -07:00
Glen De Cauwsemaecker
d6178aa2cc
Fixed a small error
2014-03-24 00:46:44 +01:00
Glen De Cauwsemaecker
724592601c
Merge branch 'master' of github.com:JasperDhaene/codecombat
2014-03-24 00:45:09 +01:00
Dominik Maier
0dee3d042f
fixes codecombat/codecombat#655 completely
...
Removes asynchronous name checking, though, if it ever worked.
2014-03-23 23:04:39 +01:00
JasperDhaene
58601e95f6
finished review of nl.coffee
2014-03-23 22:54:30 +01:00
Nick Winter
9fbd008f59
Merge branch 'ItsLastDay-arrow'
2014-03-23 14:15:24 -07:00
Nick Winter
d85dd9f62c
Bringing in #664 , but only when maximizesArc is on.
2014-03-23 14:15:06 -07:00
Mikhail Koltsov
13338afe3d
Now absolutely done scaling ( #46 )
...
also commented math's out.
2014-03-23 23:51:46 +04:00
Mikhail Koltsov
446726acc9
done rotating, looks good in Zone of Danger ( #46 )
2014-03-23 22:13:07 +04:00
Dominik Maier
459a1f9e48
fixes codecombat/codecombat#655
2014-03-23 18:41:15 +01:00
Nick Winter
111973e1c8
Maybe this will be better - more on #650 .
2014-03-23 10:29:08 -07:00
Nick Winter
7ba959045a
A slight enhancement to #650 , plus fixing CocoModels thinking they're modified when schema defaults have been added.
2014-03-23 10:00:16 -07:00
Scott Erickson
8ca5f23749
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-23 09:30:46 -07:00
JasperDhaene
e5d2c07ff1
general revision until line 254
2014-03-23 17:30:45 +01:00
Scott Erickson
72b88a3ee9
First pass on setting up gplus friends on the ladder page.
2014-03-23 09:30:01 -07:00
Mikhail Koltsov
edeeb3c3eb
some work on arrows
2014-03-23 20:21:11 +04:00
Nick Winter
1789723d4d
Merge pull request #650 from dpen2000/Issue390
...
Fix #390
2014-03-23 09:14:41 -07:00
Nick Winter
f8f5f718bb
Merge pull request #660 from dpen2000/SimulatorTextFix
...
Fix "Simulating game between" line to only have one "and"
2014-03-23 09:13:20 -07:00
Nick Winter
4c1dc0d7f9
Merge pull request #661 from M-r-A/patch-2
...
Update ru.coffee
2014-03-23 09:11:52 -07:00
Nick Winter
90832f6015
Merge pull request #653 from 3rr3s3v3n/patch-1
...
Translating Multiplayer lines
2014-03-23 09:11:11 -07:00
JasperDhaene
dde626e759
Update nl.coffee - small revisions/additions
2014-03-23 16:57:33 +01:00
Alexei Nikitin
20e111d307
Update ru.coffee
2014-03-23 07:30:14 -07:00
dpen2000
970552a6d6
Fix "Simulating game between" line to only have one "and"
2014-03-23 13:35:24 +00:00
3rr3s3v3n
f4de280cee
Translating more Lines.
...
Password remains password in Italian, such as VS.
2014-03-23 11:53:39 +01:00
3rr3s3v3n
5ef6f6974f
Translation actived!
...
I removed the # mark from the lines I've translated yesterday.
2014-03-23 11:39:35 +01:00
Nick Winter
fd2d9b6833
Merge pull request #658 from ItsLastDay/editor_tweaks
...
Added tooltip in level-editor (issue #174 )
2014-03-22 17:30:52 -07:00
Nick Winter
487b2aae9b
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-22 14:28:25 -07:00
Nick Winter
eec46dcb48
Don't try to draw a grid if it's not going to work (no lands).
2014-03-22 14:28:18 -07:00
Mikhail Koltsov
2316773cb1
removed Label requierment
2014-03-22 23:25:18 +04:00
Mikhail Koltsov
36cfdfda46
Added labels above selected thangs in level-editor (issue #174 )
2014-03-22 23:17:15 +04:00
Michael Schmatz
c3b745b271
Added Catalan language file
2014-03-22 11:30:58 -07:00
Nick Winter
76ec738213
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-22 10:54:38 -07:00
Nick Winter
5e311cdefa
Fixed css for IE warnings.
2014-03-22 10:54:35 -07:00
Nick Winter
96fe1e42f0
Merge pull request #657 from adi2412/reloadCode
...
Made changes to reloadAllCode to reload only the team's code.
2014-03-22 10:36:17 -07:00
Aditya Raisinghani
bee5d528ec
Made changes to reloadAllCode to reload only the team's code.
2014-03-22 22:56:41 +05:30
Mikhail Koltsov
baf8adcc74
added nothing
2014-03-22 20:50:50 +04:00
Nick Winter
29e7b8e5c1
Fixed mail to correctly capture the matches.
2014-03-22 09:48:36 -07:00
Michael Schmatz
5141873725
Added resimulateAllSessions method
2014-03-22 09:07:01 -07:00
Nick Winter
808cf9280b
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-22 08:53:02 -07:00
Nick Winter
d289ca825e
Fixed Simulator to actually use protectAPI.
2014-03-22 08:52:47 -07:00
3rr3s3v3n
6b660dade2
Translating Multiplayer lines
...
Ok, I tried to translate in italian some lines ;) hope this helps.
2014-03-22 10:38:32 +01:00
therealbond
7d03c2e520
Merge branch 'master' of https://github.com/therealbond/codecombat
2014-03-22 02:05:19 -04:00
therealbond
b2c500369b
Added more names for #53
2014-03-22 01:56:32 -04:00
Scott Erickson
0df09f7f35
Fixed an ever-reloading bug.
2014-03-21 21:11:51 -07:00
Scott Erickson
2cdfbf1c48
Merged conflicts.
2014-03-21 19:56:25 -07:00
Scott Erickson
6445924598
Merge branch 'master' of https://github.com/codecombat/codecombat
...
Conflicts:
app/templates/play/ladder/ladder_tab.jade
app/views/play/ladder/ladder_tab.coffee
2014-03-21 19:53:32 -07:00
Scott Erickson
14ee9c30ce
Added facebook friends to the ladder page.
2014-03-21 19:50:54 -07:00
dpen2000
6c151acaa7
Optimizations of markToRevert: Switch to using $.extend instead of _.cloneDeep and only when type is not a "ThangType"
2014-03-22 02:22:08 +00:00
dpen2000
60ca991c58
Fix #390
...
The issue here was configSchema is an attribute within attributes and so revertAttributes and attributes get the same instance of it when clone is used. Later calls to _.equals fail when only configSchema has changed.
2014-03-22 01:34:24 +00:00
Nick Winter
b91f3200c2
Merge pull request #649 from jayant1992/master
...
Fixes #641 , the list of levels in editor reloads properly upon changing ...
2014-03-21 17:46:10 -07:00
Nick Winter
e101fb04eb
For #648 : Keeping localStorage fallback for played levels temporarily until most have migrated to user property. Fixed #627 .
2014-03-21 17:42:13 -07:00
Nick Winter
5abe0746ba
Merge pull request #648 from dpen2000/lastLevel
...
Implement saving lastLevel in database re #627
2014-03-21 17:27:31 -07:00
Jayant Jain
860c3a34d3
Fixes #641 , the list of levels in editor reloads properly upon changing language
2014-03-22 05:51:44 +05:30
Nick Winter
dfcdcaa678
No email addresses for non-admins on CLA submissions.
2014-03-21 17:20:47 -07:00
Nick Winter
4bc1e6805b
Improved page title. Fixed Twitter card image.
2014-03-21 17:06:51 -07:00
dpen2000
a35d0cb651
Implement saving lastLevel in database re #627
2014-03-22 00:01:32 +00:00
Nick Winter
f0640dd2e8
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-21 16:22:51 -07:00
Nick Winter
ba66dbf5a1
Adding CLAs view.
2014-03-21 16:22:47 -07:00
Nick Winter
893f446b0a
Merge pull request #645 from dpen2000/autocastDelay
...
Save autocastDelay as a setting on User re #627
2014-03-21 16:01:00 -07:00
dpen2000
b1b0579cb3
Save autocastDelay as a setting on User re #627
2014-03-21 22:46:14 +00:00
dpen2000
6363c40fe2
Update cla.jade
...
p -> a. Using html syntax to avoid linking full stop.
2014-03-21 21:59:31 +00:00
Ting-Kuan
0db309f526
Select dependents when a extant component is selected.
2014-03-21 12:19:47 -04:00
Sérgio Batista
ee4858f725
Update pt-PT.coffee
...
Some new additions and minor fixes to old ones
2014-03-21 16:39:47 +01:00
Nick Winter
b30bf35945
Fixed #638 , I hope.
2014-03-21 08:09:08 -07:00
Nick Winter
a3dadd6a40
Merge branch 'editor_tweaks' of git://github.com/ItsLastDay/codecombat into ItsLastDay-editor_tweaks
2014-03-21 07:25:33 -07:00
Mikhail Koltsov
096c59b6cf
fix some assymetry
2014-03-21 15:42:29 +04:00
Mikhail Koltsov
af18e7a27e
Thang editor: components tab finally looks good and does not overlay other tabs
2014-03-21 15:40:32 +04:00
Mikhail Koltsov
45b87ed38e
finally got it right
2014-03-21 13:45:56 +04:00
Muhammad Nuzaihan Bin Kamal Luddin
eaa9443969
grammar mistake
2014-03-21 17:10:03 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
966e99510e
Probably too little commits at one time. more grammar fixes
2014-03-21 16:45:34 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
cb8c146029
grammar fixes
2014-03-21 16:41:23 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
d876f975e6
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-21 16:33:18 +08:00
Mikhail Koltsov
0ece400a18
Level editor: selecting a thang now moves the scroll in existant-thang list
2014-03-21 11:54:55 +04:00
David Hallberg Jönsson
75138cb67b
Update sv.coffee
...
Updated some existing translations, mostly grammar corrections.
2014-03-21 08:40:37 +01:00
Muhammad Nuzaihan Bin Kamal Luddin
4804065c94
Comment out WIP. Uncomment missed line.
2014-03-21 15:07:35 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
6f0915e7ce
Messed up with string interpolation
2014-03-21 15:03:40 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
9a44c3fd31
Some important information
2014-03-21 14:53:43 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
b288e53a89
Put 'parti' in blockquotes so highlight difference from 'political party'
2014-03-21 14:47:11 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
d71e13977f
More grammar issues.... sigh
2014-03-21 14:40:13 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
e51c3502c1
some grammar fixes
2014-03-21 14:36:42 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
d84bee3c3e
Fix malay grammatical errors
2014-03-21 14:27:43 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
9ec615f58c
Correct some punctuations and add new translations
2014-03-21 14:25:35 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
3b18a3f24e
Errors in Daftar masuk
2014-03-21 13:24:09 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
ffde1595da
Some small details on accounts
2014-03-21 13:14:50 +08:00
Nick Winter
424390ae84
Moved antiscroll init; disabled it for now because of bugginess.
2014-03-20 22:00:34 -07:00
Karthig
f52dced0ce
- initial implementation of antiscroll, squashed
2014-03-20 21:39:03 -07:00
Nick Winter
89d720dc30
Uncommented multiplayer modal i18n section for Polish.
2014-03-20 21:29:03 -07:00
Nick Winter
0c6a22e26d
Merge pull request #631 from TigroTigro/patch-3
...
Update pl.coffee
2014-03-20 21:27:53 -07:00
Nick Winter
53f39e9cc7
Pointed locale at correct file.
2014-03-20 21:25:20 -07:00
Nick Winter
f55654130e
Merge branch 'master' of git://github.com/muhammadn/codecombat into muhammadn-master
2014-03-20 21:23:12 -07:00
Muhammad Nuzaihan Bin Kamal Luddin
3047d5c696
Minor changes
2014-03-21 10:47:46 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
6e32b79921
and to dan
2014-03-21 10:46:27 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
cf4f8dc9b7
Add some must-have information in translation
2014-03-21 10:45:11 +08:00
Nick Winter
bba85745f7
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-20 19:18:49 -07:00
Nick Winter
9e4908ade2
A couple ladder tweaks.
2014-03-20 19:18:46 -07:00
Muhammad Nuzaihan Bin Kamal Luddin
282fd50b3c
Major additions to MS locale in Codecombat
2014-03-21 09:58:52 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
6eccb459cf
Additions to Bahasa Malaysia
2014-03-21 09:28:39 +08:00
J Phani Mahesh
edc90c4598
Fix login popup being displayed under trailer. ( #596 )
2014-03-21 06:44:21 +05:30
Scott Erickson
29b51c470c
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-20 17:03:19 -07:00
Scott Erickson
431d3054b6
Set up Facebook to work when working on localhost.
2014-03-20 17:02:25 -07:00
Nick Winter
ca1e3742c0
Added simulation counts.
2014-03-20 15:40:02 -07:00
Scott Erickson
6e9daf59c9
Merge remote-tracking branch 'origin/master'
2014-03-20 14:40:29 -07:00
Glen De Cauwsemaecker
18cf143bfb
Corrected some errors in the swedisch local. file
2014-03-20 23:03:19 +01:00
Scott Erickson
22555790b5
Set up a trimmed down leaderboard showing just top players and your rank.
2014-03-20 14:40:17 -07:00
TigroTigro
a8716000a4
Update pl.coffee
2014-03-20 22:16:26 +01:00
iamhj
d0be8b36b6
Update sv.coffee
...
Added Swedish text to all the places where there wasn't any.
2014-03-20 20:13:54 +01:00
Scott Erickson
dbbf9ce8b3
Merge branch 'master' of https://github.com/jayant1992/codecombat into jayant1992-master
...
Conflicts:
app/styles/editor/level/thangs_tab.sass
app/templates/editor/level/thangs_tab.jade
app/views/editor/level/thangs_tab_view.coffee
2014-03-20 11:22:23 -07:00
Nick Winter
2f3c0b0cc6
Need updated Aether.
2014-03-20 10:43:24 -07:00
Nick Winter
81a459dc02
Merged and fixed indentation to two spaces instead of three.
2014-03-20 08:25:12 -07:00
OlenaGapak
d43c05b558
Update uk.coffee
...
ukrainian localization. spelling fixes, new translation
2014-03-20 15:05:58 +02:00
Mikhail Koltsov
a6523719e4
Merge branch 'master' of https://github.com/codecombat/codecombat into editor_tweaks
...
Conflicts:
app/locale/ru.coffee
2014-03-20 09:07:11 +04:00
Nick Winter
1ce67710c5
Merged.
2014-03-19 19:26:17 -07:00
kvasnyk
802f0069b7
Polish language translations bug fixes.
2014-03-20 03:03:03 +01:00
Nick Winter
b7e8f2ecb5
Merge pull request #605 from kvasnyk/master
...
Fix for #272 bug.
2014-03-19 18:31:20 -07:00
Nick Winter
ff1e64e1f6
Less useless ladder refresh requests.
2014-03-19 18:26:38 -07:00
Nick Winter
9713f7d142
Merge branch 'arrow' of git://github.com/ItsLastDay/codecombat into ItsLastDay-arrow
2014-03-19 18:01:49 -07:00
Nick Winter
097c6bc2cd
Changed line endings on en.coffee and nl.coffee away from DOS. Trying out fix for Firefox embed.
2014-03-19 17:25:56 -07:00
Nick Winter
87f16f2550
Merge branch 'Shrihari-range-radii'
2014-03-19 17:17:05 -07:00
Nick Winter
fec8e34a78
Merged.
2014-03-19 17:16:48 -07:00
Scott Erickson
954a3ac4cb
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-19 17:11:53 -07:00
Glen De Cauwsemaecker
225fd6d355
Fixed a spelling mistake I made yesterday.
2014-03-20 02:02:40 +01:00
Glen De Cauwsemaecker
dfbba38dd3
Merge github.com:codecombat/codecombat
2014-03-20 01:55:12 +01:00
Scott Erickson
b6c9b6276c
Tweaked logging of sprite building.
2014-03-19 17:11:45 -07:00
Glen De Cauwsemaecker
71a13a5670
Adding missing translations for the Dutch local file
2014-03-20 00:33:50 +01:00
Nick Winter
b580203a7d
Merge pull request #618 from fusspawn/master
...
Added Function.Prototype.bind shim to world worker
2014-03-19 16:18:25 -07:00
Fusspawn
b10b9fcb4e
Added Function.Prototype.bind shim to world worker to enable running on headless browsers
2014-03-19 23:12:35 +00:00
Glen De Cauwsemaecker
e2a7c15776
Merge conflicts resolved from Ruben's branch
2014-03-20 00:05:41 +01:00