dpen2000
|
10d0ef0606
|
Fix admin checkbox label for attribute so clicking on it toggles checkbox correctly
|
2014-05-19 23:28:53 +01:00 |
|
George Saines
|
7c0d73e779
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-05-19 15:19:59 -07:00 |
|
George Saines
|
07177e1a89
|
putting together the prizes page
|
2014-05-19 15:19:56 -07:00 |
|
Nick Winter
|
8a5a45950f
|
Simulator now pleads for you to help simulate when your match is being ranked.
|
2014-05-19 14:59:47 -07:00 |
|
Nick Winter
|
68a4483e91
|
Moved views/play/ladder_view to views/play/ladder/ladder_view and made a new views/play/ladder_home_view.
|
2014-05-19 11:58:53 -07:00 |
|
Scott Erickson
|
179702b0eb
|
Set up the goals view to be more hidden by default, and shows up on mouse hover.
|
2014-05-19 11:31:18 -07:00 |
|
Nick Winter
|
b89615cea4
|
Added helpful keyboard shortcuts modal.
|
2014-05-19 10:08:34 -07:00 |
|
Nick Winter
|
9df34875ee
|
Added tournament rules/prizes placeholders.
|
2014-05-17 20:43:05 -07:00 |
|
Nick Winter
|
3c9428ffd3
|
Refactored game ranking buttons into a LadderSubmissionView.
|
2014-05-17 11:55:51 -07:00 |
|
Michael Schmatz
|
934c853789
|
Live simulation count and fixed double simulator leaderboard session
|
2014-05-16 13:16:35 -07:00 |
|
Nick Winter
|
dbcafbb29b
|
Working on level-specific coding languages, with non-writable code in JavaScript.
|
2014-05-14 21:54:36 -07:00 |
|
Nick Winter
|
c420209a6b
|
Improved GoldView tooltip.
|
2014-05-14 16:06:00 -07:00 |
|
George Saines
|
75ab5d6435
|
making our recruitment % consistent
|
2014-05-14 14:55:04 -07:00 |
|
Nick Winter
|
53870a89a5
|
Python allowed, and better support for transpile errors.
|
2014-05-13 11:04:04 -07:00 |
|
Nick Winter
|
0b5854765a
|
Adding Clojure and Lua as choosable languages.
|
2014-05-11 22:51:44 -07:00 |
|
Scott Erickson
|
f1de2ca8d9
|
Brought the canvas size down again because it halves the FPS in Firefox at least.
|
2014-05-09 16:35:10 -07:00 |
|
Scott Erickson
|
e9fc3df7c1
|
Set up the versions modal to display changes between versions when you select two of them.
|
2014-05-08 10:54:39 -07:00 |
|
Scott Erickson
|
ed222338e7
|
Fixed #892 by having the components tab reload whenever it's opened.
|
2014-05-07 16:24:13 -07:00 |
|
Michael Schmatz
|
4221fd55cb
|
Fixed #979
|
2014-05-07 13:56:10 -07:00 |
|
Nick Winter
|
0e0ca785d9
|
Moved ready-to-rank logic to LevelSession where it can be shared across victory and multiplayer modals and My Matches tab.
|
2014-05-05 16:59:12 -07:00 |
|
Nick Winter
|
a04f74de8b
|
Implemented George's gold design.
|
2014-05-02 15:12:30 -07:00 |
|
Nick Winter
|
9d45b22057
|
Added some i18n tags.
|
2014-05-02 11:00:30 -07:00 |
|
Michael Schmatz
|
347292c985
|
Implemented save notes button
|
2014-05-01 17:36:49 -07:00 |
|
Michael Schmatz
|
9fb5826593
|
Scroll to candidate position while going back
|
2014-05-01 16:56:41 -07:00 |
|
Nick Winter
|
0f33bae1f1
|
Hid level done button better. Avoiding building wizard sprite when not needed.
|
2014-05-01 14:36:26 -07:00 |
|
Michael Schmatz
|
546bd26328
|
Fixed login flow and user profile issue
|
2014-04-29 15:12:50 -07:00 |
|
Scott Erickson
|
3a28f190a1
|
Merge branch 'master' into feature/loading-views
|
2014-04-28 11:55:17 -07:00 |
|
Nick Winter
|
4a2f2700bc
|
Don't show tutorial level link if tutorial level doesn't exist for a ladder level.
|
2014-04-28 10:54:03 -07:00 |
|
Scott Erickson
|
17a0bf54c6
|
Merge branch 'master' into feature/loading-views
|
2014-04-28 10:10:57 -07:00 |
|
Nick Winter
|
d245dfd34c
|
Merge pull request #915 from dpen2000/HideCreateComponentsSystems
Hide Create New System/Component links in menus from non-admins
|
2014-04-27 20:25:06 -07:00 |
|
Nick Winter
|
c1637fe37a
|
Fixed merge conflicts in es-419.coffee.
|
2014-04-27 20:19:05 -07:00 |
|
Nick Winter
|
e65202434b
|
Merge pull request #890 from treby/update_ja_resource
Update ja resource.
|
2014-04-27 20:12:14 -07:00 |
|
Nick Winter
|
dac4f05fd9
|
Improved legibility of gold font. Moved Done button to not conflict with gold display.
|
2014-04-27 14:19:39 -07:00 |
|
Scott Erickson
|
fed5d681f2
|
Merge branch 'master' into feature/loading-views
|
2014-04-26 12:54:37 -07:00 |
|
Nick Winter
|
834c27bbd7
|
Show spell palette for Thangs with apiProperties that aren't programmable.
|
2014-04-25 16:57:42 -07:00 |
|
Scott Erickson
|
6cd7c723d8
|
Fixed up showing errors, made sure they work with the play view.
|
2014-04-25 15:31:38 -07:00 |
|
Nick Winter
|
183fe9c496
|
Code review of 97d3b6.
|
2014-04-25 10:46:43 -07:00 |
|
Michael Schmatz
|
97d3b6107d
|
Merge feature/linkedin into master
|
2014-04-25 08:47:31 -07:00 |
|
Michael Schmatz
|
0dbcc861bf
|
Various tweaks to employer signup
|
2014-04-25 07:48:59 -07:00 |
|
Michael Schmatz
|
4f6f845c2d
|
Employer signup works
|
2014-04-24 17:36:07 -07:00 |
|
dpen2000
|
69b3fe4b8c
|
Hide Create New System/Create New Component links in menus from non-admins
|
2014-04-24 19:24:08 -04:00 |
|
Michael Schmatz
|
6644c6a9ee
|
Push for george
|
2014-04-24 15:27:37 -07:00 |
|
Nick Winter
|
8a42521cd0
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-24 14:31:54 -07:00 |
|
Nick Winter
|
2a2ddd068e
|
Separate isSelectable from inThangList. Mouse wheel all the way in/out. bountyGold shows up as gold. Moved say Labels to mouth offset from aboveHead offset and obey sprite rotation. Don't link projects to example.com.
|
2014-04-24 14:23:15 -07:00 |
|
Scott Erickson
|
2d43b36022
|
Merge branch 'FixGenericText' of https://github.com/dpen2000/codecombat into dpen2000-FixGenericText
|
2014-04-24 13:29:24 -07:00 |
|
Scott Erickson
|
e2c2657f34
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-24 13:23:40 -07:00 |
|
Scott Erickson
|
472f8899dd
|
Merge branch 'master' of https://github.com/tmrdja/codecombat into tmrdja-master
Conflicts:
app/views/editor/level/edit.coffee
|
2014-04-24 13:17:43 -07:00 |
|
Nick Winter
|
b9173a5ea5
|
Fixed #913, I think. (This was just built into marked.)
|
2014-04-24 12:24:22 -07:00 |
|
Nick Winter
|
73f39095e6
|
Upgraded table sorter.
|
2014-04-24 11:09:01 -07:00 |
|
tmrdja
|
14ebc957de
|
Changed responsive view for LevelEditor
|
2014-04-24 11:51:16 +02:00 |
|
Nick Winter
|
68f3eeb770
|
Two tiny profile improvements.
|
2014-04-23 11:26:20 -07:00 |
|
Michael Schmatz
|
628a784ac4
|
Progress towards LinkedIn integration
|
2014-04-23 11:25:36 -07:00 |
|
Nick Winter
|
d4cf31c8fe
|
Improved admin view of pending candidates.
|
2014-04-23 10:21:58 -07:00 |
|
Scott Erickson
|
c85971e5e6
|
Added i18n population action to the level editor.
|
2014-04-22 17:56:41 -07:00 |
|
dpen2000
|
dd00e2abe6
|
Replace generic text Sign Up to Create a New Content
|
2014-04-23 00:37:10 +01:00 |
|
treby
|
6937d656c7
|
Added translate contributor.
|
2014-04-22 08:55:00 +09:00 |
|
Scott Erickson
|
f57be1ae52
|
Migrated to the new email system, along with a setting for recruit notifications.
|
2014-04-21 16:15:23 -07:00 |
|
tmrdja
|
826a5f56db
|
Added responsive view for LevelEditor
|
2014-04-21 21:15:22 +02:00 |
|
Michael Schmatz
|
486d1b75ff
|
Changed moar to More
|
2014-04-21 10:40:22 -07:00 |
|
dpen2000
|
c241b06f76
|
Modify links on community page
|
2014-04-19 20:03:22 +01:00 |
|
George Saines
|
fced3e821a
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-18 13:02:11 -07:00 |
|
George Saines
|
71ee31ef49
|
styling the community page
|
2014-04-18 13:02:07 -07:00 |
|
Nick Winter
|
f38d17c64f
|
Protected candidates from view by employers they work(ed) at.
|
2014-04-18 12:48:13 -07:00 |
|
Nick Winter
|
848ebf2ffe
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-18 09:53:34 -07:00 |
|
Nick Winter
|
844c1391ca
|
Reworked top nav. Many improvements to job profile form.
|
2014-04-18 09:53:28 -07:00 |
|
Scott Erickson
|
cdaf2ebfaf
|
Set up the tabs and views in the level editor to reload so that when patches are applied, their changes are visible.
|
2014-04-17 14:23:33 -07:00 |
|
Scott Erickson
|
781a8ec913
|
Fixed the play and save buttons.
|
2014-04-17 13:37:08 -07:00 |
|
Scott Erickson
|
07afba01df
|
Merge branch 'master' into feature/jsondiffpatch
Conflicts:
app/views/editor/level/thangs_tab_view.coffee
|
2014-04-17 13:25:42 -07:00 |
|
Scott Erickson
|
b5406b0149
|
Set up the rest of the component/system buttons and nav bars.
|
2014-04-17 13:24:17 -07:00 |
|
Scott Erickson
|
9eff958dcb
|
Fixed the level and component watch buttons.
|
2014-04-17 11:35:09 -07:00 |
|
Nick Winter
|
46487f55a4
|
Fixed up some styles for job profile page, and prevented long links from destroying things with poor wrapping.
|
2014-04-17 11:34:55 -07:00 |
|
Scott Erickson
|
8f4535853b
|
Fixed the component history button.
|
2014-04-17 11:29:12 -07:00 |
|
Scott Erickson
|
6057bd94b9
|
Refactored how the editor sets up its special nav through base.jade.
|
2014-04-17 11:27:20 -07:00 |
|
Scott Erickson
|
4c1143f026
|
Tweaked the versions history modal.
|
2014-04-17 11:22:33 -07:00 |
|
Scott Erickson
|
8859405e18
|
Reworked the nav bars in the level editor.
|
2014-04-17 11:02:00 -07:00 |
|
Scott Erickson
|
02a7381fa9
|
Fixed the watch buttons for levels and components.
|
2014-04-16 11:02:40 -07:00 |
|
Scott Erickson
|
731726dcd3
|
Merge branch 'master' into feature/jsondiffpatch
|
2014-04-16 10:42:43 -07:00 |
|
Scott Erickson
|
f88e0ac0ab
|
Set up patches for components.
|
2014-04-16 10:42:32 -07:00 |
|
dpen2000
|
62e2de6cee
|
Split simulate tab into own view / template Leaving out "RESET AND SIMULATE GAMES" button for now
|
2014-04-16 17:07:25 +01:00 |
|
Scott Erickson
|
c395a3414e
|
Merge branch 'master' into feature/jsondiffpatch
|
2014-04-15 15:18:57 -07:00 |
|
dpen2000
|
a74f89c30c
|
Implement rank column in simulators leaderboard
|
2014-04-15 23:13:10 +01:00 |
|
Scott Erickson
|
58b1019934
|
Switched listen to watch (would have been confusing with eye-con, and listenTo function in Backbone). Added watch button and patch badge to level editor.
|
2014-04-15 15:09:36 -07:00 |
|
Nick Winter
|
f762d95ab8
|
ModelModal and simple leaderboard pagination.
|
2014-04-15 15:01:54 -07:00 |
|
Nick Winter
|
9194f842e6
|
Added some job description fields.
|
2014-04-15 09:28:19 -07:00 |
|
Nick Winter
|
03df078d5a
|
Couple job profile fixes.
|
2014-04-15 08:39:18 -07:00 |
|
Nick Winter
|
04014ef2d7
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-14 16:34:18 -07:00 |
|
Glen De Cauwsemaecker
|
a9806a6fa3
|
Added m website url to the about page
|
2014-04-15 03:12:54 +02:00 |
|
Nick Winter
|
954afad3f0
|
Fixed bug with job profile approval locale string tag.
|
2014-04-14 15:32:57 -07:00 |
|
Nick Winter
|
e908ae2fb4
|
Fixed #772.
|
2014-04-14 14:49:38 -07:00 |
|
Nick Winter
|
8aa36178af
|
Fixed #769. Added some analytics timing tracking. Added replacement for $.browser.
|
2014-04-13 20:31:23 -07:00 |
|
Nick Winter
|
af0b8aa5e2
|
A few fixes and cleanup for #831.
|
2014-04-13 15:28:16 -07:00 |
|
dpen2000
|
ec3c292b72
|
Implement simulators leaderboard
|
2014-04-13 02:35:58 +01:00 |
|
Nick Winter
|
08616def10
|
Refactored contribute views to share some templates and link to users' profile photos and GitHub accounts when available.
|
2014-04-12 14:53:09 -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 |
|
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 |
|
Scott Erickson
|
34bf484bf2
|
Added data merge conflict handling.
|
2014-04-11 21:11:52 -07:00 |
|
Nick Winter
|
91c2f0fa33
|
Fixed #715, and some misc cleanup.
|
2014-04-11 17:36:15 -07:00 |
|
Scott Erickson
|
bbb9fb7a64
|
Added a patches view.
|
2014-04-11 14:19:17 -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
|
ae65f07e7e
|
Added some i18n and improved employer page.
|
2014-04-11 12:49:44 -07:00 |
|
Nick Winter
|
ca13324e99
|
Resolved merge conflicts.
|
2014-04-11 11:32:51 -07: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
|
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 |
|
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 |
|
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 |
|
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
|
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
|
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 |
|
1c7
|
56c18441e4
|
use youku for Chinese Version
|
2014-04-09 13:50:13 +08: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 |
|
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 |
|
Alexei Nikitin
|
5f062ad25c
|
Work on revert, save modal
|
2014-04-08 01:38:46 +04:00 |
|
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 |
|
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 |
|
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
|
13f34341b2
|
Merge branch 'doubleScrollbars' of git://github.com/adi2412/codecombat
|
2014-04-06 14:55:14 -07:00 |
|
1c7
|
13cfba91a8
|
add myself into diplomat.jade
|
2014-04-06 11:56:25 +08: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 |
|
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 |
|
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 |
|
Michael Schmatz
|
9bb109dd7d
|
First iteration of mobile styling!
|
2014-04-03 15:10:24 -07:00 |
|
Michael Schmatz
|
75b278b333
|
Fixed table overflow, added wrapper for histogram
|
2014-04-03 09:57:35 -07: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 |
|
Aditya Raisinghani
|
44979c074d
|
Integrated nanoscroller.
|
2014-04-03 03:10:06 +05:30 |
|
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 |
|
Nick Winter
|
0bd8321345
|
Updated Mondo Bizarro i18n comma.
|
2014-03-31 16:02:56 -07:00 |
|
Nick Winter
|
8c013c1192
|
Fixed 101: added level completion status to /play.
|
2014-03-31 15:48:22 -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
|
1c6aea9c1c
|
Merge remote-tracking branch 'upstream/master'
|
2014-03-31 20:35:32 +02:00 |
|
Alexei Nikitin
|
aeddb64f90
|
Update base.jade
|
2014-03-31 11:09:44 -07:00 |
|
Nick Winter
|
cb27124285
|
Fixed #135.
|
2014-03-30 17:24:07 -07:00 |
|
tmrdja
|
470a79e6b0
|
Added contextmenu
|
2014-03-30 19:33:21 +02: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 |
|
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 |
|
Ting-Kuan
|
130d322d60
|
Move error_view's dom to template file.
|
2014-03-28 23:51:15 -04: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
|
fa6ef5aa49
|
added authors to quotations
|
2014-03-28 19:58:33 +01: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 |
|
Dominik Kundel
|
35a16b47ff
|
Merge remote-tracking branch 'upstream/master'
|
2014-03-28 14:37:14 +01:00 |
|
Darredevil
|
a91e067549
|
Added funny tip
|
2014-03-28 00:13:40 +02:00 |
|
Ting-Kuan
|
6012a3ce9e
|
Show error message when editor fails to initiate.
|
2014-03-27 14:35:20 -04: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 |
|
Glen De Cauwsemaecker
|
5825b2676b
|
Added myself to the signature.
|
2014-03-26 04:46:49 +01:00 |
|
Dominik Kundel
|
fe8a4901de
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
app/locale/de.coffee
bower.json
|
2014-03-25 17:07:36 +01: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 |
|
JasperDhaene
|
748081b4a7
|
Added myself to the diplomate list, fixed typos and made corrections to Dutch locale
|
2014-03-25 09:25:20 +01:00 |
|
Nick Winter
|
e6e216fcd3
|
Mergred Diplomats.
|
2014-03-24 14:20:40 -07: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 |
|
Mikhail Koltsov
|
baf8adcc74
|
added nothing
|
2014-03-22 20:50:50 +04: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 |
|
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 |
|
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 |
|
dpen2000
|
6363c40fe2
|
Update cla.jade
p -> a. Using html syntax to avoid linking full stop.
|
2014-03-21 21:59:31 +00: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 |
|
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 |
|
J Phani Mahesh
|
edc90c4598
|
Fix login popup being displayed under trailer. (#596)
|
2014-03-21 06:44:21 +05:30 |
|
Nick Winter
|
ca1e3742c0
|
Added simulation counts.
|
2014-03-20 15:40:02 -07: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 |
|
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 |
|
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
|
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
|
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 |
|
Glen De Cauwsemaecker
|
71a13a5670
|
Adding missing translations for the Dutch local file
|
2014-03-20 00:33:50 +01:00 |
|
Glen De Cauwsemaecker
|
e2a7c15776
|
Merge conflicts resolved from Ruben's branch
|
2014-03-20 00:05:41 +01:00 |
|
Glen De Cauwsemaecker
|
eab52f45e5
|
Applied proofread of Julian.
|
2014-03-19 02:21:45 +01:00 |
|
Glen De Cauwsemaecker
|
f7777ef501
|
Merge branch 'patch-2' of github.com:feugy/codecombat
|
2014-03-19 02:16:54 +01:00 |
|
Glen De Cauwsemaecker
|
5dc89529ca
|
Described myself.
|
2014-03-19 02:10:58 +01:00 |
|
Mikhail Koltsov
|
c9a08a0b25
|
thang editor: added i18n binding to 'Save' button
|
2014-03-19 01:43:27 +04:00 |
|
Jayant Jain
|
80f53d2c6b
|
Adds search bar for adding thangs in level editor
|
2014-03-19 00:41:03 +05:30 |
|
Ruben Vereecken
|
04465eb72c
|
Wrapped up locale files
|
2014-03-18 10:24:58 +01:00 |
|
Ruben Vereecken
|
e4fee7296c
|
Merged in old locale
|
2014-03-18 10:19:33 +01:00 |
|
Ruben Vereecken
|
b476e6b333
|
Ladder i18n refactoring
|
2014-03-18 10:18:38 +01:00 |
|
kvasnyk
|
5216432bf9
|
Fix for #272 bug.
|
2014-03-18 05:47:53 +01:00 |
|
Damien
|
65f148974c
|
Add to french diplomats list
|
2014-03-17 23:39:36 +01:00 |
|
Dominik Kundel
|
c55b608886
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
app/templates/play/level/modal/editor_config.jade
|
2014-03-17 19:39:38 +01:00 |
|
Nick Winter
|
794b1472f6
|
Merge pull request #587 from cassiocardoso/patch-1
Update diplomat.jade
|
2014-03-17 08:50:45 -07:00 |
|
yangxuan8282
|
4b2bcc283f
|
Update diplomat.jade
just make some change on Ch-HANS translate,and have pull request,so may I add myself to contributors?
|
2014-03-17 23:32:20 +08:00 |
|
Cassio Cardoso
|
2917255193
|
Update diplomat.jade
Add my username in brazilian portuguese diplomats list.
|
2014-03-17 11:51:55 -03:00 |
|
Aditya Raisinghani
|
b5bef94eb3
|
Fixed issue with video on multiplayer page modal
|
2014-03-17 19:52:03 +05:30 |
|
Randi Katrine Hillerøe
|
5cecbeea40
|
Update diplomat.jade
Added my name to the contributors list.
|
2014-03-17 13:59:48 +01:00 |
|
Nick Winter
|
6c2a78c060
|
Show videos in HD if possible. Use ready state on level loader.
|
2014-03-17 05:52:19 -07:00 |
|
Nick Winter
|
36a90de7f9
|
Last bits of #546.
|
2014-03-17 04:44:00 -07:00 |
|
Nick Winter
|
1397b63e50
|
Merged.
|
2014-03-17 04:37:54 -07:00 |
|
pouyio
|
f5e3e717f1
|
Update diplomat.jade
added a spanish translator
|
2014-03-17 12:33:35 +01:00 |
|
Nick Winter
|
287bf0398e
|
Embedded new video in multiplayer launch modal.
|
2014-03-17 03:18:13 -07:00 |
|
Scott Erickson
|
7555dce172
|
Tweaked the loading page progress bar.
|
2014-03-17 00:05:45 -07:00 |
|
Scott Erickson
|
729a016b1f
|
More tweaks to the video.
|
2014-03-16 22:57:16 -07:00 |
|
Scott Erickson
|
1fa18fe2e0
|
Added a border to the home view video.
|
2014-03-16 22:46:57 -07:00 |
|
Scott Erickson
|
5ddd2b9109
|
Added a few more tips.
|
2014-03-16 22:11:21 -07:00 |
|
Scott Erickson
|
dc4252a94d
|
Moved the tips into the level loader screen and gave them i18n.
|
2014-03-16 22:01:21 -07:00 |
|
Nick Winter
|
f02f4e77d0
|
Improved next game routing and speed. Hid that catastrophically dangerous reset all games button.
|
2014-03-16 21:33:46 -07:00 |
|
Nick Winter
|
f3a76da47c
|
Added i18n for multiplayer launch modal.
|
2014-03-16 20:50:49 -07:00 |
|
Nick Winter
|
ffb9ec2908
|
Merged.
|
2014-03-16 20:36:18 -07:00 |
|
Nick Winter
|
9a64fb5dac
|
Work on /multiplayer modal.
|
2014-03-16 20:32:24 -07:00 |
|
Scott Erickson
|
296a7584a6
|
Ladder page now shows the ladder for anonymous users, and prods them to sign up if they click a link or button that would have them play.
|
2014-03-16 20:28:02 -07:00 |
|
honam bang
|
41d26f5709
|
Refactoring ModalView Templates
|
2014-03-17 11:00:25 +09:00 |
|
Scott Erickson
|
957fdd22e6
|
Tweaked the rank button to be much larger in the my matches tab.
|
2014-03-16 18:48:56 -07:00 |
|
Scott Erickson
|
5cb42fa92c
|
Tweaked the video on the home page.
|
2014-03-16 18:10:39 -07:00 |
|
Scott Erickson
|
150077ab22
|
Removed the new button from the home view.
|
2014-03-16 17:48:16 -07:00 |
|
Scott Erickson
|
e430a6c2de
|
Added multiplayer launch view.
|
2014-03-16 17:33:57 -07:00 |
|
Nick Winter
|
b550708113
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-16 17:07:24 -07:00 |
|
Nick Winter
|
6db33fd967
|
Brawlwood protectAPI on!
|
2014-03-16 17:07:10 -07:00 |
|
Scott Erickson
|
209a1a3563
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-16 17:00:12 -07:00 |
|
Scott Erickson
|
eee8fbba2c
|
New level page with new artwork.
|
2014-03-16 16:59:48 -07:00 |
|
Nick Winter
|
1f1802dc38
|
A couple tweaks for #577.
|
2014-03-16 16:04:17 -07:00 |
|
Nick Winter
|
753952e519
|
Merge pull request #577 from IngridMorstrad/templates
Templates
|
2014-03-16 16:00:24 -07:00 |
|
IngridMorstrad
|
dadf0dab86
|
refactored docs and reload
|
2014-03-17 02:57:15 +05:30 |
|
Nick Winter
|
aa4f1baf73
|
Moved to 1848 x 1178 pixel canvases, since it's 2x the old size. Added a conversion factor to script camera zooms to account for scripts using the old numbers. Fixed bug where IndieSprites wouldn't update actions.
|
2014-03-16 13:23:01 -07:00 |
|
IngridMorstrad
|
57f24932fb
|
Removed redundant code for close button
|
2014-03-17 01:10:55 +05:30 |
|
IngridMorstrad
|
52115876bb
|
Refactored docs.jade to use the base template
|
2014-03-17 01:03:27 +05:30 |
|
honam bang
|
29a88ee128
|
Merge remote-tracking branch 'codecombat/master'
|
2014-03-17 02:20:44 +09:00 |
|
Nick Winter
|
125ffa9f43
|
Merged
|
2014-03-16 10:06:47 -07:00 |
|
honam bang
|
34be8917cb
|
Fixes #546
|
2014-03-17 01:41:19 +09:00 |
|
IngridMorstrad
|
8d9a8aaf73
|
Change victory.jade to use the base template
|
2014-03-16 21:16:00 +05:30 |
|
George Saines
|
417ff1e48d
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-15 15:12:09 -07:00 |
|
Dominik Kundel
|
46133ab85d
|
added select statement for programming language
|
2014-03-15 22:00:29 +01:00 |
|
Nick Winter
|
b2efb1bba5
|
More work on the loading view.
|
2014-03-14 19:44:19 -07:00 |
|
Nick Winter
|
efd0d82dea
|
Working on new loading view design.
|
2014-03-14 17:06:08 -07:00 |
|
George Saines
|
c00c7ed56b
|
adding the new website background images
|
2014-03-14 15:24:36 -07:00 |
|
Nick Winter
|
5c76ca71e3
|
Added configuring of behaviors to the editor config.
|
2014-03-14 10:14:48 -07:00 |
|
Nick Winter
|
c28d2bb576
|
Merge pull request #545 from dkundel/master
Implemented editor config to allow Vim & Emacs key bindings as proposed in #99
|
2014-03-14 07:35:11 -07:00 |
|
Dominik Kundel
|
190469d794
|
removed unnecessary comment
|
2014-03-14 03:28:20 +01:00 |
|
Dominik Kundel
|
0392f630cc
|
including i18n support for new editor config and minor styling changes
|
2014-03-14 03:26:53 +01:00 |
|
Nick Winter
|
6e9945040f
|
Truncated long score graphs; made my-matches score graphs independent of time; showed crude score y-axis for now.
|
2014-03-13 19:20:22 -07:00 |
|
Nick Winter
|
795bd8f63b
|
Moved Glen from Archmages to About.
|
2014-03-13 18:27:08 -07:00 |
|
Dominik Kundel
|
6f2a04c5c0
|
added new editor config modal
|
2014-03-14 00:54:06 +01:00 |
|
Dominik Kundel
|
f618338d32
|
added button to access new modal for editor config
|
2014-03-14 00:53:29 +01:00 |
|
Nick Winter
|
2b41efe466
|
Resolved some merge conflicts.
|
2014-03-13 10:32:18 -07:00 |
|
TigroTigro
|
206af3184d
|
Update diplomat.jade
|
2014-03-13 18:01:52 +01:00 |
|
Nick Winter
|
c8103154a9
|
Using the new i18n utility function everywhere. Fixed big bug with spell palette i18n.
|
2014-03-13 09:02:19 -07:00 |
|
Nick Winter
|
4ad0fba860
|
Merge pull request #537 from jayant1992/master
UI and UX improvements to editor
|
2014-03-13 07:07:13 -07:00 |
|
Nick Winter
|
0be08574fc
|
Merge pull request #536 from bkimminich/master
Added/fixed some German translations
|
2014-03-13 07:05:17 -07:00 |
|
Nick Winter
|
10e4bc737a
|
Merge pull request #534 from Shrihari/fix-grid-toggle
Fix Grid Toggle consistency
|
2014-03-13 06:50:56 -07:00 |
|
Björn Kimminich
|
87ddd10dd4
|
Update diplomat.jade
|
2014-03-13 14:19:59 +01:00 |
|
Shrihari
|
fb7f64ddb0
|
Grid toggle consistent with the button and the shortcut
|
2014-03-13 15:21:00 +05:30 |
|
Jayant Jain
|
c24469e86b
|
Minor UI updates to level editor's thang tab
|
2014-03-13 12:19:51 +05:30 |
|
Nick Winter
|
28d56f526e
|
Okay, protectAPI should really work for Dungeon Arena now with the latest Aether change. Added a couple i18n spaces.
|
2014-03-12 20:59:19 -07:00 |
|
Michael Schmatz
|
aea9e9d1a6
|
Spectate view is nearing completion
|
2014-03-12 17:51:13 -07:00 |
|
Nick Winter
|
7e16821743
|
Updates for /play levels list.
|
2014-03-12 16:41:09 -07:00 |
|
Nick Winter
|
ac8f12ef20
|
I don't think we need this template any more.
|
2014-03-12 16:03:32 -07:00 |
|
Ruben Vereecken
|
b845961218
|
Clean up
|
2014-03-12 21:25:14 +01:00 |
|
Ruben Vereecken
|
f4637251be
|
Added i18n to play modal
|
2014-03-12 21:23:25 +01:00 |
|
Ruben Vereecken
|
ca271fedd6
|
Added i18n to my matches tab
|
2014-03-12 21:13:01 +01:00 |
|
Ruben Vereecken
|
9f5c0f03be
|
Added i18n to ladder_tab
|
2014-03-12 20:51:38 +01:00 |
|
Ruben Vereecken
|
c2e81db200
|
Added i18n to ladder.jade
|
2014-03-12 20:46:25 +01:00 |
|
Nick Winter
|
da762fbc4f
|
Merge branch 'rubenvereecken-versions_modal'
|
2014-03-12 08:30:02 -07:00 |
|
Nick Winter
|
0125c46dc2
|
Resolved merge conflict.
|
2014-03-12 08:29:42 -07:00 |
|
Ruben Vereecken
|
27fd580324
|
Got rid of CRLF line endings
|
2014-03-12 16:03:36 +01:00 |
|
Ruben Vereecken
|
8acf35b290
|
Added i18n for components
|
2014-03-12 15:42:57 +01:00 |
|
Ruben Vereecken
|
ddae5d0763
|
Added Version History to Level Components
|
2014-03-12 15:32:55 +01:00 |
|
Michael Schmatz
|
a6fb2a3994
|
Various changes to spectate view
|
2014-03-12 07:32:30 -07:00 |
|
Ruben Vereecken
|
2a86daaa2a
|
Added Version History to Thang Types
|
2014-03-12 15:22:15 +01:00 |
|
Nick Winter
|
8c57b31c54
|
Fixed a couple bugs with the matches tab.
|
2014-03-11 18:06:48 -07:00 |
|
Nick Winter
|
392534878a
|
Keeping old matches, up to 200, and showing them as stale. Added LevelSession.isRanking for better display of when you're still in the initial ranking phase.
|
2014-03-11 16:31:39 -07:00 |
|
Nick Winter
|
bba3c78107
|
Ties are not victories in the emails.
|
2014-03-11 13:20:52 -07:00 |
|
Michael Schmatz
|
4062bba245
|
Created initial spectate level view
|
2014-03-11 13:12:45 -07:00 |
|
Ruben Vereecken
|
8709cdc472
|
Finished Article History
|
2014-03-11 19:33:27 +01:00 |
|
Nick Winter
|
d012e0d7a9
|
Merge pull request #508 from Rahazan/patch-2
Update Dutch Translations
|
2014-03-11 09:46:18 -07:00 |
|
Nick Winter
|
eac219a2be
|
Inserted score history graph into ladder update emails.
|
2014-03-10 22:03:33 -07:00 |
|
Nick Winter
|
32baf2ae79
|
Improved my-matches rank history and name fetching, ladder update emails, ladder update unsubscribes.
|
2014-03-10 21:30:46 -07:00 |
|
Nick Winter
|
6ce65488aa
|
Added simple rank history graph. Improving ladder update mail.
|
2014-03-10 20:22:25 -07:00 |
|
Ruben Vereecken
|
af73e5a594
|
Added a versions modal for every type
|
2014-03-10 23:29:34 +01:00 |
|
Ruben Vereecken
|
8e989ec08f
|
Got the level history view set up as before, but better
|
2014-03-10 23:17:19 +01:00 |
|
Nick Winter
|
77f7276759
|
Merge branch 'versions_modal' of git://github.com/rubenvereecken/codecombat into rubenvereecken-versions_modal
|
2014-03-10 11:29:47 -07:00 |
|
Ruben Vereecken
|
29901787f7
|
Added i18n for Version History
|
2014-03-10 19:11:37 +01:00 |
|