Commit Graph

60 Commits

Author SHA1 Message Date
Andrew Brown
f2a42a0bae Add page type customization page 2017-12-27 13:50:48 -06:00
Andrew Brown
0022adb953 Contributor invite flow #migration 2017-08-15 01:41:43 +02:00
Andrew Brown
d6daf0c204 Add Flora model #migration 2017-07-31 02:39:13 +02:00
Andrew Brown
578b365c22 Add super-secret search results page 2017-06-20 16:34:17 +00:00
Andrew Brown
6eb2e08102 Add scratchpad page and update sidebar design #migration 2017-05-17 16:54:30 +01:00
Andrew Brown
adcea851f4 Add babel translation app 2017-05-01 15:35:03 +01:00
Andrew Brown
8bcd9172b7 Integrated js navigator PoC 2017-04-30 01:57:44 +01:00
Andrew Brown
c3b00257a2 Voting MVP 2017-04-17 16:22:02 +01:00
Andrew Brown
86ae882c51 Add one-click unsubscribe action for emails 2017-04-15 19:44:30 +01:00
Andrew Brown
6ce64d09b0 Merge branch 'master' into release/uploads
Conflicts:
	app/views/content/form/_panel.html.erb
	app/views/content/show.html.erb
2017-02-18 00:56:37 +00:00
Andrew Brown
737273d2ae Single image uploading, needs processing in controller 2017-02-17 01:41:41 +00:00
Andrew Brown
798ac705ed Clean up content panel actions + allow expanding all tabs at once 2017-02-14 19:58:27 +00:00
Andrew Brown
3450df2a04 Typo in tab disabling 2017-02-14 18:04:18 +00:00
Andrew Brown
cf18b7fb8e Add subscriptions UI 2017-01-21 15:13:01 +00:00
Andrew Brown
28fde85db6 Fix hidden tabs on content#show 2016-11-06 15:18:48 +01:00
Matthew Werner
149199a281 make content controller create more flexible to avoid overriding in subclass 2016-10-25 16:58:23 -07:00
Matthew Werner
0c84046330 clean up unnecessary changes 2016-10-25 16:48:07 -07:00
Matthew Werner
9299699f4b better category and field creation 2016-10-25 16:37:35 -07:00
Matthew Werner
5b58364c97 merge in upstream 2016-10-25 11:05:22 -07:00
Matthew Werner
7b109eb12b clean up 2016-10-10 16:45:03 -07:00
Matthew Werner
eca50c3276 make attribute categories accessible 2016-10-10 16:20:47 -07:00
Andrew Brown
1c937fea5b Add content exporting to TXT, CSV, and JSON 2016-10-04 14:25:28 +02:00
Andrew Brown
061f0aef37 Add admin stat pages for users, characters, locations, items, and universes 2016-09-28 23:39:32 +02:00
Andrew Brown
e5f088d3d0 Add users controller + routes for author profiles 2016-09-05 21:51:21 -05:00
Andrew Brown
d04024f7a3 Show content names as page titles when available 2016-08-04 22:41:48 -05:00
Andrew Brown
28cd4c4739 add proof of concept editor 2016-07-31 00:20:28 -05:00
Andrew Brown
1d12e96506 Siblingship join model 2016-04-29 14:01:35 -05:00
Andrew Brown
afcb02036e clean up redundancy 2016-04-07 02:30:38 -05:00
Andrew Brown
467cf6e33d Abstract new/edit forms to content model 2016-04-06 23:30:14 -05:00
Andrew Brown
d6d10a30cc Abstract core content functionality from magic controller to content controller 2015-09-01 22:08:34 -05:00
Andrew Brown
5302e1e6a7 metaprog picker code 2015-09-01 20:53:40 -05:00
Andrew Brown
7b10a746c8 ContentController parent class for content 2015-09-01 20:28:24 -05:00
Andrew Brown
47377f1d40 ApplicationHelper simplification 2015-08-28 01:00:58 -05:00
Andrew Brown
01f622744a metastasized my content helper 2015-08-28 00:27:00 -05:00
Andrew Brown
f2df776684 Clean up picker selector 2015-08-27 23:12:21 -05:00
Robert Richter
bcb5e84af5 Fix RuboCop rule disable 2015-03-28 21:58:03 -05:00
Robert Richter
d2a5219fb6 Fix failures I created 2015-03-28 21:51:03 -05:00
Robert Richter
0565266a20 Clean style of ApplicationHelper 2015-03-28 21:45:05 -05:00
Robert Richter
c07717e30e Add comments to Helper classes 2015-03-28 12:55:15 -05:00
Robert Richter
302813ff6c Delete unused Helper classes 2015-03-28 12:37:50 -05:00
Robert Richter
00e793bf1e Refactor style using the Rubocop auto-correct 2015-03-25 22:42:45 -05:00
Andrew Brown
3fd6d604fe Revert "Revert "Resolve merge with master""
This reverts commit 6f8ae925ba.

Conflicts:
	app/assets/stylesheets/bootplus_overrides.css.less
2015-03-13 22:46:31 -05:00
Robert Richter
6f8ae925ba Revert "Resolve merge with master"
This reverts commit 8524963f1c12d6f4667964acc16680749dec20cf, reversing
changes made to bdb208e18769be9ea95c06d54c72f86d2d6a0209.
2015-03-13 20:18:49 -05:00
Robert Richter
b91b53412e Created Languages controller tests, and updated Languages controller to use Rails 4 strong parameters 2015-03-13 20:14:47 -05:00
Robert Richter
e661f692a9 Create equipment controller tests and update Equipment controller to use Rails 4 strong parameters 2015-03-13 20:14:46 -05:00
Andrew Brown
5c39cbb4aa Hook up pickers to edit forms 2014-07-28 21:42:40 -05:00
Andrew Brown
ff954484ce character edit and show pages 2014-07-20 03:44:46 -05:00
Andrew Brown
8adc24e9e5 character page form 2014-07-20 03:19:41 -05:00
Andrew Brown
e6917e2259 Create helper for generating form rows 2014-07-20 02:28:12 -05:00
Andrew Brown
bc9746bdc8 add my_content helper for getting content owned by currently-logged-in user 2014-03-14 20:47:29 +00:00