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
435 Commits 83 Branches 44 Tags 172 MiB
51caaa56cc
Commit Graph

73 Commits

Author SHA1 Message Date
Andrew Brown
6138dc86c8 Fix design problems #410 2015-03-13 23:59:59 -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
Andrew Brown
e3e8cbdaf6 Clean up after the merge conflict 2015-03-13 20:43:55 -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
06c6b0ce89 Merge resolution 2015-03-13 20:12:42 -05:00
Andrew Brown
dc2476e636 more prod hotfixes 2014-08-01 04:01:24 +00:00
Andrew Brown
18d49e677b Production hotfixes lel 2014-08-01 01:04:27 +00:00
Andrew Brown
e452065255 Active tab styling on facet lists 2014-07-28 22:51:13 -05:00
Andrew Brown
ea0a5e8111 Scale placeholder map to card size 2014-07-28 22:42:57 -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
ebc0b1933f equipment new/edit/show pages 2014-07-27 18:22:04 -05:00
Andrew Brown
df79b058f7 tweak font sizes in css 2014-07-26 21:05:21 -05:00
Andrew Brown
d37bc792c8 restyle hero on landing 2014-05-21 20:28:41 +00:00
Andrew Brown
3a673c7d12 fix font size discrepency 2014-05-21 19:50:05 +00:00
Andrew Brown
8ebef947f0 character view changes 2014-05-21 19:40:02 +00: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
8299e6c0d3 card-comments restyling 2014-03-13 13:37:02 +00:00
Andrew Brown
14f4ae6fcb clean up css 2014-03-13 13:05:21 +00:00
Andrew Brown
2e51465261 card styling + navbar collapses again 2014-03-04 05:40:53 +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
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
50e4eff908 landing page images + attribution 2013-12-08 18:32:40 -06:00
Andrew Brown
dcaaa60d72 merge master (asset bugfix) into images 2013-12-08 16:09:46 -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
e0b1074aed universes landing page image + attribution 2013-12-08 15:56:54 -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
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
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
42721e3a3d add universes 2013-01-10 02:05:55 -06:00