Commit graph

57 commits

Author SHA1 Message Date
Scott Erickson
ba238137c3 Went back to pointing to the latest version of treema cause there are still changes to quickly grab. 2014-08-29 12:29:11 -07:00
Scott Erickson
0236ca6fa9 Apparently comments in json don't fly. 2014-08-29 09:17:06 -07:00
Scott Erickson
8b7f3c8cbe Set treema back to an actual version. 2014-08-29 09:16:17 -07:00
Scott Erickson
94065a0c4c Merged conflicts. 2014-08-28 09:59:07 -07:00
Scott Erickson
8b943d1c2c Merged conflicts. 2014-08-28 09:59:03 -07:00
Nick Winter
ee9e453896 Fixed #828. Added many other minor refactorings. 2014-08-27 12:24:11 -07:00
Scott Erickson
1c5db3f2b7 First round of getting the site to use the new defaults system, in particular the job profile view. 2014-08-23 11:07:52 -07:00
Scott Erickson
fe2faefa5d Pulling in a couple treema fixes. 2014-08-22 14:52:42 -07:00
Scott Erickson
e200889f0b Initial refactoring to use the new version of Treema. 2014-08-22 11:11:05 -07:00
Dominik Kundel
c52503f682 bump up zatanna version 2014-08-15 23:49:19 +02:00
Dominik Kundel
45e4079c2b bumbed up zatanna to fix autocomplete issues 2014-08-15 01:55:11 +02:00
Nick Winter
648e05ee34 Fixed #1124 in Aether 0.2.28. 2014-08-13 16:39:16 -07:00
Scott Erickson
10d2a4bf8d Updated treema. 2014-08-13 14:40:01 -07:00
Scott Erickson
6cac2371c1 Refactored and improved the ThangComponentsEditView and ThangComponentConfigView. Still some things to do. 2014-08-10 13:03:53 -07:00
Dominik Kundel
5477a5b84a fixed broken build from #1380 2014-07-23 17:52:15 +02:00
Dominik Kundel
a377e6c05d updated zatanna version 2014-07-22 21:20:59 +02:00
Nick Winter
0ed8d2b371 Merged in the full-screen editor, and fixed a spell palette multi-language bug while at it. 2014-07-09 13:41:42 -07:00
Nick Winter
318b72d965 Fixed #1273 with new Aeher version with new Filbert version. 2014-07-07 20:01:05 -07:00
Scott Erickson
0a139fdbb3 Treema version bump. 2014-07-04 18:27:41 -07:00
Dominik Kundel
004a14ae3c fixed autocomplete issue related to switching the programming language 2014-07-02 20:52:16 +02:00
Dominik Kundel
083a9f6d02 added zatanna to bower 2014-06-18 18:20:34 +02:00
Dominik Kundel
603766b8c5 preliminary autocomplete. THIS IS NOT A WORKING STATUS. ONLY COMMIT TO PULL CHANGES 2014-06-13 16:12:55 +01:00
Nick Winter
3dd362c01e Added support for blaming infinite loops. 2014-05-25 12:15:32 -07:00
Nick Winter
35fc5a5197 Fixed infinite loop detection, I hope. 2014-05-23 21:24:50 -07:00
Nick Winter
26d2816071 Fixed some more memory leaks. 2014-05-22 19:05:11 -07:00
Nick Winter
3819778bee Updating everything to Aether 0.2.0. 2014-05-08 11:43:00 -07:00
Nick Winter
8fbe2dedfc Propagated Wu name update. 2014-05-03 07:21:18 -07:00
Nick Winter
f92fd122c6 Integrating Wu as zh-WUU-HANS and zh-WUU-HANT; hacking on a fork of i18next to do so. 2014-05-02 09:46:00 -07:00
Nick Winter
8aa36178af Fixed #769. Added some analytics timing tracking. Added replacement for $.browser. 2014-04-13 20:31:23 -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
ce84437345 Updated treema version. 2014-04-11 13:49:02 -07:00
Scott Erickson
d4abbd8ab3 Merge branch 'mediator' of https://github.com/rubenvereecken/codecombat into rubenvereecken-mediator
Conflicts:
	bower.json
2014-04-11 12:44:54 -07:00
Scott Erickson
d11b6a5751 Merge branch 'mediator' of https://github.com/rubenvereecken/codecombat into rubenvereecken-mediator
Conflicts:
	bower.json
2014-04-11 12:44:29 -07:00
Ruben Vereecken
ba417630dc Validated Backbone Mediator is now a fully functioning bower component 2014-04-11 20:05:48 +02:00
Scott Erickson
2c67df355c Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch
Conflicts:
	app/initialize.coffee
	bower.json
2014-04-11 10:33:22 -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
26266963f4 Updated to jQuery 2.1. 2014-04-11 10:12:39 -07:00
Scott Erickson
f2d21b960f Added a delta subview for displaying deltas of schema'd data. 2014-04-09 16:09:35 -07:00
Scott Erickson
721648dadf Merge branch 'master' into feature/jsondiffpatch
Conflicts:
	bower.json
2014-04-08 19:29:43 -07:00
Scott Erickson
315ef7f7b8 Added jsondiffpatch to the client. Bower update everyone! 2014-04-08 19:26:34 -07:00
Aditya Raisinghani
7cc9d22254 Moved nanoscroller to bower components and related fixes. 2014-04-08 03:04:36 +05:30
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
Michael Schmatz
3aa31c7246 Graphs with D3! 2014-04-02 18:41:11 -07:00
Nick Winter
b5f69687cf Fixed #488. 2014-04-01 10:23:39 -07:00
Dominik Kundel
62b6387090 updated aether dependency to support coffeescript 2014-03-31 20:53:28 +02:00
Nick Winter
2f3c0b0cc6 Need updated Aether. 2014-03-20 10:43:24 -07:00
Nick Winter
8b572f0647 Using isThang instead of instanceof Thang. 2014-03-13 17:59:17 -07:00
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
Nick Winter
6f0ed9040a Fixes for dirt path, fast portraits, and slow transpilation. Starting to move Aether stuff into a Tome worker with Catiline. 2014-02-17 17:38:49 -08:00