Devin Howard
|
2525a6fb65
|
add permission service, refactor map model a bit, add validations
|
2015-12-17 09:10:52 +08:00 |
|
Devin Howard
|
235d4f6c24
|
remove unneeded NEW tests, fix test.rb environment
|
2015-12-15 22:33:48 +08:00 |
|
Connor Turland
|
089528c46d
|
great progress
|
2015-12-11 14:23:41 -05:00 |
|
Devin Howard
|
1597665be5
|
merge develop with rails4 stuff
|
2015-12-07 13:58:42 +08:00 |
|
Connor Turland
|
dcbe24bb7e
|
getting uploads working
followed what it said to do here: http://stackoverflow.com/questions/28374401/nameerror-uninitialized-constant-paperclipstorages3aws
|
2015-12-03 16:57:30 -05:00 |
|
Devin Howard
|
f4456d06ef
|
fix devise integration for rails 4
|
2015-12-03 16:57:29 -05:00 |
|
Devin Howard
|
20e698f69d
|
devise locale text
|
2015-12-03 16:57:29 -05:00 |
|
Devin Howard
|
6df2f22080
|
update devise.rb with new changes
|
2015-12-03 16:57:29 -05:00 |
|
Devin Howard
|
3674aefb04
|
remove secrets.yml stuff because it doesn't work with heroku
|
2015-12-03 16:57:29 -05:00 |
|
Devin Howard
|
570fa931b7
|
use secrets.yml to allow overriding config variables
|
2015-12-03 16:57:28 -05:00 |
|
Devin Howard
|
8e427ea8f2
|
add secrets.yml.default
|
2015-12-03 16:57:28 -05:00 |
|
Devin Howard
|
a972074306
|
environment assets config
|
2015-12-03 16:57:27 -05:00 |
|
Devin Howard
|
bd60f68cfe
|
try to compile but not compress assets
|
2015-12-03 16:57:26 -05:00 |
|
Connor Turland
|
1a01d3b568
|
configuration for production environments like heroku
|
2015-12-03 16:57:23 -05:00 |
|
Connor Turland
|
8b7ec73f48
|
this enables the vagrant port forwarding
|
2015-12-03 16:57:23 -05:00 |
|
Devin Howard
|
50d9866939
|
fix problem with join route
|
2015-12-03 16:57:23 -05:00 |
|
Devin Howard
|
919fc0a60f
|
fiddle with topic and mapping controllers so they work again
|
2015-12-03 16:57:23 -05:00 |
|
Devin Howard
|
13b70be653
|
secret_token => secret_key_base
|
2015-12-03 16:57:22 -05:00 |
|
Devin Howard
|
61159dc44c
|
remove match method from routes.rb
|
2015-12-03 16:57:22 -05:00 |
|
Devin Howard
|
558ced62a8
|
asset precompiling simpler in rails 4
|
2015-12-03 16:57:22 -05:00 |
|
Devin Howard
|
62e96d574c
|
some config changes for rails 4 found on the Internet
|
2015-12-03 16:57:21 -05:00 |
|
Connor Turland
|
1bbaa47b80
|
getting uploads working
followed what it said to do here: http://stackoverflow.com/questions/28374401/nameerror-uninitialized-constant-paperclipstorages3aws
|
2015-11-07 01:33:18 +08:00 |
|
Devin Howard
|
62ae38e70d
|
fix devise integration for rails 4
|
2015-11-03 20:56:50 +08:00 |
|
Devin Howard
|
9613145e99
|
devise locale text
|
2015-11-02 00:07:52 +08:00 |
|
Devin Howard
|
c86422dc68
|
update devise.rb with new changes
|
2015-11-02 00:05:57 +08:00 |
|
Devin Howard
|
6487202e6f
|
remove secrets.yml stuff because it doesn't work with heroku
|
2015-10-30 14:30:24 +08:00 |
|
Devin Howard
|
8e1ae0a1fc
|
use secrets.yml to allow overriding config variables
|
2015-10-29 16:23:41 +08:00 |
|
Devin Howard
|
5c813beafe
|
merge
|
2015-10-27 18:20:12 +08:00 |
|
Devin Howard
|
12c6765f8b
|
add secrets.yml.default
|
2015-10-27 18:17:04 +08:00 |
|
Devin Howard
|
e40f6ededc
|
environment assets config
|
2015-10-25 17:09:57 +08:00 |
|
Devin Howard
|
ac0faae843
|
try to compile but not compress assets
|
2015-10-25 16:51:47 +08:00 |
|
Devin Howard
|
25117cf0e6
|
add rspec scaffold tests and a test db environment
|
2015-10-12 11:45:59 +08:00 |
|
Connor Turland
|
f5dbfd5d72
|
configuration for production environments like heroku
|
2015-09-19 14:10:43 -04:00 |
|
Connor Turland
|
869fb816e9
|
this enables the vagrant port forwarding
|
2015-09-19 13:16:07 -04:00 |
|
Devin Howard
|
1fbd16ac95
|
fix problem with join route
|
2015-09-19 20:46:10 +08:00 |
|
Devin Howard
|
e14001061c
|
fiddle with topic and mapping controllers so they work again
|
2015-09-19 20:01:44 +08:00 |
|
Devin Howard
|
f81fdbf8cc
|
secret_token => secret_key_base
|
2015-09-10 22:12:39 +08:00 |
|
Devin Howard
|
7a73f3bc07
|
remove match method from routes.rb
|
2015-09-10 22:06:58 +08:00 |
|
Devin Howard
|
c250f5d395
|
asset precompiling simpler in rails 4
|
2015-09-10 22:03:39 +08:00 |
|
Devin Howard
|
3c0bdff823
|
some config changes for rails 4 found on the Internet
|
2015-09-10 17:43:58 +08:00 |
|
mix irving
|
c17cc39880
|
extract email settings into ENV ✂️ fixes #405
|
2015-03-04 11:30:23 +13:00 |
|
Connor Turland
|
d08774d8bc
|
changed user image settings. added mapper profile page
|
2014-11-25 15:06:30 -05:00 |
|
Connor Turland
|
2de697bcca
|
ensured that new users can sign up with other new users invite codes
|
2014-11-21 17:24:08 -05:00 |
|
Connor Turland
|
951bd8d4a5
|
removed sidekiq leftovers. altered synapse results to only return unique
|
2014-11-16 12:35:06 -05:00 |
|
Connor Turland
|
8d3de3867f
|
enabled pulling in siblings through right click menus in topic view
|
2014-11-11 06:48:21 -05:00 |
|
Connor Turland
|
44923eb660
|
added new map screenshot capture method
|
2014-11-09 22:10:13 -05:00 |
|
Connor Turland
|
ee1ca7853f
|
removed embed. fixed switch metacode set lightbox overflow. disabled topic creation and topic deletion from public maps by non-owner
|
2014-11-03 08:46:22 -05:00 |
|
Connor Turland
|
12e65c638b
|
changes for reset password form
|
2014-10-27 18:24:30 -04:00 |
|
Connor Turland
|
1aaecd0a8f
|
improved sign up error display, fixed styling for firefox, fixed page stuck on loading spinner bug
|
2014-10-24 11:30:26 -04:00 |
|
Connor Turland
|
bac631ba73
|
config sidekiq
|
2014-10-08 01:42:16 -04:00 |
|
Connor Turland
|
cf01e711dd
|
merge with devin
|
2014-10-07 19:19:24 -04:00 |
|
Devin Howard
|
c5601686c2
|
actually commented sidekiq route
|
2014-10-07 19:01:41 -04:00 |
|
Devin Howard
|
f7f17a2908
|
added sidekiq gem and a route to /sidekiq (commented) for devel
|
2014-10-07 19:00:55 -04:00 |
|
Connor Turland
|
9a250d0034
|
got redirect for single sign on with uservoice working
|
2014-10-07 18:38:33 -04:00 |
|
Connor Turland
|
629a6a4172
|
fixed sign in redirects
|
2014-10-07 17:46:09 -04:00 |
|
Connor Turland
|
9ba6daec90
|
further fixed uservoice to identify user
|
2014-10-07 15:39:11 -04:00 |
|
Connor Turland
|
b5068b6bc4
|
finalized uservoice config
|
2014-10-07 15:19:10 -04:00 |
|
Connor Turland
|
d2760b8688
|
change in embedly
|
2014-09-09 18:17:39 -04:00 |
|
Connor Turland
|
6eca81487a
|
started styling of map cards and topic card, removed new maps section
|
2014-08-15 18:04:22 -04:00 |
|
Connor Turland
|
6422b54dc0
|
clickable map cards
|
2014-08-12 18:14:04 -04:00 |
|
Connor Turland
|
bbc50d1305
|
got radial view working
|
2014-08-11 18:57:34 -04:00 |
|
Connor Turland
|
34500b3255
|
little fix for Util.splitLine
|
2014-08-10 19:44:53 -04:00 |
|
Connor Turland
|
341f9b9bdd
|
home page styling
|
2014-08-10 19:13:25 -04:00 |
|
Connor Turland
|
06b35e550d
|
first draft of explore maps working
|
2014-08-10 13:06:58 -04:00 |
|
Connor Turland
|
e7a445423d
|
work in progress on explore maps pages
|
2014-08-06 10:09:01 -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
|
ae8c711d27
|
major code refactor
|
2014-07-29 13:34:10 -04:00 |
|
Connor Turland
|
b06f5cae35
|
huge refactor 75% done
|
2014-07-27 15:57:35 -04:00 |
|
Connor Turland
|
96197130e1
|
added rmagick and ruby number for heroku
|
2014-07-07 21:02:43 -04:00 |
|
Connor Turland
|
e67a520a24
|
added EsC key to cancel search
|
2014-06-11 19:18:59 -04:00 |
|
Connor Turland
|
a46d097da9
|
ability to switch metacode sets from mapping page
|
2014-06-04 15:24:16 -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
|
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 |
|
Raymon Johnstone
|
dc6295328a
|
Fixed issue where setting your settings would log you out.
|
2014-05-15 18:28:30 -04:00 |
|
Raymon Johnstone
|
0e25fb4cdb
|
removed backup files as well as further mods for settings page
|
2014-05-14 16:51:16 -04:00 |
|
Connor Turland
|
8c1c4e3202
|
fixed registration issues
|
2014-03-03 10:28:16 -08:00 |
|
Connor Turland
|
672ebb99e2
|
changes for live site
|
2014-03-03 01:22:08 -08:00 |
|
Connor Turland
|
08341e3c83
|
replaced background images
|
2014-02-23 23:22:40 -08:00 |
|
Connor Turland
|
d093ebeeba
|
adding tooltips, added maps topic appears on pages.
|
2014-02-20 17:22:13 -08:00 |
|
Connor Turland
|
7b3311cb05
|
changed realtime folder
|
2014-02-10 02:03:06 -05:00 |
|
Connor Turland
|
5181c91aa7
|
restyled PAQ and Request pages.
|
2014-02-09 23:36:23 -05:00 |
|
Connor Turland
|
1c49a805bd
|
removed more old files, styled request invite page
|
2014-02-07 18:13:51 -05:00 |
|
Connor Turland
|
2045220622
|
styled lightboxes further, changed FAQ to PAQ
|
2014-02-07 17:25:02 -05:00 |
|
Connor Turland
|
ae46c27bec
|
started styling map forms
|
2014-02-05 12:37:21 -05:00 |
|
Connor Turland
|
6a63b1fe47
|
removed assets
|
2014-02-04 22:03:24 -05:00 |
|
Connor Turland
|
fdcee3ae40
|
synapse autocomplete working
|
2014-02-04 20:28:06 -05:00 |
|
Connor Turland
|
285c87ade7
|
configured for redistogo and uncommented realtime messages
|
2014-02-04 12:08:09 -05:00 |
|
Connor Turland
|
9ca9e56536
|
improved the labels. started the right click menu. added the wand menu. added the create map feature. replaced images with recolored ones.
|
2014-01-30 19:32:15 -05:00 |
|
Connor Turland
|
2fd468c4f3
|
added devise secret key
|
2014-01-28 23:01:03 -05:00 |
|
Connor Turland
|
414e59e280
|
this is a lot of changes. too many to say here, oops
|
2014-01-28 22:46:58 -05:00 |
|
Connor Turland
|
cca4830fd5
|
added mailer config for production env
|
2013-07-10 14:30:34 -04:00 |
|
Connor Turland
|
41044140b7
|
added completely new logging in system
|
2013-07-10 14:02:38 -04:00 |
|
Connor Turland
|
f657a61327
|
added all the code for realtime mapping using websockets. fixed some minor bugs like the label glitches, dragBox to deselect as well as select, shift click for synapses working again, panning won't deselect all your selected nodes and edges, nor hide the showcard, but a single click will hide the open card
|
2013-04-26 00:07:29 -04:00 |
|
Devin Howard
|
101f49b9e6
|
added mapping_controller and routes, but only implemented create
|
2013-02-28 19:56:27 -05:00 |
|
Connor Turland
|
50bc2b53a9
|
added url for embedding maps
|
2013-02-19 09:44:43 -05:00 |
|
Connor Turland
|
c29c1b9e5d
|
switched settings back to compress js and css for optimization
|
2013-02-03 20:10:21 -05:00 |
|
Connor Turland
|
f402ddc243
|
changed code for production env so that I can debug
|
2013-02-03 19:52:14 -05:00 |
|
Connor Turland
|
24dcd4c13a
|
added code to application.rb that should fix
|
2013-02-03 19:25:08 -05:00 |
|
Connor Turland
|
4bbb838cd4
|
reformatted home page, fixed text-overflow, added request invite page and a link to the blog
|
2013-02-03 19:13:21 -05:00 |
|
Connor Turland
|
a85e8fac71
|
added db config default file
|
2013-01-20 18:00:10 -05:00 |
|
Connor Turland
|
1633b61637
|
permissions not fully fully functional yet, don't push to staging. editing of maps as cards in place. raw data available as json at maps/:id/json, or topics/:id/json, or synapses/:id/json
|
2013-01-18 17:08:06 -05:00 |
|
Connor Turland
|
1b44175c31
|
added home page with recent info, and personal profiles with recent indo
|
2013-01-07 23:03:41 -05:00 |
|
Connor Turland
|
ea54bacea3
|
added shift+click and ability to take different kinds of actions on selected nodes and edges
|
2013-01-07 00:17:39 -05:00 |
|
Devin Howard
|
5bd311ceea
|
added route to config/routes.rb for removing synapse mappings. It's not actually defined in the controller though....
|
2013-01-05 22:41:19 -05:00 |
|
Connor Turland
|
e593bbc8b2
|
added ability to hide topics from canvas, remove topics from map, and delete topics, all from the graph.
|
2013-01-04 21:39:16 -05:00 |
|
Connor Turland
|
8180742ec4
|
added an attempt at real time updates on maps
|
2013-01-04 00:20:43 -05:00 |
|
Devin Howard
|
50dd586fbe
|
removed showcard routes, html.erb, and controller entries/files since it's back in javascript
|
2013-01-02 21:01:56 -05:00 |
|
Connor Turland
|
131e27aefe
|
converted all references to items to topics
|
2013-01-01 17:45:35 -05:00 |
|
Devin Howard
|
ae95cbf6f4
|
I did something with config/routes.rb and now showcard/1 shows an empty html page instead of giving an error
|
2012-12-30 23:33:08 -05:00 |
|
Connor Turland
|
3356160af4
|
moved all the menus in the upper right to the logo. created the console at /console. changed synapse creation to be either on right click and drag or alt+left click. fixed scrolling and spacing on list pages of maps and topics. added ability to clear the canvas on the console and to save to map. removed metamap page, and extraneous controllers.
|
2012-12-25 18:29:20 -05:00 |
|
Connor Turland
|
783894461e
|
testing ability to pull topics onto the canvas
|
2012-12-23 01:12:56 -05:00 |
|
Connor Turland
|
37e41c87bf
|
made it so that only synapses can be created on topic pages, not new topics. Restructured the URL address system
|
2012-12-21 18:07:13 -05:00 |
|
Connor Turland
|
cdec4b2ffa
|
pushhh
|
2012-12-20 19:24:27 -05:00 |
|
Connor Turland
|
3931fdd40e
|
got Rgraph working
|
2012-12-16 15:00:43 -05:00 |
|
Devin Howard
|
dfdc1bfd94
|
removed config/database.yml
|
2012-12-15 14:08:00 -05:00 |
|
Connor Turland
|
55d8a197de
|
removed public assets
|
2012-12-14 13:31:39 -05:00 |
|
Connor Turland
|
9f4522e1e7
|
swapped in db config file for production
|
2012-12-14 03:20:33 -05:00 |
|
Connor Turland
|
5fb5868378
|
precompiled assets
|
2012-12-14 03:10:57 -05:00 |
|
Connor Turland
|
a5fd4cb835
|
caching changes
|
2012-12-14 02:59:37 -05:00 |
|
Connor Turland
|
7e4fed4020
|
more caching mods
|
2012-12-14 02:52:54 -05:00 |
|
Connor Turland
|
2c9a7a8946
|
changed caching again
|
2012-12-14 02:41:59 -05:00 |
|
Connor Turland
|
7c2169a2de
|
changed the caching settings
|
2012-12-14 02:38:59 -05:00 |
|
Connor Turland
|
5e1ec6ea26
|
added topic searching in the upper bar
|
2012-12-14 02:16:17 -05:00 |
|
Devin Howard
|
7e1610147a
|
Revert "removed 20121203225613_add_arranged_to_map.rb"
This reverts commit baaa746a47.
|
2012-12-09 19:44:18 -05:00 |
|
Devin Howard
|
baaa746a47
|
removed 20121203225613_add_arranged_to_map.rb
|
2012-12-09 19:42:09 -05:00 |
|
Connor Turland
|
38ef59b951
|
swapped database config file for local/staging back in
|
2012-12-03 19:42:06 -05:00 |
|
Connor Turland
|
e2acdb727a
|
swapped in database config file for production
|
2012-12-03 19:06:33 -05:00 |
|
Connor Turland
|
cfe7966958
|
darkened concentric circles on Rgraph view
|
2012-12-01 18:06:29 -05:00 |
|
Connor Turland
|
e8404de01a
|
added ability to save layout of maps.
|
2012-12-01 18:05:17 -05:00 |
|
Connor Turland
|
555e822d8c
|
swapped database config files for production
|
2012-11-24 18:05:05 -08:00 |
|
Devin Howard
|
77420bcb09
|
made feedback and metamaps manual display conditional instead of hard coded so there's not errors on a blank database
|
2012-11-03 13:45:08 -04:00 |
|
Devin Howard
|
bce78bc147
|
removed test rake config
|
2012-11-03 13:07:14 -04:00 |
|
Devin Howard
|
eb0c8f1b8a
|
removed home.html.erb and configured new databases and changed background image
|
2012-11-03 11:51:49 -04:00 |
|
Connor Turland
|
20ff61b37f
|
switched config.assets.compile back to false
|
2012-11-01 08:03:04 -04:00 |
|
Connor Turland
|
d2fbd05c3e
|
changed production cache behaviour
|
2012-10-29 14:01:28 -04:00 |
|
Connor Turland
|
f3fb5c5326
|
added data columns to user for a unique access code that is theirs that they can give to others to invite them, and require people to give an access code to create an account.
|
2012-10-29 13:52:29 -04:00 |
|
Connor Turland
|
9e7c6b0f02
|
updated header to have dropdown menus. fixed synapses that were showing up blue. ensured that when creating new synapses, you can only see the list for which you have permissions to see
|
2012-10-28 14:37:46 -04:00 |
|
Connor Turland
|
2812157a84
|
reconfigured database file for live server
|
2012-10-26 06:07:55 -04:00 |
|
Connor Turland
|
5c195bd548
|
added maps, permissions, show user cards
|
2012-10-26 06:04:52 -04:00 |
|
Connor Turland
|
ddd80b60ef
|
updated db config file again
|
2012-10-17 21:17:46 -04:00 |
|
Connor Turland
|
e82cf040c0
|
configured db file
|
2012-10-17 21:08:11 -04:00 |
|
Connor Turland
|
775d97cdbb
|
initial commit
|
2012-10-17 20:51:54 -04:00 |
|
Connor Turland
|
4d09fb6fc8
|
added ability to add synapses
|
2012-10-09 20:23:45 -04:00 |
|
Connor Turland
|
9c0f12a55a
|
updated location styling and output. increased card size. made links open in new tabs. removed create account link. added ability to see list of your personal objects that you've added.
|
2012-10-08 01:45:44 -04:00 |
|
Connor Turland
|
ca2898fe3d
|
added ability to create synapses between nodes of same type
|
2012-10-05 16:40:30 -04:00 |
|