Commit Graph

42 Commits

Author SHA1 Message Date
Andrew Brown
698a92068f Merge branch 'markdown' into content-expansion
Conflicts:
	app/assets/stylesheets/forms.css
	app/assets/stylesheets/landing.scss
	app/views/content/show.html.erb
2016-11-01 12:22:22 +01:00
Andrew Brown
f052073373 PR feedback 2016-11-01 12:13:15 +01:00
Andrew Brown
2f1cf8a9bf Mobile UI polish 2016-10-31 23:40:08 +01:00
Andrew Brown
311a0d7ec9 Add signin/up links to mobile navbar 2016-10-31 21:38:53 +01:00
Andrew Brown
8e33e227b2 add new content to dashboard 2016-10-19 00:30:57 +02:00
Andrew Brown
1f4198828a Clean up redundant views 2016-10-14 23:34:59 +02:00
Andrew Brown
18422a2527 Sidebar/navbar styling 2016-10-14 22:08:39 +02:00
Andrew Brown
d0fc9ca6b1 sidenav + navbar rework with new content types 2016-10-12 03:29:05 +02:00
Andrew Brown
6d3c36a888 Render notebook fields with markdown on content#show pages 2016-10-12 00:28:04 +02:00
Andrew Brown
1c937fea5b Add content exporting to TXT, CSV, and JSON 2016-10-04 14:25:28 +02:00
Andrew Brown
321f382999 navbar polish for mobile responsiveness 2016-09-29 17:54:39 +02:00
Andrew Brown
e5f088d3d0 Add users controller + routes for author profiles 2016-09-05 21:51:21 -05:00
Andrew Brown
4b2a73dd8d Update privacy policy, add bug/feature/feedback form links 2016-08-11 01:30:06 -05:00
Andrew Brown
a4390caa45 Only show universes filter for logged-in users 2016-08-11 00:05:49 -05:00
Andrew Brown
8ef7a74791 Sort universes in scope dropdown alphabetically 2016-08-10 23:47:35 -05:00
Andrew Brown
3c662a8ef6 Universe scoping! 2016-08-10 23:43:11 -05:00
Andrew Brown
22b2d2bf66 More routes/code cleanup 2016-04-30 14:41:12 -05:00
Andrew Brown
af01d6e451 routes cleanup 2016-04-30 14:25:08 -05:00
Andrew Brown
afcb02036e clean up redundancy 2016-04-07 02:30:38 -05:00
Andrew Brown
029032900a restyle dashboard 2016-04-06 18:45:14 -05:00
Andrew Brown
d2209b2374 Rename equipment to items, hook up nav links 2016-04-06 17:46:18 -05:00
Andrew Brown
eefcc5fbc5 new footer with fab ~~~~ 2016-04-06 17:31:31 -05:00
Andrew Brown
0a44ce1a67 new navbar 2016-04-06 16:51:52 -05:00
Andrew Brown
5248c0b802 Revert "Internationalize strings" 2015-04-28 23:04:18 -05:00
Robert Richter
4338a98864 Internationalize navbar 2015-04-25 12:24:34 -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
200e0c7b12 navbar dropdown works beautifully 2014-03-04 06:19:24 +00:00
Andrew Brown
2e51465261 card styling + navbar collapses again 2014-03-04 05:40:53 +00:00
Andrew Brown
9392830fe9 finalized navbar + card border fix 2014-03-03 02:00:55 +00:00
Andrew Brown
209d875e6a all of navbar actually collapses now 2014-03-02 23:27:09 +00:00
Andrew Brown
dbc31f2d2f expand nav menu into nav bar 2013-12-08 21:29:30 -06:00
Andrew Brown
41e3d90a74 landing page and sidebar redesign 2013-12-07 21:29:18 -06:00
Andrew Brown
0ba95a6091 launch preparations and copy changes 2013-03-12 01:19:19 -05:00
Andrew Brown
e17cf877ed onboarding process from anon account to real account 2013-03-10 22:40:48 -05:00
Andrew Brown
c2e9b39bda change navbar site name 2013-02-25 21:10:20 -06:00
Andrew Brown
c5c0db0156 add universes to navbar 2013-01-10 02:09:37 -06:00
Andrew Brown
4db81c4988 proper links in navbar 2012-12-27 20:42:05 -06:00
Andrew Brown
d8a52cd365 assets and shizzle 2012-12-26 21:26:06 -06:00
Andrew Brown
886bda4ad9 more navbar stuff 2012-12-24 04:01:42 -06:00
Andrew Brown
b3615cf4e2 iconify navbar 2012-12-24 03:52:05 -06:00
Andrew Brown
9f6f56c77f navbar 2012-12-24 02:53:02 -06:00