Connor Turland
|
0ebb02bc0b
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into phantom
|
2014-10-14 16:34:26 -04:00 |
|
Connor Turland
|
f9f147304f
|
styling for map info box mostly complete
|
2014-10-14 16:34:09 -04:00 |
|
Raymon Johnstone
|
0e5e814065
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into develop
|
2014-10-13 23:21:53 -04:00 |
|
Raymon Johnstone
|
b1ae75a896
|
updates to all walkthroughs about the fact that we now use rails 2.1.2 as well as a couple changes to the get involved lightbox
|
2014-10-13 23:18:25 -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
|
fcdc6d57b2
|
setup for automatic config for urls
|
2014-10-10 21:24:31 -04:00 |
|
Connor Turland
|
cde771e007
|
got map screenshot working decent
|
2014-10-08 00:07:54 -04:00 |
|
Connor Turland
|
db3a4b66ad
|
fixed issue that others might end up having with sso_key
|
2014-10-07 19:14:25 -04:00 |
|
Connor Turland
|
d4c481aac0
|
internet explorer get browser links open in new tabs
|
2014-10-07 17:57:12 -04:00 |
|
Connor Turland
|
e756b29baa
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new
|
2014-10-07 17:46:34 -04:00 |
|
Connor Turland
|
629a6a4172
|
fixed sign in redirects
|
2014-10-07 17:46:09 -04:00 |
|
Bashar Jabbour
|
c8bda1bdf1
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002
|
2014-10-07 16:14:14 -04:00 |
|
Bashar Jabbour
|
8a70d209d1
|
fixed the links in noIE lightbox
|
2014-10-07 16:14:00 -04:00 |
|
Connor Turland
|
9ba6daec90
|
further fixed uservoice to identify user
|
2014-10-07 15:39:11 -04:00 |
|
Connor Turland
|
6eec187eee
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new
|
2014-10-07 15:19:30 -04:00 |
|
Connor Turland
|
b5068b6bc4
|
finalized uservoice config
|
2014-10-07 15:19:10 -04:00 |
|
Bashar Jabbour
|
e3c677fa5b
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002
|
2014-10-07 14:47:18 -04:00 |
|
Bashar Jabbour
|
e405cc5a5d
|
updated the noIE lightbox
|
2014-10-07 14:47:06 -04:00 |
|
Raymon Johnstone
|
3cb5c4ce3a
|
index on develop: d30417f fixed right click on topic menu, fixed synapse color when opening for synapse card, removed mCustomScrollbar
|
2014-10-07 12:39:14 -04:00 |
|
Bashar Jabbour
|
80221f1dd4
|
small updates to colophone
|
2014-10-01 23:25:49 -04:00 |
|
Bashar Jabbour
|
179cee8456
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002
|
2014-10-01 20:43:23 -04:00 |
|
Bashar Jabbour
|
8caabb6ce1
|
update the colophone page
|
2014-10-01 20:43:11 -04:00 |
|
Shai Mor
|
4ba9a26c2b
|
style sidebar search mapper stats
|
2014-10-01 18:07:05 -04:00 |
|
Bashar Jabbour
|
427fa99a0c
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002
|
2014-10-01 15:15:43 -04:00 |
|
Connor Turland
|
031f97ba42
|
search results styling
|
2014-10-01 13:18:24 -04:00 |
|
Shai Mor
|
db719abf0f
|
merge with develop
|
2014-10-01 09:57:40 -04:00 |
|
Shai Mor
|
57fb6a15c4
|
start on search results styling, pulled in external js libraries and css
|
2014-10-01 09:54:56 -04:00 |
|
Bashar Jabbour
|
bc59c282a7
|
fixed the google analytics tracking code
|
2014-09-30 15:34:35 -04:00 |
|
Connor Turland
|
2138aa89f3
|
closes #368. ability to add in metacode colors
|
2014-09-29 22:26:12 -04:00 |
|
Connor Turland
|
71247a8f04
|
fixes for account pages
|
2014-09-25 13:26:09 -04:00 |
|
Connor Turland
|
aaf2e4c521
|
right click styling
|
2014-09-22 23:42:26 -04:00 |
|
Connor Turland
|
ff6eef7807
|
synapse form styling and positioning
|
2014-09-21 01:02:21 -04:00 |
|
Connor Turland
|
90e974164d
|
added more resources into help lightbox
|
2014-09-20 15:11:58 -04:00 |
|
Connor Turland
|
af5560b495
|
updates to metacode select within topic card
|
2014-09-18 02:33:38 -04:00 |
|
Connor Turland
|
b6893d8f92
|
fixed admin panels
|
2014-09-15 21:57:34 -04:00 |
|
Connor Turland
|
0941b43391
|
fixed spacing on abuot lightbox
|
2014-09-11 08:39:56 -04:00 |
|
Shai Mor
|
f49f45e856
|
about, invite, getInvolved
|
2014-09-10 18:12:21 -04:00 |
|
Shai Mor
|
23385a946e
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into develop
|
2014-09-10 16:32:36 -04:00 |
|
Shai Mor
|
f91728cdb6
|
get involved lightbox styling
|
2014-09-10 16:32:18 -04:00 |
|
Connor Turland
|
3a7501cc7a
|
merge shai's changes
|
2014-09-09 18:20:17 -04:00 |
|
Connor Turland
|
d2760b8688
|
change in embedly
|
2014-09-09 18:17:39 -04:00 |
|
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
|
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
|
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
|
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 |
|
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
|
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
|
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
|
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
|
5dd848abcf
|
fixed scrolling on home page
|
2014-06-11 10:38:08 -04:00 |
|
Connor Turland
|
35985aecaa
|
fixed styling of many of the user forms
|
2014-06-10 12:59:19 -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
|
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
|
a46d097da9
|
ability to switch metacode sets from mapping page
|
2014-06-04 15:24:16 -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 |
|
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 |
|
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
|
f7dc8cff60
|
Update _lightboxes.html.erb
evolved "about" description.
|
2014-02-17 16:30:40 -08:00 |
|
Connor Turland
|
4e8fc6fe06
|
added tips to cards
|
2014-02-10 01:29:02 -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
|
86b60048c3
|
styled new map forms
|
2014-02-06 12:40:44 -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
|
fdcee3ae40
|
synapse autocomplete working
|
2014-02-04 20:28:06 -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
|
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
|
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
|
a0f638c10c
|
added ability to switch what metacodes you are mapping with
|
2013-01-25 20:49:40 -05:00 |
|
Connor Turland
|
02ac167444
|
good start on more persistent permissions throughout the platform
|
2013-01-23 13:43:01 -05:00 |
|
Devin Howard
|
6aed92d22d
|
added comments, heavily interspersed with TODO's, to every view
|
2013-01-11 18:49:59 -05:00 |
|
Connor Turland
|
3ee2921ae4
|
updating user profile pages
|
2013-01-07 19:57:04 -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 |
|
Connor Turland
|
131e27aefe
|
converted all references to items to topics
|
2013-01-01 17:45:35 -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 |
|
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
|
3931fdd40e
|
got Rgraph working
|
2012-12-16 15:00:43 -05:00 |
|
Connor Turland
|
04819ca342
|
got filtering/finding system working, and node creation happening in place.
|
2012-12-16 01:12:41 -05:00 |
|
Connor Turland
|
d822d87b5a
|
Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
|
2012-12-15 22:52:27 -05:00 |
|
Connor Turland
|
c0d05942f7
|
got sidebar find/filters working for -findbyname and -findbymetacode
|
2012-12-15 22:52:12 -05:00 |
|
Devin Howard
|
4242841d86
|
totally unweildy and not working implementation of node adding by double clicking. It works all right though
|
2012-12-15 19:46:39 -05:00 |
|
Connor Turland
|
55d8a197de
|
removed public assets
|
2012-12-14 13:31:39 -05:00 |
|
Connor Turland
|
5e1ec6ea26
|
added topic searching in the upper bar
|
2012-12-14 02:16:17 -05:00 |
|
Connor Turland
|
e493bbe2c9
|
fixed issue where left show card was hiding behind top. Rearranged filters and added show/hide all. fixed directionality->working consistently
|
2012-11-24 17:48:26 -08:00 |
|
Connor Turland
|
b34962b4f5
|
added hideAll showAll filters!
|
2012-11-23 11:00:00 -08:00 |
|
Devin Howard
|
c523c17111
|
changed our syntax so that the find :first commands actually work :)
|
2012-11-03 13:57:42 -04: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
|
c9d0ea889c
|
if feedback map doesn't exist don't put up feedback button
|
2012-11-03 13:30:20 -04:00 |
|
Connor Turland
|
3b2214017f
|
added little scrollbars on cards whose text was getting too big.
|
2012-10-31 18:53:11 -04:00 |
|
Connor Turland
|
c7dfd836f1
|
added favicon and google analytics
|
2012-10-30 18:32:48 -04:00 |
|
Connor Turland
|
f9c355cddb
|
added link to feedback. removed bolding on fonts that we're looking bad.
|
2012-10-29 14:57:11 -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
|
5c195bd548
|
added maps, permissions, show user cards
|
2012-10-26 06:04:52 -04:00 |
|
Connor Turland
|
dfb92b89a5
|
added ability to add synapse from any page on which there is a map
|
2012-10-24 02:47:08 -04:00 |
|
Connor Turland
|
adf24530d8
|
fixed filtering on multi word item categories
|
2012-10-23 10:46:06 -04:00 |
|
Connor Turland
|
587a2a3b2a
|
added filtering
|
2012-10-21 21:10:43 -04:00 |
|
Connor Turland
|
480a9bcf99
|
changed node adding so that it happens directly to the graph
|
2012-10-21 13:19:59 -04:00 |
|
Connor Turland
|
775d97cdbb
|
initial commit
|
2012-10-17 20:51:54 -04:00 |
|
Connor Turland
|
606b59b644
|
updated graph styling and json generate code. updated add synapses page to not have all three forms in the same place.
|
2012-10-10 11:52:50 -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
|
ea7aa9815a
|
added edit abilities
|
2012-09-23 21:30:48 -04:00 |
|
Connor Turland
|
2ad40cc963
|
test
|
2012-09-23 16:00:34 -04:00 |
|
Connor Turland
|
8f3164027b
|
added all files
|
2012-09-22 22:39:12 -04:00 |
|