Connor Turland
1b5ac1dafa
merged develop into thevalueweb
2014-12-03 08:26:11 -05:00
Bashar Jabbour
78743fbba5
updated the tooltip of maps topic appears in
2014-11-27 15:02:44 -05:00
Bashar Jabbour
814a804dd8
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002
2014-11-26 14:44:42 -05:00
Bashar Jabbour
085bf78b0e
added tooltip for maps that topic appears in
2014-11-26 14:44:31 -05:00
Connor Turland
d08774d8bc
changed user image settings. added mapper profile page
2014-11-25 15:06:30 -05:00
Connor Turland
54bb3d2c3d
updated the 404 page. fixed merge conflicts. removed generation code
2014-11-23 22:58: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
a9e488d9cb
NOTE: rake db:migrate required. added generation column to users
2014-11-21 16:50:42 -05:00
Connor Turland
7182996134
removed other sidekiq stuff.
2014-11-16 12:39:41 -05:00
Connor Turland
70cf1426d7
fixed merges from develop
2014-11-11 07:05:31 -05:00
Connor Turland
44923eb660
added new map screenshot capture method
2014-11-09 22:10:13 -05:00
Connor Turland
c5907914e3
fixed user images, set up map updates for realtime
2014-11-04 12:37:17 -05:00
Connor Turland
96ed2bcd64
Merge branch 'develop' into tvw
2014-10-27 13:26:42 -04:00
Connor Turland
acfd55a258
add authorize to delete to controller, fix private map message, fix new map css issue
2014-10-27 13:26:24 -04:00
Connor Turland
07b74ccc31
merge develop and switch default metacode set
2014-10-27 12:15:57 -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
a7328526a8
got profile picture uploading working, as well as profile picture removing, as well as password changing
2014-10-21 20:31:59 -04:00
Connor Turland
51221ee3f7
improvements to map info card, as well as small changes to the permission changers in the topic and synapse cards
2014-10-13 19:27:30 -04:00
Connor Turland
cde771e007
got map screenshot working decent
2014-10-08 00:07:54 -04:00
Connor Turland
cf01e711dd
merge with devin
2014-10-07 19:19:24 -04:00
Devin Howard
c6c05085ad
Added phantomjs script to save an image - this doesn't totally work yet, it has a error with famous
...
Added worker process to call the phantomjs script in app/workers
Added hook in models/map.rb to call the worker
Added calls to map.touch in mappings_controller.rb so it would get triggered correctly - I'm not sure how this will proceed moving forward
2014-10-07 19:11:55 -04:00
Connor Turland
d30417f958
fixed right click on topic menu, fixed synapse color when opening for synapse card, removed mCustomScrollbar
2014-10-04 00:15:47 -04:00
Connor Turland
eedd3736cf
realtime and filter box styling
2014-09-03 19:05:25 -04:00
Connor Turland
fdf0c28daf
sprites
2014-08-26 22:51:50 -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
173179d682
fixed filters, updated ruby models further for returning json
2014-08-12 12:01:01 -04:00
Connor Turland
e1fb72c2df
fixed user model and map models up
2014-08-12 11:09:53 -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
eceb1174c3
removed ccircular image processor to test
2014-07-08 00:21:43 -04:00
Connor Turland
96197130e1
added rmagick and ruby number for heroku
2014-07-07 21:02:43 -04:00
Connor Turland
48dc11b53d
added ability for an admin to add metacodes and metacode sets
2014-05-17 14:57:03 -04:00
Robert Best
2e5947a243
Fixes #312
2014-05-04 15:12:38 -04: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
d093ebeeba
adding tooltips, added maps topic appears on pages.
2014-02-20 17:22:13 -08:00
Connor Turland
4e8fc6fe06
added tips to cards
2014-02-10 01:29:02 -05:00
Connor Turland
4b64e4bc06
fixed issue with date edited in map info box
2014-02-04 11:06:10 -05:00
Connor Turland
9a560ff829
styled carousel autocomplete results. moved tooltips. built out map info box
2014-02-03 20:43:31 -05:00
Connor Turland
9c3c7c5e01
enabled filter by metacode. enabled navigation through topic pages using right click. styled topic card
2014-02-01 03:57:19 -05:00
Connor Turland
d3500b0ce9
adjusted user model to not prevent sign ups
2014-01-31 11:58:32 -05:00
Connor Turland
d6d428df60
perhaps fixed login error
2014-01-28 23:27:32 -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
adcdea5d5e
fixed selecting things on the radial view, and the weird synapse autocomplete bug
2013-11-14 12:28:31 -05:00
Connor Turland
b218d898ea
added account creation again. fixed realtime bug, border radius on the menu, fixed menu on console
2013-07-11 11:13:27 -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
Connor Turland
a0f638c10c
added ability to switch what metacodes you are mapping with
2013-01-25 20:49:40 -05:00
Connor Turland
9bc07b04fa
improved so many things
2013-01-25 00:47:32 -05:00
Connor Turland
397eddca84
removed assets for github
2013-01-23 22:48:03 -05:00
