Nick Winter
2ff97c3bcd
I guess emails might not be there.
2014-04-25 10:55:37 -07:00
Nick Winter
183fe9c496
Code review of 97d3b6.
2014-04-25 10:46:43 -07:00
Michael Schmatz
abe07e6395
Potential popup blocker fix
2014-04-25 09:17:04 -07:00
Michael Schmatz
97d3b6107d
Merge feature/linkedin into master
2014-04-25 08:47:31 -07:00
Michael Schmatz
61458c97d6
Fixed jqxhr error display
2014-04-25 07:50:29 -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
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
b7cb4696f0
Merge branch 'RefactorCocoCollection' of https://github.com/edtrist/codecombat into edtrist-RefactorCocoCollection
2014-04-24 13:31:29 -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
Scott Erickson
0a313a110c
Removed a piece of logging.
2014-04-24 12:07:11 -07:00
Scott Erickson
8ab50205aa
Fixed more buttons in treema.
2014-04-24 11:50:49 -07:00
Scott Erickson
1eb2adbc61
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-24 11:22:50 -07:00
Scott Erickson
76f36294b0
Fixed #908 , while keeping things like opening revert or contact modals in the level editor from breaking.
2014-04-24 11:22:43 -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
Michael Schmatz
c408196814
Fix for runtime errors
2014-04-23 16:44:31 -07:00
Nick Winter
86aa4cd0fe
Updated janky include_flow skip levels.
2014-04-23 16:11:47 -07:00
Darredevil
47eef39bc7
Added Gold Rush level
2014-04-24 02:07:59 +03: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
Scott Erickson
c85971e5e6
Added i18n population action to the level editor.
2014-04-22 17:56:41 -07:00
Scott Erickson
9c8841e838
Merge remote-tracking branch 'origin/master'
2014-04-22 16:42:50 -07:00
Scott Erickson
5921575a02
Hack to fix a bug with the components view in the thang editor.
2014-04-22 16:42:41 -07:00
dpen2000
dd00e2abe6
Replace generic text Sign Up to Create a New Content
2014-04-23 00:37:10 +01:00
edtrist
3962d37681
#889 - moved CocoCollection.coffee to app/collections and updated references
2014-04-22 20:42:26 +01:00
Michael Schmatz
7419b269f1
Merge pull request #894 from codecombat/feature/worker-lint
...
Background linting/transpilation/hasChangedSignificantly
2014-04-22 12:05:03 -07:00
Michael Schmatz
6122d31e28
Removed web worker logging listener
2014-04-22 12:03:33 -07:00
Michael Schmatz
3110e6e56a
Renamed test_worker to aether_worker
2014-04-22 11:58:27 -07:00
Michael Schmatz
392dbb9f8d
Removed superfluous comment
2014-04-22 11:51:51 -07:00
Michael Schmatz
3bbedbc100
Added background transpile
2014-04-22 11:46:17 -07:00
Nick Winter
ab77176ed0
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-22 11:11:10 -07:00
Nick Winter
675db1b76f
Don't require CocoModel instantiation before schemas are included. Reload neutral spells on reload. Fix for adding Components to Thangs. Surface background: darkness, no parents.
2014-04-22 11:11:08 -07:00
Michael Schmatz
e0f8d1343e
Fixed race condition
2014-04-22 11:04:56 -07:00
Scott Erickson
bb0cbf1151
Removed some old code that didn't work out.
2014-04-22 10:43:08 -07:00
Michael Schmatz
81809956b8
hasChangedSignificantly async refactor
...
Still checking for bugs
2014-04-22 08:54:35 -07: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
Michael Schmatz
0f435b41ae
Merge pull request #885 from codecombat/master
...
Merge master into worker-lint
2014-04-21 14:13:43 -07:00
Scott Erickson
1e50ef36ce
Merge branch 'RefactorAndDeltaSystemNaming' of https://github.com/dpen2000/codecombat into dpen2000-RefactorAndDeltaSystemNaming
2014-04-21 12:53:11 -07:00
tmrdja
826a5f56db
Added responsive view for LevelEditor
2014-04-21 21:15:22 +02:00
dpen2000
de69f740e4
Fix deltas referring to last system saved
...
If a system is added, it is added to treema at the end of the list of systems. Treema then raises it's changed event resulting in this order being set on the level. The next time a system is added, the first system is in it's correct position and so the delta shows it as moving. This changes ensures we save the correct order in the first instance.
2014-04-19 19:59:21 -04:00
Scott Erickson
044556e5a4
Fixed a bug with the level editor that prevented selecting thangs to add.
2014-04-19 10:27:14 -07:00
Michael Schmatz
a7867e5e2d
Added background linting
...
Background hasChangedSignificantly is soon!
2014-04-18 14:59:08 -07:00
dpen2000
b20f8fd260
Refactor getNameById to use mongo db's $in instead of parallel and use a new generic method in Handler.coffee
2014-04-18 21:06:57 +01:00
George Saines
71ee31ef49
styling the community page
2014-04-18 13:02:07 -07:00
