Commit graph

590 commits

Author SHA1 Message Date
Connor Turland 96197130e1 added rmagick and ruby number for heroku 2014-07-07 21:02:43 -04:00
Connor Turland e5ba207711 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2014-06-15 14:41:11 -04:00
Connor Turland 9027cd6d2e closes #352 size of cheatsheet window, closes #351 remove topic and synapse create from cheatsheet on topic pages, closes #348 enter key creating undesirable line break 2014-06-15 14:39:42 -04:00
poietic a0cdad2138 Update _cheatsheet.html.erb
a couple of small switches
2014-06-15 10:52:38 -04:00
Connor Turland 0982916e10 hid topic view tab which was mistakenly showing 2014-06-14 18:25:37 -04:00
Connor Turland bffda35686 updated cheatsheet to be tabbed 2014-06-14 18:21:54 -04:00
Connor Turland 2bb5c7a6bd added homepage image 2014-06-11 22:38:48 -04:00
Connor Turland e9b25be060 blurred input when closing search so that typing in it is no longer possible 2014-06-11 19:29:05 -04:00
Connor Turland e67a520a24 added EsC key to cancel search 2014-06-11 19:18:59 -04:00
Connor Turland 60e9a85140 fixed issue where adding multiple versions of the same person to the realtime list 2014-06-11 18:42:39 -04:00
Connor Turland 0a3f83ade9 added realtime box 2014-06-11 16:47:46 -04:00
Connor Turland ceb30ee5d6 error in selectEdgeOnClickHandler fixed 2014-06-11 11:05:04 -04:00
Connor Turland 5dd848abcf fixed scrolling on home page 2014-06-11 10:38:08 -04:00
Connor Turland 140a526226 changed home page card styling 2014-06-11 10:25:33 -04:00
Connor Turland e5cc8b8078 Merge branch 'Tadasu85-master' 2014-06-11 08:43:15 -04:00
Connor Turland 820096e853 merged raymons changes 2014-06-11 08:42:12 -04:00
Connor Turland 6cec71fe2c actually fixed metacode set styling issues 2014-06-10 20:30:06 -04:00
Connor Turland 3625a750fd fixed metacode sets page styling issue 2014-06-10 20:22:35 -04:00
Raymon Johnstone 3d8332056a Addition of scrollbar to search results. 2014-06-10 20:13:15 -04:00
Connor Turland 9cedf247f9 on topic pages, center on topic using alt+click 2014-06-10 19:25:24 -04:00
Connor Turland c567f07a50 closes #338 ugly text labels. fixes error when trying to load topic page with a metacode set selected 2014-06-10 18:49:06 -04:00
Raymon Johnstone 5118005699 Addition of scrollbar to search results. 2014-06-10 17:43:25 -04:00
Raymon Johnstone 6f2d19c570 Addition of scrollbar to search results 2014-06-10 17:41:34 -04:00
Connor Turland bfa25bc604 sped up scroll bars 2014-06-10 13:34:39 -04:00
Connor Turland b7703e2a0f improved metacode set switcher styling 2014-06-10 13:13:21 -04:00
Connor Turland 35985aecaa fixed styling of many of the user forms 2014-06-10 12:59:19 -04:00
Connor Turland 6454a592bd custom best_in_place that completes change on hitting enter for textaareas 2014-06-09 17:56:42 -04:00
Connor Turland f8a8f119aa for stagin 2014-06-09 16:38:29 -04:00
Connor Turland 8760cf0280 added new images and made realtime send more relevant messages including one when someone turns on realtime 2014-06-09 16:37:09 -04:00
Connor Turland 2f969bb29e for staging 2014-06-09 13:37:16 -04:00
Connor Turland 31817d31a5 closes #202, closes #301, closes #320, closes #337 2014-06-09 13:36:23 -04:00
Connor Turland 6f0150cca1 switched for production (realtime) 2014-06-08 16:27:16 -04:00
Connor Turland 2820f57a9f added metacode background bar set to match metacode color 2014-06-08 16:26:25 -04:00
Connor Turland f30904d828 fixed lightbox hiding 2014-06-04 16:41:02 -04:00
Connor Turland cac3a7c93b focus on topic creator after selecting metacode set 2014-06-04 16:24:13 -04:00
Connor Turland c2b21ecc13 change for staging site 2014-06-04 15:51:00 -04:00
Connor Turland a61a0ee5fc Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2014-06-04 15:25:29 -04:00
Connor Turland a46d097da9 ability to switch metacode sets from mapping page 2014-06-04 15:24:16 -04:00
Robert Best 07f50323d0 Update README.rdoc 2014-05-31 19:14:38 -04:00
Robert Best f375b4bc71 Update README.rdoc 2014-05-31 19:12:21 -04:00
Robert Best 72de11399c Update README.rdoc 2014-05-31 19:11:56 -04:00
Robert Best 0786a14fd8 Update README.rdoc 2014-05-31 18:58:06 -04:00
Connor Turland c1de3abf28 switched coffeescript file to javascript 2014-05-30 11:01:53 -04:00
Connor Turland 1970f794c4 code cleaning 2014-05-30 11:00:31 -04:00
Connor Turland f121661858 merge changes on user settings page 2014-05-30 09:25:29 -04:00
Raymon Johnstone 5f349305a1 Walkthrough for ubuntu added, as well as our lost default database file readded 2014-05-20 20:07:22 -04:00
Connoropolous ce853c594f Merge pull request #319 from Tadasu85/master
Issues Fixed
2014-05-17 16:14:51 -04:00
Raymon Johnstone 2a59d67d79 removed extra files 2014-05-17 16:10:44 -04:00
Raymon Johnstone b9b226fea6 removed extra files 2014-05-17 16:04:23 -04:00
Connor Turland 72b3ae625b made all changes for heroku 2014-05-17 15:02:48 -04:00