Commit graph

452 commits

Author SHA1 Message Date
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
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
Nick Winter
e9416ee128 Added some autocompleters for job profile Treema. Projects are now entirely links. 2014-04-10 11:58:51 -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
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