mirrors/notebook
3
0
Fork 0
mirror of https://github.com/indentlabs/notebook.git synced 2025-10-26 11:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
947 Commits 83 Branches 44 Tags 172 MiB
58992ae0a3
Commit Graph

55 Commits

Author SHA1 Message Date
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