Andrew Brown
|
95211d6e1f
|
Add production paperclip config
|
2017-02-20 16:06:58 +00:00 |
|
Andrew Brown
|
db1edb48f6
|
Enable image uploads on all content
|
2017-02-20 16:05:16 +00:00 |
|
Andrew Brown
|
8bf873a254
|
Add upload bandwidth to landing page
|
2017-02-19 01:24:17 +00: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
|
f30baeabfa
|
allow deleting uploaded images
|
2017-02-17 23:48:21 +00:00 |
|
Andrew Brown
|
d072a4c730
|
Show uploaded images on Gallery tab
|
2017-02-17 22:25:16 +00:00 |
|
Andrew Brown
|
737273d2ae
|
Single image uploading, needs processing in controller
|
2017-02-17 01:41:41 +00:00 |
|
Andrew Brown
|
6941562141
|
Pretty code is happy code :)
|
2017-02-16 20:31:20 +00:00 |
|
Andrew Brown
|
48af714fce
|
Paperclip config for S3
|
2017-02-16 20:26:18 +00:00 |
|
Andrew Brown
|
099b252e8e
|
Add gallery tab to characters
|
2017-02-16 20:04:18 +00:00 |
|
Andrew Brown
|
4706793def
|
Update email that emails are sent from
|
2017-02-07 15:53:27 +00:00 |
|
Andrew Brown
|
fa240778c2
|
Include universe description in serendip question pool
|
2017-02-06 17:13:30 +00:00 |
|
Andrew Brown
|
c5eb688182
|
Update quote on homepage
|
2017-02-06 16:41:18 +00:00 |
|
Andrew Brown
|
93f280f86f
|
Use global markdown rendering singleton, closes #148
|
2017-02-06 14:36:17 +00:00 |
|
Andrew Brown
|
15dbc3074e
|
Merge branch 'master' into mobile-header-dropdown
Conflicts:
app/views/layouts/_navbar.html.erb
|
2017-02-06 11:26:15 +00:00 |
|
Mitchel Pigsley
|
054adaf946
|
Create custom 404 page that is responsive
|
2017-02-04 13:31:52 -06:00 |
|
Andrew Brown
|
b134cf946b
|
Landing page internationalization
|
2017-02-03 16:17:12 +00:00 |
|
Andrew Brown
|
1819561f34
|
Install raygun for monitoring
|
2017-02-02 22:10:27 +00:00 |
|
Andrew Brown
|
7aa87e8f16
|
Fix typo in serendipitous question
|
2017-02-01 13:11:50 +00:00 |
|
Andrew Brown
|
defba2249b
|
Tests for changing subscriptions and resulting permissions
|
2017-01-25 19:14:29 +00:00 |
|
Andrew Brown
|
863116d8e4
|
Don't create stripe customers in test env :(
|
2017-01-25 16:45:33 +00:00 |
|
Andrew Brown
|
4b962808ec
|
Move billingplan initialization to rakefile to fix test initializations
|
2017-01-24 15:54:40 +00:00 |
|
Andrew Brown
|
8aa3cf7f4a
|
Allow deleting payment method, retains subscription until end_date
|
2017-01-24 13:46:08 +00:00 |
|
Andrew Brown
|
959731ac43
|
Ask for card info and allow switching between subscription tiers
|
2017-01-23 21:59:07 +00:00 |
|
Andrew Brown
|
1da55caaab
|
Make subscription page content based on current subscription for upgrade/downgrade
|
2017-01-23 16:34:12 +00:00 |
|
Andrew Brown
|
81b26c2505
|
Add stripe + initialize stripe customers on user create
|
2017-01-23 15:22:58 +00:00 |
|
Andrew Brown
|
187e3d4a87
|
Link users to subscription page instead of browser:back when they don't have permission to create content
|
2017-01-21 18:05:26 +00:00 |
|
Andrew Brown
|
2d8b5bd7a8
|
Merge branch 'master' into authority
|
2017-01-21 16:23:23 +00:00 |
|
Andrew Brown
|
5da038542c
|
Revert that inflection change because it breaks literally everything ever
|
2017-01-21 16:23:17 +00:00 |
|
Andrew Brown
|
6a8bebd01c
|
Merge branch 'master' into authority
Conflicts:
app/models/user.rb
|
2017-01-21 16:21:46 +00:00 |
|
Andrew Brown
|
c2b60a886d
|
Set 'magic' to pluralize to 'types of magic' globally
|
2017-01-21 16:19:57 +00:00 |
|
Andrew Brown
|
d11f1707bb
|
Rake task for defaulting existing users to free/beta plans
|
2017-01-21 16:08:33 +00:00 |
|
Andrew Brown
|
73531be12f
|
Initialize default billing plans on server boot
|
2017-01-21 15:55:16 +00:00 |
|
Andrew Brown
|
cf18b7fb8e
|
Add subscriptions UI
|
2017-01-21 15:13:01 +00:00 |
|
Andrew Brown
|
8ae77f4b67
|
Implement authority for user permissions
|
2017-01-14 00:06:33 +01:00 |
|
Robert Richter
|
9599b71157
|
Make assets compile immediately in development
|
2017-01-01 17:09:33 -06:00 |
|
Andrew Brown
|
29e374f3be
|
Show character aliases in form
|
2016-11-02 21:54:58 +01:00 |
|
Andrew Brown
|
9451c60d6f
|
Add group memberships and locations
|
2016-11-02 21:35:41 +01:00 |
|
Andrew Brown
|
07c372eb01
|
Fix CSV exports
|
2016-11-02 14:10:16 +01:00 |
|
Andrew Brown
|
544da91a78
|
Expose spoken languages on Character form
|
2016-11-01 22:14:20 +01:00 |
|
Andrew Brown
|
a896c3c5ae
|
Migrate content types to the new attribute system
|
2016-11-01 21:51:57 +01:00 |
|
Andrew Brown
|
d107512438
|
Merge branch 'custom-attributes' into content-expansion
Conflicts:
app/models/content_types/character.rb
app/models/user.rb
app/views/content/_form.html.erb
app/views/content/form/_text_input.html.erb
app/views/content/index.html.erb
app/views/content/list/_list.html.erb
app/views/content/show.html.erb
app/views/items/edit.html.erb
app/views/items/new.html.erb
app/views/locations/edit.html.erb
app/views/locations/new.html.erb
app/views/universes/edit.html.erb
app/views/universes/new.html.erb
config/locales/en.yml
config/routes.rb
db/schema.rb
|
2016-11-01 21:02:12 +01:00 |
|
Andrew Brown
|
c89baed9f8
|
Update landing page with new content types
|
2016-10-31 20:12:54 +01:00 |
|
Andrew Brown
|
430fc222e1
|
Content type page descriptions
|
2016-10-30 15:34:41 +01:00 |
|
Andrew Brown
|
2005d71d18
|
Update card headers for magics/languages/religions
|
2016-10-30 00:35:44 +02:00 |
|
Andrew Brown
|
204005b55f
|
Add serendipitous prompts for new content types
|
2016-10-27 12:45:08 +02:00 |
|
Andrew Brown
|
46b2d3f2ee
|
Update tab icons for all content types
|
2016-10-27 00:51:37 +02: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 |
|