Commit Graph

182 Commits

Author SHA1 Message Date
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
fb948155a7 Share buttons and FAQ 2017-03-31 02:48:46 +01:00
Andrew Brown
9d7805f013 no 2017-03-20 02:30:47 +00:00
Andrew Brown
2b1355b053 Add super secret page that no one knows about 2017-03-19 23:49:36 +00:00
Andrew Brown
7824f9150a Add mixpanel a/b logging for sidebar vs fab save button clicks 2017-03-02 16:55:10 +00:00
Andrew Brown
e80c6a22a6 Add character-spouse two-way relation, and 2w related creatures relation 2017-02-28 16:46:47 +00:00
Andrew Brown
e689c5172e Add expand-all toggling instead of just one-way expanding 2017-02-23 17:01:32 +00:00
Andrew Brown
377ec0453f Polish up content#show 2017-02-23 13:40:38 +00:00
Andrew Brown
9c58fd9d3c Hook up panel links on content#show 2017-02-21 21:21:20 +00:00
Andrew Brown
9b60c23ec3 track universe lock stats also 2017-02-21 18:01:31 +00:00
Andrew Brown
9824991795 Add a few other js mixpanel tracks 2017-02-21 17:35:31 +00:00
Andrew Brown
e5f6cc914a Add mixpanel tracking for recent activity clicks and serendipitous questions 2017-02-21 17:30:02 +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
737273d2ae Single image uploading, needs processing in controller 2017-02-17 01:41:41 +00:00
Andrew Brown
29a5a3eee8 Trim trailing whitespace 2017-02-15 18:55:05 +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
15dbc3074e Merge branch 'master' into mobile-header-dropdown
Conflicts:
	app/views/layouts/_navbar.html.erb
2017-02-06 11:26:15 +00:00
Andrew Brown
cf18b7fb8e Add subscriptions UI 2017-01-21 15:13:01 +00:00
Robert Richter
3d6f066b85
Initialize sidenav
It wasn't getting initialized before! The sidenav wasn't working at all.
2017-01-01 17:11:54 -06:00
Andrew Brown
3b84989321 Show modals again, function method changed apparently 2016-11-06 16:48:42 +01:00
Robert Richter
7dcf798f8a
Optimize javascript load times
Our application JS is bloated with minified libraries, while our actual
application Javascript barely amounts to more than two hundred lines.
I propose removing these libraries from our sass file, and instead
load them as separate resources in `<link>` and `<script>` tags.

This has several advantages:

 - By using common CDNs, users are likely to have many of these libraries
   cached already.
 - Even if the files aren't cached, the CDN is likely to deliver them
   faster.
 - We can use the HTML5 'async' attribute to load these libraries
   asynchronously, so users aren't held up while they download.
 - Our fully compiled application JS is much, much smaller, which
   reduces the load on our host.

Also, on the topic of load times, I realized that in #152 that one of the
images was a PNG, not a JPG. I had tried optimizing the image, but I didn't
realize that it wasn't a JPG like the others. Here, I converted it to a JPG,
and it is significantly smaller, and it is visually unchanged.

I'm having some difficulty testing on my local machine, so I would appreciate
some additional manual testing before merging this.
2016-11-02 23:41:00 -05:00
Matthew Werner
9299699f4b better category and field creation 2016-10-25 16:37:35 -07:00
Andrew Carreiro
4e5e5ff3d8 issue-121: added newlines 2016-10-14 00:46:03 -04:00
Andrew Carreiro
e74b41f422 Adding a few keyboard commands as well as a simple dialog to give help 2016-10-14 00:46:03 -04:00
Andrew Brown
8ab97e7ea6 author page polish 2016-10-01 17:35:59 +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
3e0fbd9eb2 Merge branch 'master' into issue-10
Conflicts:
	app/assets/javascripts/content.js.coffee
