Commit Graph
576 Commits
Author SHA1 Message Date
Andrew Miner 7a05862be2 Update API server URL for staging 2015-05-11 15:06:30 -07:00
Andrew Miner e2f8d83c6b Update GitHub client ID for staging 2015-05-11 15:04:31 -07:00
Andrew Miner 64274810d7 Fix programmer error in login flow 2015-05-11 12:08:59 -07:00
Andrew Miner 8c54231d52 Fix routing so both plain and .html routes work 2015-05-11 11:23:16 -07:00
Andrew Miner bab091e9d6 Fix error in new routing expression 2015-05-11 10:55:20 -07:00
Andrew Miner f40f6c8d71 Update routes to recognize index.html URLs 2015-05-11 10:45:56 -07:00
Andrew Miner 9e318df625 Update sitemap to include login page 2015-05-11 09:48:07 -07:00
Andrew Miner afcbcb3421 Merge branch 'andrewminer-item-edit' 2015-05-11 09:43:25 -07:00
Andrew Miner 06d2fa7ee7 Add missing requires for feedback classes 2015-05-11 09:38:18 -07:00
Andrew Miner c36deb17b5 Fix FeedbackController not responding to clicks 2015-05-11 09:21:27 -07:00
Andrew Miner 23e98f5d31 Allow new item description files to be created 2015-05-11 09:20:42 -07:00
Andrew Miner 8eb5cef71b Allow submitting changes for item desc. to GitHub 2015-05-08 16:16:17 -07:00
Andrew Miner 1254183c2c Update watch tasks to allow watch to run tests 2015-05-08 16:14:53 -07:00
Andrew Miner 8b94f432b0 Update MarkdownSectionController with support for editing
This allows the MarkdownSectionController and ItemPageController to
work together to begin an editing session for an item description.
2015-05-07 11:19:36 -07:00
Andrew Miner 54194d3f0a WIP 2015-05-05 14:01:39 -07:00
Andrew Miner b2320752f8 Tweaks style of markdown tables to auto-resize 2015-05-03 21:16:24 -07:00
Andrew Miner 8334012ea5 Switch to using "marked" as a markdown parser 2015-05-02 17:41:13 -07:00
Andrew Miner 76d517cc4f Complete design for item description editing 2015-05-02 17:35:59 -07:00
Andrew Miner fb1755785f Update sitemap for MineFactory Reloaded 2015-04-30 17:07:48 -07:00
Andrew Miner 2fc52efe8b Enable MineFactory Reloaded 2015-04-30 17:03:11 -07:00
Andrew Miner 210c333b1c 1.0.5 2015-04-30 09:11:10 -07:00
Andrew Miner bfe1ba6387 Change extension when converting Coffee files 2015-04-30 09:10:48 -07:00
Andrew Miner 82cb4be7f3 1.0.4 2015-04-30 09:03:36 -07:00
Andrew Miner 2d551f9170 Fix NPM packaging to actually include source code 2015-04-30 09:02:58 -07:00
Andrew Miner 27f872723f 1.0.3 2015-04-30 09:00:46 -07:00
Andrew Miner 7869c8012d Hide login button until required 2015-04-30 08:53:10 -07:00
Andrew Miner dda1c8e10d Update CircleCI to include newer version of Sass 2015-04-29 20:33:02 -07:00
Andrew Miner 8df5f49307 Also use coffee translation for prod version (doh) 2015-04-29 20:26:17 -07:00
Andrew Miner 8a14227194 Update build & deploy settings for CircleCI 2015-04-29 20:14:56 -07:00
Andrew Miner 930b8049a2 Convert site to a single JavaScript archive
* Convert build to use a single JavaScript file on the site (instead
  of downloading each library separately). This also means that all
  global variables (e.g., `$` for JQuery, `_` for Underscore.js) can
  be removed.
* Remove unused scripts and/or move them to a more appropriate repo
* Update the `deploy` script to work with CircleCI's automation
* Update markdown display code to allow images to be located with the
  markdown data files instead of the pre-rendered index pages
