Commit graph

1865 commits

Author SHA1 Message Date
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
Connor Turland
48dc11b53d added ability for an admin to add metacodes and metacode sets 2014-05-17 14:57:03 -04:00
Connor Turland
53544e05a9 changed templates to use script tag rather than div tag and that way browsers don't try and read them as html 2014-05-17 07:32:52 -04:00
Raymon Johnstone
dc6295328a Fixed issue where setting your settings would log you out. 2014-05-15 18:28:30 -04:00
Robert Best
f62107ba43 Merge pull request #317 from Connoropolous/Rob's-1-edits
Changed search shortcut to be Ctrl+/
2014-05-15 10:55:42 -04:00
Robert Best
af8de6aff0 Changed search shortcut to be Ctrl+/ 2014-05-15 10:50:19 -04:00
Raymon Johnstone
0e25fb4cdb removed backup files as well as further mods for settings page 2014-05-14 16:51:16 -04:00
Raymon Johnstone
02b87fdafe Filters removed from settings page 2014-05-14 16:16:26 -04:00
Raymon Johnstone
64f3bf8bbe Filter ScrollBar update fixed 2014-05-14 15:21:17 -04:00
Raymon Johnstone
2f2f6e64fe Changes to PAG for external pages to load in a new tab 2014-05-14 14:42:15 -04:00
Robert Best
3a3e6abfe2 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2014-05-04 15:13:12 -04:00
Robert Best
2e5947a243 Fixes #312 2014-05-04 15:12:38 -04:00
Robert Best
0b61fdc015 Update README.rdoc 2014-05-03 18:55:28 -04:00
Connoropolous
cff856688f Update README.rdoc 2014-04-30 22:09:44 -04:00
Connoropolous
ded219f0b6 Update README.rdoc 2014-04-30 21:52:08 -04:00
Connoropolous
c08a5c580c Update README.rdoc 2014-04-30 21:44:21 -04:00
Connoropolous
9f7430047b Update README.rdoc 2014-04-30 21:41:23 -04:00
Connoropolous
6c56d2f1ca Rename README.md to README.rdoc 2014-04-30 21:40:08 -04:00
Connoropolous
e2253a5c40 Update and rename README.rdoc to README.md 2014-04-30 21:39:21 -04:00
Connoropolous
3efd60b0fe Update README.rdoc 2014-04-30 21:11:47 -04:00
Connoropolous
816231234a Update README.rdoc 2014-04-30 21:09:07 -04:00
Connoropolous
53944a9a05 Update README.rdoc 2014-04-30 20:47:09 -04:00
Connoropolous
9b2e4d7130 Update README.rdoc 2014-04-30 20:44:54 -04:00
Connoropolous
e47a3c81e4 Delete 20140210031525_add_admin_to_users.rb 2014-04-30 20:40:48 -04:00
Connoropolous
c79047d897 Delete 20140210025850_add_featured_to_maps.rb 2014-04-30 20:40:28 -04:00
Connoropolous
756823a1c8 Update users.yml
Switch to adding two users by default, one with regular user permissions (sign in with user@user.com), and one with admin permissions (sign in with admin@admin.com). both have password 'toolsplusconsciousness'
2014-04-30 20:38:55 -04:00