Connor Turland
|
f30904d828
|
fixed lightbox hiding
|
2014-06-04 16:41:02 -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
|
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 |
|
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 |
|
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
|
2f2f6e64fe
|
Changes to PAG for external pages to load in a new tab
|
2014-05-14 14:42:15 -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
|
1c5a57d67c
|
disabled topic and synapse creation on public map that's not yours
|
2014-03-03 03:05:59 -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
|
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
|
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
|
4362e4f126
|
set the background back to normal, fixed the user sign up issue
|
2014-02-26 11:53:20 -08:00 |
|
Connor Turland
|
000089730c
|
fixed custom scroll bars on maps pages
|
2014-02-24 12:29:54 -08:00 |
|
Connor Turland
|
2df3bda590
|
added hover to homepage image
|
2014-02-24 11:35:48 -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 |
|
poietic
|
d2ac26cbaf
|
Update paq.html.erb
changed answer about "are we making money from it or do we plan to?
|
2014-02-20 11:38:56 -08:00 |
|
poietic
|
f7dc8cff60
|
Update _lightboxes.html.erb
evolved "about" description.
|
2014-02-17 16:30:40 -08:00 |
|
poietic
|
841879798b
|
Update paq.html.erb
added in flattr button and bitcoin address, for donations - may need a bit of formatting work..
|
2014-02-16 23:39:39 -08:00 |
|
poietic
|
1c0f2eb303
|
Update paq.html.erb
tweaks to answers
|
2014-02-16 23:34:01 -08:00 |
|
Connor Turland
|
f26d13fb5f
|
fixed best_in_place issue, fixed toolbar functionality
|
2014-02-10 19:32:05 -05:00 |
|
Connor Turland
|
7b3311cb05
|
changed realtime folder
|
2014-02-10 02:03:06 -05:00 |
|
Connor Turland
|
ec9fe66bfe
|
styled notifications
|
2014-02-10 01:47:48 -05:00 |
|
Connor Turland
|
4e8fc6fe06
|
added tips to cards
|
2014-02-10 01:29:02 -05:00 |
|
Connor Turland
|
5181c91aa7
|
restyled PAQ and Request pages.
|
2014-02-09 23:36:23 -05:00 |
|
Connor Turland
|
ac12c2a9ae
|
added ability to change metacode. updated bottom left menu with icon, upper right menu with hover states
|
2014-02-09 18:54:45 -05:00 |
|
Connor Turland
|
bfdf706f15
|
cheatsheet and menu and upper right menu
|
2014-02-09 10:05:32 -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
|
17fe5fa241
|
styled faq page
|
2014-02-07 12:55:11 -05:00 |
|
Connor Turland
|
ab40ddfdf4
|
a lot of little coloring things
|
2014-02-06 15:16:51 -05:00 |
|
Connor Turland
|
86b60048c3
|
styled new map forms
|
2014-02-06 12:40:44 -05:00 |
|
Connor Turland
|
47710749a8
|
started styling map forms
|
2014-02-05 12:38:17 -05:00 |
|
Connor Turland
|
ae46c27bec
|
started styling map forms
|
2014-02-05 12:37:21 -05:00 |
|
Connor Turland
|
4350c0df1b
|
added lightboxes
|
2014-02-05 00:03:44 -05:00 |
|
Connor Turland
|
b5b147de7e
|
fixed error in account menu
|
2014-02-04 22:08:41 -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
|
8749ba8bbe
|
removed a bunch of unnecessary js.coffee files with nothing in them
|
2014-02-04 14:55:26 -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
|
4e3c9fc439
|
added tooltips on search results, added icon for change metacode set, did further styling of open topic card
|
2014-02-03 00:35:21 -05:00 |
|
Connor Turland
|
6538577387
|
added ability to limit search results to just your own, and to minimize the different sections of search results
|
2014-02-02 14:56:07 -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
|
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
|
414e59e280
|
this is a lot of changes. too many to say here, oops
|
2014-01-28 22:46:58 -05:00 |
|
Connor Turland
|
e44d57a6d9
|
updated the home page
|
2013-12-01 20:47:28 -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
|
6e433683c7
|
updated user sign up advice on the invite page finally
|
2013-09-18 20:04:58 -04:00 |
|
Connor Turland
|
f32378398a
|
removed extra files
|
2013-07-11 11:16:06 -04: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
|
2545126b0b
|
fixed up some styling. extended rgraph radius. added show/hide labels
|
2013-07-09 12:32:13 -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
|
24269a10b9
|
developed an initial attempt at a box to select feature. SO NICE. you just hold down shift and mouse over the ones you want. fixed an important bug that was causing deselecting to go wacky
|
2013-03-22 02:37:56 -04:00 |
|
Devin Howard
|
71047ecac4
|
Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
|
2013-03-21 21:34:26 -04:00 |
|
Devin Howard
|
e5095093ec
|
added Keep Selected button to console, map view, topic view
|
2013-03-21 21:33:42 -04:00 |
|
Connor Turland
|
41333c1991
|
Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
|
2013-03-17 05:20:12 -04:00 |
|
Connor Turland
|
9187112754
|
fixed labels all up. made it so only one showcard exists
|
2013-03-17 05:18:30 -04:00 |
|
Devin Howard
|
6ed19db3ec
|
undo the bug I introduced in the last commit; also change selectNodeOnClickHandler to selectNode to prevent a couple errors in topics/create.js.erb
|
2013-03-16 12:56:26 -04:00 |
|
Devin Howard
|
0049ae88d1
|
hide synapse autocomplete after synapse creation - didn't we fix this already?
|
2013-03-16 12:51:56 -04:00 |
|
Devin Howard
|
1c3aa6c973
|
more onCanvas/inCommons => whiteCircle/greenCircle changes in views. Also changed a thing in main/search.js.erb about the "temp" node being undefined instead of null that may fix an issue or not
|
2013-03-14 21:01:09 -04:00 |
|
Devin Howard
|
ddf449502b
|
fix #145 - autocomplete widget fades out on topic creation
|
2013-03-07 20:09:18 -05:00 |
|
Devin Howard
|
8f59fc34d1
|
added permission to synapse dataset in js in two spots: creating new edge, grabbing edge from commons
|
2013-02-28 21:45:42 -05:00 |
|
Devin Howard
|
4e5fb95c7e
|
fixed a few problems with mappings_controller.rb
|
2013-02-28 20:16:04 -05:00 |
|
Devin Howard
|
a55fc2242c
|
added blank views files for mappings
|
2013-02-28 20:15:25 -05:00 |
|
Devin Howard
|
6bcb575578
|
added supporting files to mapping controller - could be reverted with no problems probably
|
2013-02-28 19:57:04 -05:00 |
|
Devin Howard
|
88522be80c
|
now if you double click 'inCanvas' nodes they will be added to the map. TODO they don't have a mapping yet
|
2013-02-22 18:27:11 -05:00 |
|
Devin Howard
|
195889e6fe
|
added clear canvas button back to topics view, including javascript code to back it up
|
2013-02-22 18:01:15 -05:00 |
|
Connor Turland
|
50bc2b53a9
|
added url for embedding maps
|
2013-02-19 09:44:43 -05:00 |
|
Connor Turland
|
1b29eb1eb3
|
hid clearcanvas and seek tabs on topic pages as they had broken functionality
|
2013-02-16 19:23:36 -05:00 |
|
Connor Turland
|
667d86083c
|
fixed autocomplete bugginess further
|
2013-02-16 19:08:19 -05:00 |
|
Connor Turland
|
210c73e81b
|
Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
|
2013-02-16 19:03:48 -05:00 |
|
Connor Turland
|
c7f44d34a7
|
fixed console issue
|
2013-02-16 19:03:21 -05:00 |
|
Devin Howard
|
d289d77b5a
|
added seek/analyse/organize tabs to topic view. Was that a good idea? Who knows.
|
2013-02-16 17:52:38 -05:00 |
|
Connor Turland
|
a1c5a82ac4
|
fixed autocomplete bugginess, fixed synapse half opacity bug
|
2013-02-15 20:00:05 -05:00 |
|
Connor Turland
|
759e6aa0bd
|
Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
|
2013-02-15 08:51:11 -05:00 |
|
Devin Howard
|
35dd8c1816
|
partway to save to map functionality on topic view
|
2013-02-14 21:29:45 -05:00 |
|
Connor Turland
|
0bad3ec1de
|
production config file
|
2013-02-10 21:04:11 -05:00 |
|
Devin Howard
|
cd3f02d676
|
fixed save layout bug issue #90
|
2013-02-10 20:22:18 -05:00 |
|
Connor Turland
|
9160ae305e
|
finished devins piece editing synapse directionality
|
2013-02-03 21:12:15 -05:00 |
|
Connor Turland
|
8167708383
|
added link to Click Me topic in logged out menu, and made it the place you go when you log in
|
2013-02-03 20:20:29 -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
|
5abe7ef173
|
fixed graphsettings file
|
2013-02-03 13:04:01 -05:00 |
|
Connor Turland
|
68d08af9d3
|
db file for production
|
2013-01-25 22:50:23 -05:00 |
|
Connor Turland
|
81094a5d62
|
testing metacode things with staging
|
2013-01-25 22:31:35 -05:00 |
|
Connor Turland
|
f3de1944d1
|
testing metacode things with staging
|
2013-01-25 22:28:45 -05: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
|
43e1e12503
|
changed topic exploration to move into fluid space.
|
2013-01-23 22:05:24 -05:00 |
|
Connor Turland
|
1727d95c4c
|
re-enabled my work so far on realtime for Fabio
|
2013-01-23 13:55:50 -05:00 |
|
Connor Turland
|
02ac167444
|
good start on more persistent permissions throughout the platform
|
2013-01-23 13:43:01 -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 |
|
Devin Howard
|
3deebc6c09
|
merged comment in home.html.erb with Twitter contact info
|
2013-01-15 19:32:23 -05:00 |
|
Devin Howard
|
626cf37917
|
added pointer to our Twitter on main page
|
2013-01-15 19:31:16 -05:00 |
|
Devin Howard
|
6aed92d22d
|
added comments, heavily interspersed with TODO's, to every view
|
2013-01-11 18:49:59 -05:00 |
|
Devin Howard
|
d2383e50db
|
make description field not have save/cancel buttons for best_in_place
|
2013-01-10 19:13:18 -05:00 |
|
Connor Turland
|
e1ece299cc
|
styled buttons
|
2013-01-07 23:40:58 -05:00 |
|
Connor Turland
|
f48659288c
|
Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
|
2013-01-07 23:04:14 -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 |
|
Devin Howard
|
a7d4debd02
|
added synapsesToMap to maps/_new.html.erb so they can be passed to maps controller
|
2013-01-07 22:05:27 -05:00 |
|
Connor Turland
|
bf957617da
|
Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
|
2013-01-07 19:57:35 -05:00 |
|
Connor Turland
|
3ee2921ae4
|
updating user profile pages
|
2013-01-07 19:57:04 -05:00 |
|
Devin Howard
|
954ce2009b
|
got editing of synapses working. Also tidied up selection code.
|
2013-01-07 19:43:12 -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 |
|
Connor Turland
|
9dabcb7fc1
|
too many changes to say
|
2013-01-06 18:40:48 -05:00 |
|
Devin Howard
|
b3ccbbbd74
|
can now remove synapses from maps with R key, although you can't really tell if you reload the page
|
2013-01-05 23:37:24 -05:00 |
|
Connor Turland
|
e0a2df285f
|
Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
|
2013-01-05 23:03:30 -05:00 |
|
Connor Turland
|
30f84d4f09
|
set limits on scaling
|
2013-01-05 23:03:05 -05:00 |
|
Devin Howard
|
c739f58b4b
|
added destroy.js.erb for responding to synapse destruction. Also select edges by default on creation in create.js.erb
|
2013-01-05 22:39:35 -05:00 |
|
Devin Howard
|
d316df3192
|
added span around title text on topic view top cards
|
2013-01-05 11:51:36 -05:00 |
|
Devin Howard
|
8b7017df22
|
added class to the focus div telling us what topic page we're on
|
2013-01-05 11:39:44 -05:00 |
|
Connor Turland
|
168881ad86
|
changed 'find' to 'seek'
|
2013-01-04 21:45:47 -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
|
ea19ce5375
|
changed the mechanism for realtime so that it only pulls in new information
|
2013-01-04 16:51:37 -05:00 |
|
Connor Turland
|
2be0bc6fa3
|
reduced the speed again, caused a crash
|
2013-01-04 01:31:13 -05:00 |
|
Connor Turland
|
f447334563
|
took out the part about adjencies for realtime
|
2013-01-04 01:08:06 -05:00 |
|
Connor Turland
|
bba4ec2cf3
|
polished up and sped up realtime
|
2013-01-04 01:01:54 -05:00 |
|
Connor Turland
|
8180742ec4
|
added an attempt at real time updates on maps
|
2013-01-04 00:20:43 -05:00 |
|
Connor Turland
|
7497688724
|
fixed a bunch of strange behaviours, and made synapse and topic creation work on all major browsers except haven't tested it out fully with opera yet, Devin will do that. added, but hid the framework for using analyze and organize functions on the left hand side.
|
2013-01-03 18:21:46 -05:00 |
|
Connor Turland
|
940c6f02a5
|
too tired cause I stayed up to stupid late to say something intelligeblle here see.
|
2013-01-03 03:53:25 -05:00 |
|
Devin Howard
|
9f9061d908
|
made a few more detaily fixes
|
2013-01-02 23:01:38 -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
|
26cf745517
|
converted all references to items to topics
|
2013-01-01 17:45:51 -05:00 |
|
Connor Turland
|
131e27aefe
|
converted all references to items to topics
|
2013-01-01 17:45:35 -05:00 |
|
Devin Howard
|
be1323ce85
|
got some hacky way of having the showcard show up on the page. TODO: figure out how to drop the application.html wrapper stuff and how to get this into Javascript
|
2012-12-30 23:40:43 -05:00 |
|
Devin Howard
|
8d1171c2c8
|
made showcard into a non-partial view, in desperation
|
2012-12-30 23:30:18 -05:00 |
|
Devin Howard
|
5d552a5d00
|
added showcard partial view to items so we can load them with AJAX...\!
|
2012-12-30 23:05:33 -05:00 |
|
Devin Howard
|
abe34696da
|
added an empty div at the bottom of the page containing nodes
|
2012-12-30 23:04:30 -05:00 |
|
Connor Turland
|
510ab5fabb
|
added proper images
|
2012-12-26 20:57:06 -05:00 |
|
Connor Turland
|
3be8d56406
|
switched the feedback map back in as map 7
|
2012-12-25 23:01:17 -05:00 |
|
Connor Turland
|
475ccad493
|
increased line size. fixed ability to see synapses on Rgraph pages
|
2012-12-25 22:47:02 -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 |
|