Commit graph

3826 commits

Author SHA1 Message Date
barbuddha
d361ab5809 Update ru.coffee 2014-06-11 09:56:15 +04:00
Scott Erickson
389d530eaa Built a new 'patch' method for CocoModel, which saves only changed values to the server. 2014-06-10 20:59:37 -07:00
Nick Winter
0527ca7229 Merge branch 'master' into production 2014-06-10 16:51:46 -07:00
Nick Winter
69fc378930 Final tournament update blurb. 2014-06-10 16:51:36 -07:00
Nick Winter
f3d18efa90 Added employer_list and activity tracking. 2014-06-10 16:30:13 -07:00
Scott Erickson
9c1213d3c4 Removed the migration plugins. 2014-06-10 15:04:48 -07:00
Michael Schmatz
6d7864c415 Removed some superfluous code 2014-06-10 14:34:16 -07:00
Scott Erickson
b414886878 Merge branch 'master' into production 2014-06-10 13:21:19 -07:00
Scott Erickson
f0ff8c242e Migrating language to codeLanguage on systems and components because they conflict with the search system. 2014-06-10 13:20:14 -07:00
Corey Prak
8448061f7b Added more names for #53 2014-06-10 12:52:06 -04:00
Nick Winter
86223167af Re-added significant trailing whitespace. 2014-06-10 07:46:43 -07:00
Lucas Castro
132a7b62f1 Update pt-BR.coffee 2014-06-10 11:04:02 -03:00
Nick Winter
482558bfe0 Merge branch 'master' into production 2014-06-09 22:18:26 -07:00
Nick Winter
22ca9507d0 Upgrades to employer's candidate indexing. 2014-06-09 22:17:53 -07:00
Nick Winter
6703f7a1fc Merge branch 'master' into production 2014-06-09 21:12:12 -07:00
Nick Winter
dd2c7fab60 Updated Danger Minefield icon. 2014-06-09 21:11:59 -07:00
Nick Winter
481666d65f Merge pull request #1139 from Darredevil/patch-8
Added new level
2014-06-09 21:02:07 -07:00
Scott Erickson
7211a82d2c Attempting to get TravisCI set up to run server tests by having it install mongodb. 2014-06-09 17:04:51 -07:00
Scott Erickson
3a8b01b058 Attempting to get TravisCI set up to run server tests. 2014-06-09 15:07:39 -07:00
Darredevil
82f33a35de Fixed id 2014-06-09 22:37:34 +03:00
Darredevil
da1d0e5361 Added new level
Added a new prime-sieve level
2014-06-09 22:29:02 +03:00
Nick Winter
991721eb90 Merge branch 'master' into production 2014-06-08 23:37:12 -06:00
Michael Schmatz
693da57f13 Merge branch 'feature/linkedin-profile-import'
Conflicts:
	app/templates/account/profile.jade
	app/views/account/profile_view.coffee
2014-06-08 18:37:33 -07:00
Michael Schmatz
ad80fcf229 Removed linkedIn callback, disabled autosave 2014-06-08 18:21:56 -07:00
Michael Schmatz
f29a41f108 Add linkedIn link, field of study support to LinkedIn import 2014-06-08 18:15:18 -07:00
Nick Winter
bb5d23e6ba Wrapped LinkedIn button in a .btn. 2014-06-08 18:51:45 -06:00
Michael Schmatz
7ec3910e36 Make LinkedIn import more robust 2014-06-08 17:38:02 -07:00
Nick Winter
dde45262b0 Merge branch 'master' into production 2014-06-08 11:52:32 -06:00
Nick Winter
6597b687eb Only start profiles in edit mode if they are yours. 2014-06-08 11:52:16 -06:00
Nick Winter
89888b0502 Merge pull request #1135 from kumabotz/fix-indentation-and-typo
Fix indentation and typo
2014-06-08 11:16:01 -06:00
Tery Lim
cb8a2b36c6 Fix typo (missing e) 2014-06-09 00:35:59 +08:00
Tery Lim
4036532680 Fix indentation 2014-06-09 00:35:35 +08:00
Nick Winter
21a6dbdcaa Merge branch 'master' into production 2014-06-07 22:19:54 -06:00
Scott Erickson
1b166028c6 Turned off Backbone.Mediator validation for tests. 2014-06-07 19:08:38 -07:00
Nick Winter
cefeb1df14 Fixed backwards Approved button and candidate time sort. 2014-06-07 19:58:33 -06:00
Scott Erickson
3aaf02446d Another stab at fixing TravisCI, which tried to run karma through /node_modules/.bin and failed. 2014-06-07 18:36:56 -07:00
Scott Erickson
ac488eb196 A stab at fixing TravisCI, which choked on npm installing karma 0.10. 2014-06-07 18:27:04 -07:00
Scott Erickson
01c20f4065 Fixed karma tests. 2014-06-07 18:15:57 -07:00
Scott Erickson
5104f0a1e7 Fixed source maps for when test files error out. See https://github.com/brunch/brunch/issues/842 2014-06-07 16:41:19 -07:00
Scott Erickson
2cbc33d66d Fixed jasmine-ajax setup/reset. 2014-06-07 16:41:19 -07:00
Nick Winter
63a3aa9074 Fixes for browsing profiles by username. 2014-06-07 17:33:14 -06:00
Michael Schmatz
4072c1b969 Basic functionality done, needs validation error handling
As well as formatting
2014-06-07 11:45:49 -07:00
Nick Winter
1df653eb8d Merge branch 'master' into production 2014-06-07 00:33:50 -06:00
Nick Winter
67b10474e8 Suggested improvements to profile pages. 2014-06-07 00:33:18 -06:00
Scott Erickson
f0cdf6b2e2 Fixed #1111. 2014-06-06 16:47:48 -07:00
Nick Winter
d00c4c2af3 Propagate i18n. Merged in good stuff from 6b675f from kinez for hu.coffee. 2014-06-06 15:39:03 -06:00
Michael Schmatz
0c0084dd4b Make single game simulate another task if error 2014-06-06 13:26:15 -07:00
Michael Schmatz
31bb9c8807 Fixed error handling for results with no taskID 2014-06-06 12:47:10 -07:00
Michael Schmatz
1486f31c37 Stop headless simulator from exiting if error 2014-06-06 12:26:28 -07:00
Michael Schmatz
24452026d1 Minor fix for simulator logic 2014-06-06 12:18:02 -07:00