Shai Mor
|
d18806bb18
|
merge in connors css
|
2014-09-09 15:17:49 -04:00 |
|
Shai Mor
|
4f85055c74
|
styled create map forms
|
2014-09-09 15:13:53 -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
|
f6245df997
|
added 20 at a time loading for explore maps pages
|
2014-08-20 15:37:18 -04:00 |
|
Connor Turland
|
2d338bb785
|
fixed right click menu and also added change metacodes to it
|
2014-08-19 14:13:45 -04:00 |
|
Connor Turland
|
45828d048e
|
added some of the icons
|
2014-08-17 14:46:07 -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
|
46380a17e0
|
got maps wrapper working
|
2014-08-12 19:20:46 -04:00 |
|
Connor Turland
|
6422b54dc0
|
clickable map cards
|
2014-08-12 18:14:04 -04:00 |
|
Connor Turland
|
c989b321c1
|
switched filter box to be by who added something to the map, not who created the topic or synapse
|
2014-08-12 13:22:29 -04:00 |
|
Connor Turland
|
e1fb72c2df
|
fixed user model and map models up
|
2014-08-12 11:09:53 -04:00 |
|
Shai Mor
|
65c8cb2ea7
|
embed attachments
|
2014-08-11 21:59:02 -04:00 |
|
Shai Mor
|
3be9dcfd74
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into shai
|
2014-08-11 18:59:27 -04:00 |
|
Connor Turland
|
bbc50d1305
|
got radial view working
|
2014-08-11 18:57:34 -04:00 |
|
Shai Mor
|
4541196ffe
|
part way through add links to topic cards
|
2014-08-11 18:56:03 -04:00 |
|
Shai Mor
|
85bfce0237
|
part way through add links to topic cards
|
2014-08-11 18:55:53 -04:00 |
|
Connor Turland
|
b596228782
|
restructuring for famous
|
2014-08-10 19:35:18 -04:00 |
|
Connor Turland
|
465b95753c
|
reorganize for functional famous operation
|
2014-08-10 19:24:39 -04:00 |
|
Connor Turland
|
341f9b9bdd
|
home page styling
|
2014-08-10 19:13:25 -04:00 |
|
Shai
|
6182ba4e14
|
data validation
|
2014-08-10 16:52:49 -04:00 |
|
Connor Turland
|
06b35e550d
|
first draft of explore maps working
|
2014-08-10 13:06:58 -04:00 |
|
Connor Turland
|
e9863c0192
|
merge with Robs changes
|
2014-08-06 10:14:17 -04:00 |
|
Connor Turland
|
e7a445423d
|
work in progress on explore maps pages
|
2014-08-06 10:09:01 -04:00 |
|
Robert Best
|
f75c2c1f8a
|
Added Recenter map, zoom in, zoom out, Zoom to extents and buttons for each. Also, renamed selection function to just SelectWithBox()
|
2014-08-06 04:22:06 -04:00 |
|
Tadasu85
|
e76d780335
|
Filter box coding changes, Full implementgit add .
|
2014-08-04 12:20:16 -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
|
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
|
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
|
0a3f83ade9
|
added realtime box
|
2014-06-11 16:47:46 -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
|
3625a750fd
|
fixed metacode sets page styling issue
|
2014-06-10 20:22:35 -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 |
|
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
|
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
|
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 |
|