Commit graph

4338 commits

Author SHA1 Message Date
Michael Schmatz
5c0c25ebd1 Async must not break upon sendwithus failure 2014-07-16 13:56:23 -07:00
Michael Schmatz
3c257a488d Employer candidates available email completed 2014-07-16 13:54:05 -07:00
Michael Schmatz
67f2eeb584 Progress on employer new candidates available email 2014-07-16 13:14:09 -07:00
Michael Schmatz
e218c2297d Some emails working 2014-07-16 12:13:21 -07:00
Michael Schmatz
3a405e22f3 Changed name of mail sent collection 2014-07-16 12:12:54 -07:00
Michael Schmatz
449f1e1afc Updated locking/release procedure 2014-07-16 12:12:44 -07:00
Michael Schmatz
3ef5d88e2a Updated sendwithus to fix memory leak 2014-07-16 12:12:25 -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
Nick Winter
87a24d3c48 Merge pull request #1336 from nemoyatpeace/patch-3
Minor adjustment to the aoe script
2014-07-16 09:58:26 -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
eb16c7985c Merge pull request #1334 from rubenvereecken/name_check_fix
Worked in scott's comments and got tests working again
2014-07-16 07:53:03 -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
Ruben Vereecken
6219697295 Worked in scott's comments and got tests working again 2014-07-16 12:48:51 +02: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
Nick Winter
c4921a6500 Merge pull request #1331 from jayant1992/master
Couple of fixes for the terrain generator
2014-07-15 16:41:12 -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
0d78281db2 Handling merge conflict. 2014-07-14 15:18:23 -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