2016-09-23 23:14:50 +02:00
Robert Richter
e305714192
Compensate for tab anchor scrolling page 2016-09-22 13:29:14 -05:00
Robert Richter
286d06c60e
Add share buttons and wire them up 2016-09-20 17:09:43 -05:00
Robert Richter
3f891d6067
Make edit button open the same tab (fixes #10) 2016-09-20 09:20:36 -05: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
4300bf492a Edit siblingships/relations from #_form 2016-05-02 19:37:37 -05:00
Andrew Brown
80e0a7228f Relation autocomplete plumbing 2016-04-30 13:06:22 -05:00
Andrew Brown
1d12e96506 Siblingship join model 2016-04-29 14:01:35 -05:00
Andrew Brown
7b10a746c8 ContentController parent class for content 2015-09-01 20:28:24 -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
Andrew Brown
ff40419f46 Hook up Expand All macro on all content forms 2014-07-28 22:18:44 -05:00
Andrew Brown
ed419d6865 Change card title when switching facets 2014-07-28 22:04:36 -05:00
Andrew Brown
5c39cbb4aa Hook up pickers to edit forms 2014-07-28 21:42:40 -05:00
Andrew Brown
683abcf443 Hook up generator buttons 2014-07-28 00:00:46 -05:00
Andrew Brown
f23f481476 use new lists in universe content listing 2014-03-13 19:28:14 +00:00
Andrew Brown
0143fab5d7 fix tab issue introduced with bootstrap 3 hidden style changes 2014-03-13 15:16:38 +00:00
Andrew Brown
a221597ab8 removed bootstrap 2 and bootplus, installed bootstrap 3 2014-03-04 01:55:53 +00:00
Andrew Brown
9392830fe9 finalized navbar + card border fix 2014-03-03 02:00:55 +00:00
Andrew Brown
2118bd424b navbar collapses* and icons are back 2014-03-02 23:25:45 +00:00
Andrew Brown
af5f0276c1 javascript refactoring 2014-03-02 01:52:25 +00:00
Andrew Brown
7e09c0f16d add notes and private notes to universes 2014-01-09 17:04:42 +00:00
Andrew Brown
34e08d3705 show character list on universe page of chars in that universe 2014-01-09 13:51:02 +00:00
Andrew Brown
294a282aff let users specify a privacy setting on universes 2014-01-09 02:41:35 +00:00
Andrew Brown
c74bb619f2 trigger file dialog on placeholder map click 2014-01-08 20:23:04 +00:00
Andrew Brown
39b6cdddce Squashed commit of the following:
commit 98cce1cece
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 22:32:13 2014 +0000

    precompile assets

commit 5d8ee6b0b9
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 22:30:10 2014 +0000

    show map on location page

commit 0bbbf65be6
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 22:18:43 2014 +0000

    upload + read works oh god that took long enough

commit 8ca38110d3
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 19:48:23 2014 +0000

    halve the number of transformations needed on map uploads

commit 866ad0f32c
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 19:48:03 2014 +0000

    add aws credentials to dev environment

commit f55dc796fa
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 19:34:20 2014 +0000

    imagemagick gem for image resizing

commit 666e7ac260
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 19:18:55 2014 +0000

    add dev s3 bucket for testing

commit 9984a475e8
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 19:17:45 2014 +0000

    add upload form to locations#new

commit 72ed656e82
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 19:05:25 2014 +0000

    use mongoid-paperclip instead of paperclip

commit 01204e1443
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 19:00:38 2014 +0000

    add attached_file property to location model

commit 3097be4a5a
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 18:58:25 2014 +0000

    set paperclip aws config
2014-01-07 22:48:06 +00:00
Andrew Brown
3ac9c6bc5b drop vanilla bootstrap for bootplus override 2013-12-07 19:28:17 -06:00
Andrew Brown
4c1b652b9b plug in location name generator to forms 2013-03-03 17:41:33 -06:00
Andrew Brown
95fcab50fb random character age generation 2013-03-03 16:40:51 -06:00
Andrew Brown
aa84b7070a name randomization for characters 2013-03-03 16:30:59 -06:00
Andrew Brown
28f5dcc7e6 random name generator 2013-03-03 02:52:58 -06:00
Andrew Brown
bd086ca19f add more fields to magic 2013-01-22 22:06:09 -06:00
Andrew Brown
42721e3a3d add universes 2013-01-10 02:05:55 -06:00
Andrew Brown
54bd06f35f magic is here 2013-01-01 23:04:47 -06:00
Andrew Brown
a1eccc7da9 omg pickers work 2013-01-01 20:57:14 -06:00
Andrew Brown
30b2e1f583 locations 2012-12-28 00:38:54 -06:00
Andrew Brown
ca8beb18dc languages 2012-12-27 23:18:41 -06:00
Andrew Brown
309cddb62a tab issues 2012-12-27 00:08:25 -06:00
Andrew Brown
4b91f4ccdc equipment (exclamation mark) 2012-12-26 23:30:04 -06:00
Andrew Brown
be5ecd45ad assets 2012-12-26 22:39:23 -06:00
Andrew Brown
eb8296cac4 re-add character js 2012-12-26 21:33:10 -06:00
Andrew Brown
d8a52cd365 assets and shizzle 2012-12-26 21:26:06 -06:00
Andrew Brown
ec3c2902ac js to coffeescript 2012-12-26 18:25:47 -06:00
Andrew Brown
dcc24ea614 oh god that character form is so sexy now 2012-12-26 02:32:54 -06:00
Andrew Brown
393ce2b6e4 bootstrapped user 2012-12-23 23:23:00 -06:00
Andrew Brown
34689fa706 characters scaffolding 2012-12-23 17:42:28 -06:00
Andrew Brown
0c4ecfda64 forgot a word 2012-12-23 02:42:37 -06:00
Andrew Brown
268b1bc7b9 main controller and misc changes 2012-12-23 02:32:39 -06:00
Andrew Brown
d00045eedf started drinking 2012-12-22 23:50:10 -06:00
Andrew Brown
69110c64e9 users scaffold 2012-12-22 20:24:25 -06:00
Andrew Brown
bb7c5eeee4 rails app 2012-12-22 17:39:34 -06:00