glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
660 commits 40 branches 27 tags 58 MiB
Commit graph

501 commits

Author SHA1 Message Date
Robert Best c7b768d7f4 Finished selectWithBox using right click and made Ctrl and Shift work in the 'typical' way... Also, holdig alt now selects only nodes 2014-08-03 18:34:22 -04:00
Tadasu85 581ba8b78f Merge remote-tracking branch 'origin/develop' into new 2014-08-02 13:51:54 -04:00
Tadasu85 2b267ea0c6 filterbox progress 2014-08-02 13:49:51 -04:00
Connor Turland 0a29bed856 fixed topics and synapses placing on map issue 2014-08-02 13:48:41 -04:00
Connor Turland e08c702494 introduced the metamaps.router 2014-08-01 22:50:23 -04:00
Connor Turland 3476d0126c got rgraph working again 2014-07-30 21:10:10 -04:00
Connor Turland e702f7023f renamed application to not be ISSAD, now Metamaps 2014-07-30 01:24:20 -04:00
Connor Turland 9dec959aee more restructuring. reorganizing views files to make more sense, be grouped logically 2014-07-30 01:02:47 -04:00
Connor Turland f817ce772c changed approach to map creation. reorganized code to suit that. 2014-07-29 23:18:43 -04:00
Connor Turland ae8c711d27 major code refactor 2014-07-29 13:34:10 -04:00
Connor Turland de2c7372fd removed extra files 2014-07-27 15:59:02 -04:00
Connor Turland b06f5cae35 huge refactor 75% done 2014-07-27 15:57:35 -04:00
Connor Turland eceb1174c3 removed ccircular image processor to test 2014-07-08 00:21:43 -04:00
Connor Turland aa5e3d522b set proper socket for heroku 2014-07-07 21:08:14 -04:00
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 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 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 a46d097da9 ability to switch metacode sets from mapping page 2014-06-04 15:24:16 -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 2e5947a243 Fixes #312 2014-05-04 15:12:38 -04:00
Connoropolous 2e6ea8fb1e removed coming soon 2014-03-06 08:12:41 -08:00
Connoropolous 27caf6e0a8 Added tutorial video in 2014-03-06 08:08:45 -08:00
Robert Best 6cf63b4e83 Added financial support links to PAQ 2014-03-05 13:10:41 -05:00
Robert Best 6a80c021ec Update paq.html.erb 
Made a few changes, mostly just adding links.... what still remains is to add links for Flattr, Paypal, and Bitcoin
 2014-03-03 23:21:23 -05:00
Connor Turland 8c985add2c styled autocompletes and tooltips 2014-03-03 16:58:03 -08:00
Connor Turland 8c1c4e3202 fixed registration issues 2014-03-03 10:28:16 -08:00
Connor Turland 1c5a57d67c disabled topic and synapse creation on public map that's not yours 2014-03-03 03:05:59 -08:00
Connor Turland d89dddb45c hopefully changed jit to not cause compile error 2014-03-03 02:23:14 -08:00
Connor Turland ee82650e64 precompiled 2014-03-03 02:17:54 -08:00
Connor Turland 5b2c20e475 precompiled 2014-03-03 02:17:44 -08:00
Connor Turland 909a5307d0 social icons name change 2014-03-03 01:37:15 -08:00
Connor Turland 72724c8da5 recently active maps 2014-03-03 01:11:04 -08:00
Connor Turland 19df96cb77 reworked logged in homepage 2014-03-03 00:25:47 -08:00
Connor Turland 7f5269bb84 added the ability to change the map permission from the map info box 2014-03-02 18:53:19 -08:00
Connor Turland 5fe3eb8f00 fixed capitalization issues. tidied up topic pages. added center this topic icon 2014-03-02 16:36:18 -08:00
Connor Turland c20c3b0e54 added ctrl+click for mac to act as right click for nodes and synapses 2014-03-02 15:56:07 -08:00
Connor Turland dfca29c9b3 put message above canvas 2014-03-02 15:24:13 -08:00
Connor Turland 4fc60c13e7 ability to change the permissions of multiple through the right click menu implemented 2014-03-02 15:05:03 -08:00
Connor Turland a36d1c8aec added updated metacode images and fixed synapse pointer 2014-03-02 12:01:06 -08:00
Connor Turland 2249fc4893 added pointer to node hover, fixed synapse permission edit bug 2014-03-02 11:53:22 -08:00
Connor Turland 2abeb73e9a styled synapse card 2014-03-01 19:02:27 -08:00
Connor Turland 5dd03ab4f7 cross browser flexbox support 2014-02-26 15:52:54 -08:00
Connor Turland 428462abf5 hope to have fixed the double click to open topic card issue 2014-02-26 14:45:01 -08:00
Connor Turland 762fc21e9e Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2014-02-26 12:40:13 -08:00
Connor Turland 2cf04f96cb removed last_edited from map model, and set up code to update map updated_at column whenever certain events happen that update the map 2014-02-26 12:23:29 -08:00
Connor Turland c9aea733ad fixed explore maps floating left issue 2014-02-26 12:00:18 -08:00
Connor Turland 4362e4f126 set the background back to normal, fixed the user sign up issue 2014-02-26 11:53:20 -08:00
Connor Turland 3a88abbb1b background update test 2014-02-25 15:05:25 -08:00
Connor Turland f990ee1c8c added ability to change topic permission 2014-02-24 17:03:13 -08:00
Connor Turland 2e252c2647 fixed scrollbars further 2014-02-24 12:47:02 -08:00
Connor Turland 000089730c fixed custom scroll bars on maps pages 2014-02-24 12:29:54 -08:00
Connor Turland eb940a1f7b moved lower bars lower to bottom 2014-02-24 11:51:55 -08:00
Connor Turland 2df3bda590 added hover to homepage image 2014-02-24 11:35:48 -08:00