Commit Graph

57 Commits

Author SHA1 Message Date
Andrew Brown
8ae77f4b67 Implement authority for user permissions 2017-01-14 00:06:33 +01:00
Andrew Brown
0394ecbe63 mock up branching timeline look 2016-10-30 14:06:10 +01:00
Robert Richter
6239205e95
Add favicons 2016-09-30 18:40:04 -05:00
Andrew Brown
1c17e54d57 remove topopps 2015-08-28 00:49: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
Andrew Brown
df79b058f7 tweak font sizes in css 2014-07-26 21:05:21 -05:00
Andrew Brown
ff8de20eee add some labs for later 2014-05-21 19:40:35 +00:00
Andrew Brown
678608cd2d character list page redesign 2014-03-03 17:52:15 +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
01e01bc8f9 precompiled assets 2014-01-09 15:24:15 +00:00
Andrew Brown
f2b1fadd26 don't show edit/delete buttons on #show if not being viewed by owner 2014-01-09 03:14:21 +00:00
Andrew Brown
d2806bf577 precompiled assets 2014-01-08 20:51:59 +00:00
Andrew Brown
f715fe1f8d add placeholder map if user doesn't upload one 2014-01-08 19:55:33 +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
3345803c43 precompile assets for heroku 2013-12-08 19:51:24 -06:00
Andrew Brown
3ae996c3c3 fixed asset pipeline bug, no longer need to recompile changes to js/css 2013-12-08 16:07:32 -06:00
Andrew Brown
a97b665582 precompiled assets for live push 2013-12-08 03:04:09 -06:00
Andrew Brown
aa9e2eae33 add in simple footer and bottom-padding for content 2013-12-07 21:44:51 -06:00
Andrew Brown
41e3d90a74 landing page and sidebar redesign 2013-12-07 21:29:18 -06:00
Andrew Brown
3ac9c6bc5b drop vanilla bootstrap for bootplus override 2013-12-07 19:28:17 -06:00
Andrew Brown
1eea9c7503 precompiled assets 2013-03-03 18:01:02 -06:00
Andrew Brown
89dc4135f5 don't precompile assets plz 2013-03-03 17:43:08 -06:00
Andrew Brown
114dc0de64 assets 2013-03-03 16:41:13 -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
bd086ca19f add more fields to magic 2013-01-22 22:06:09 -06:00
Andrew Brown
dbd8f0db98 assets 2013-01-22 16:41:58 -06:00
Andrew Brown
229511ffce remove scaffold scss? 2013-01-22 16:40:24 -06:00
Andrew Brown
9f9032818f switch to helvetica 2013-01-22 01:01:45 -06:00
Andrew Brown
809fafa464 fix github issue #9 2013-01-22 00:32:01 -06:00
Andrew Brown
33ac980399 remove fontawesome because it conflicts with bootstrap icon-globe 2013-01-21 23:39:16 -06:00
Andrew Brown
51066190ca link bug: magic/back 2013-01-02 00:31:39 -06:00
Andrew Brown
a1eccc7da9 omg pickers work 2013-01-01 20:57:14 -06:00
Andrew Brown
d6b3f52809 undo fix, assets 2013-01-01 15:46:58 -06:00
Andrew Brown
79763a6185 assets & dropdown fix 2013-01-01 15:42:55 -06:00
Andrew Brown
bd8dc04ceb assets 2013-01-01 15:37:13 -06:00
Andrew Brown
d32934b9a4 assets 2013-01-01 15:01:53 -06:00
Andrew Brown
02f4ce4e47 precompiled assets 2013-01-01 14:53:21 -06:00
Andrew Brown
42372534e0 assets again, didn't actually change 2013-01-01 02:21:11 -06:00
Andrew Brown
061a43aa89 assets 2013-01-01 02:20:26 -06:00
Andrew Brown
a96a73130c assets for locations 2012-12-31 03:47:29 -06:00
Andrew Brown
b95a48ff28 push asap 2012-12-31 03:41:40 -06:00
Andrew Brown
ce1f25fcee languages 2012-12-27 23:25:32 -06:00
Andrew Brown
6e0fcaedf6 update sidebar 2012-12-27 22:31:19 -06:00
Andrew Brown
00a68a7cb6 character role on character list page 2012-12-27 21:47:22 -06:00
Andrew Brown
c1f8e245eb assets 2012-12-27 21:41:15 -06:00
Andrew Brown
309cddb62a tab issues 2012-12-27 00:08:25 -06:00