Scott Erickson ab704a1cab Merge remote-tracking branch 'origin/web-dev-levels' into game-dev-levels ... # Conflicts: # app/views/play/level/PlayLevelView.coffee		2016-07-15 16:01:57 -07:00
..
achievement	Merge pull request #3471 from delftswa2016/loggedIn-achievement-error	2016-03-30 09:41:01 -07:00
article	Merge master branch	2016-02-24 19:40:21 +00:00
campaign	Cleaner jQuery selection	2016-06-22 15:36:42 -07:00
component	First pass at adding 'web-dev' level type	2016-07-14 09:38:45 -07:00
docs	Refactored a bunch of editor stuff to be included in the wads. Fixed a bug with the I18NEditModelView.	2014-11-29 13:36:48 -08:00
level	Merge remote-tracking branch 'origin/web-dev-levels' into game-dev-levels	2016-07-15 16:01:57 -07:00
modal	Fix #1199	2016-07-07 16:34:24 -07:00
poll	Refactor ConfirmModal for #3138 and #3488	2016-03-18 11:03:55 -07:00
thang	Remove name from loadModel	2016-02-18 16:44:40 +00:00
verifier	Merge branch 'master' into game-dev-levels	2016-07-14 15:50:04 -07:00
DeltaView.coffee	Remove name from loadModel	2016-02-18 16:44:40 +00:00
ForkModal.coffee	Update ForkModal.coffee. Unset i18nCoverage on Fork	2015-03-24 02:39:03 +03:00
PatchesView.coffee	Refactor ArticleEditView and PatchesView to use model endpoint functions	2016-02-22 16:03:21 -08:00
PatchModal.coffee	Remove name from loadModel	2016-02-18 16:44:40 +00:00