2015-04-29 19:58:53 -07:00
Andrew Miner 414017f689 1.0.2 2015-04-27 13:37:33 -07:00
Andrew Miner af7099c69c Fix test failures for moved data 2015-04-27 13:37:13 -07:00
Andrew Miner 3943cfe2cd 1.0.1 2015-04-27 13:32:13 -07:00
Andrew Miner 624c878321 Ignore npm-debug.log 2015-04-27 13:31:56 -07:00
Andrew Miner 2d4f60abc2 Move mod content into a separate module 2015-04-27 13:30:38 -07:00
Andrew Miner 36456ba2ab Move pre-rendered HTML to its own repository 2015-04-24 14:13:58 -07:00
Andrew Miner bca3e1242f Update pre-rendered pages 2015-04-24 12:16:32 -07:00
Andrew Miner de28784c7b Update prerendered pages for Adsense changes 2015-04-22 16:41:35 -07:00
Andrew Miner 4ca72fe512 Update AdsenseController to show ads to fit space 2015-04-22 16:28:27 -07:00
Andrew Miner a4120fad2f Fixes to various recipes and pre-rendered pages 2015-04-22 13:57:31 -07:00
Andrew Miner 37c9fe7502 Fix several small bugs
* Fix AddThis component not showing up by altering the URL they
  provide to use GET parameters instead of the hash component
* Fix a bug with saving the "have" items on the crafting page
2015-04-20 22:02:01 -07:00
Andrew Miner 9267cb2fa7 Add "What's New?" message about new crafting page 2015-04-20 11:59:18 -07:00
Andrew Miner cc67fce5a2 Add "nothing" placeholder for empty inventories 2015-04-20 11:26:21 -07:00
Andrew Miner 01a137cdc6 Replace use of InventoryTableController
The `InventoryTableController` had been split off from the existing
`InventoryController` some time ago, but was never properly factored
not to share common code. This change elimiates it altogether in
favor of the newly re-vamped `InventoryController` which is now
flexible enough to be used in both places.
2015-04-20 11:10:42 -07:00
Andrew Miner 87a6664728 Correct recipe for Golden Fluid Pipe 2015-04-20 10:31:31 -07:00
Andrew Miner 6e28f90621 Update prerender for index.html 2015-04-20 10:23:57 -07:00
Andrew Miner 1be16b84fb Update prerendered pages for new search bar 2015-04-20 10:08:00 -07:00
Andrew Miner 0c62c97c9e Fix bug in inventory unparsing
When unparsing an inventory which contains an item whose unqualified
slug appears in multiple mods (e.g., "steel_ingot" appears in both
Railcraft and Mekanism), the `unparse` method would choose the wrong
fully-qualified slug to use in the resulting string.
2015-04-20 09:53:42 -07:00
Andrew Miner 5b014c9921 Redesign the crafting page
This introduces the new crafting page design featuring a new vertical
layout and list display of all crafting steps. It also makes it easy
to move items between the have/need sections and even from each step
into your inventory (causing a new crafting plan to be created which
doesn't plan on making that item).

* Convert the `BaseController.hide` and `show` methods to be much
  more robust in the use of CSS transitions (using a timer in case a
  transition doesn't actually fire).
* Change `hide`/`show` to use events for communicating animation
  state instead of callbacks
* Convert several controllers to fire events for communication with
  parent controllers instead of accepting functions.
* Rewrite the `CraftPageController`, `CraftPage` model and related
  Jade/SCSS files to implement the new design.
* Alter the `InventoryController` and `StackController` to allow a
  variety of action buttons, and for the events from those action
  buttons to bubble up to parent controllers
* Add the `StepController` and its related model, template, and style
  sheet as part of the new craft page.
* Tweak the `ItemSelectorController` and related files to allow for
  a variety of styles for the launcher button
2015-04-20 09:17:58 -07:00
Andrew Miner daaeb523d9 Correct recipe for BuildCraft Gold Gear 2015-04-14 12:36:42 -07:00