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
|
4f8a8e2fde
|
for heroku
|
2014-09-10 15:18:20 -04:00 |
|
Connor Turland
|
3d35d44c3f
|
realtime improvement
|
2014-09-10 15:17:43 -04:00 |
|
Connor Turland
|
ac8c589a77
|
config for heroku
|
2014-09-10 15:07:34 -04:00 |
|
Connor Turland
|
28bfb8ac21
|
better architecture for entering and exiting maps from the home page
|
2014-09-10 15:06:39 -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
|
901c028d52
|
configure for heroku
|
2014-09-03 19:07:45 -04:00 |
|
Connor Turland
|
eedd3736cf
|
realtime and filter box styling
|
2014-09-03 19:05:25 -04:00 |
|
Connor Turland
|
1ccaccdb32
|
small css syntax fix
|
2014-08-26 23:01:08 -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
|
1557c7d4e9
|
config for heroku
|
2014-08-18 12:41:49 -04:00 |
|
Connor Turland
|
7df57cd013
|
feedback tab and explore maps pages styling
|
2014-08-18 12:40:51 -04:00 |
|
Connor Turland
|
ff03fb19a1
|
adding a few icons
|
2014-08-18 11:17:01 -04:00 |
|
Connor Turland
|
45828d048e
|
added some of the icons
|
2014-08-17 14:46:07 -04:00 |
|
Robert Best
|
b15da256fa
|
Included title box size in zoom to extents and put a limits on the zooming
|
2014-08-16 12:46:06 -04:00 |
|
Connor Turland
|
5cfbb82760
|
configured for local dev
|
2014-08-15 22:46:36 -04:00 |
|
Connor Turland
|
987f3c3ab5
|
added first pass ishans icons, removed old unnecessary icons
|
2014-08-15 18:27:40 -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
|
35835fcc80
|
fixed home page difference between being logged in and logged out
|
2014-08-12 13:45:29 -04:00 |
|
Connor Turland
|
6bdc6ec397
|
fix for filtering when no edge or node is returned from the topic or synapse
|
2014-08-12 13:30:56 -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 |
|
Shai Mor
|
304c9f3b4b
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into shai
|
2014-08-12 12:56:20 -04:00 |
|
Shai Mor
|
f8e6be70e1
|
fixed topic card css
|
2014-08-12 12:56:13 -04:00 |
|
Connor Turland
|
173179d682
|
fixed filters, updated ruby models further for returning json
|
2014-08-12 12:01:01 -04:00 |
|
Connor Turland
|
f0eb4da6a9
|
realtime for heroku
|
2014-08-12 11:10:32 -04:00 |
|
Connor Turland
|
e1fb72c2df
|
fixed user model and map models up
|
2014-08-12 11:09:53 -04:00 |
|
Connor Turland
|
9d6cf2c3c8
|
further improved explore maps switching
|
2014-08-11 22:47:38 -04:00 |
|
Connor Turland
|
5627b59d59
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new
|
2014-08-11 22:31:44 -04:00 |
|
Connor Turland
|
278b6213bb
|
improved explore maps pages
|
2014-08-11 22:31:28 -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
|
f4cbd9b25d
|
added background
|
2014-08-11 12:12:46 -04:00 |
|
Connor Turland
|
995d49a5bd
|
reseting the filter box when you switch dynamically between maps
|
2014-08-11 12:04:06 -04:00 |
|
Connor Turland
|
22e07e4ca8
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new
|
2014-08-11 11:03:08 -04:00 |
|
Connor Turland
|
8bc1e0c9ee
|
added background file
|
2014-08-11 11:03:00 -04:00 |
|
Connor Turland
|
39140a06e6
|
moved famous files
|
2014-08-10 19:52:39 -04:00 |
|
Connor Turland
|
34500b3255
|
little fix for Util.splitLine
|
2014-08-10 19:44: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
|
8fdae123d2
|
application.css issue
|
2014-08-10 19:17:32 -04:00 |
|
Connor Turland
|
afed3657c2
|
removed vendor plugins
|
2014-08-10 19:15:01 -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
|
a90eb90822
|
small fixes in backbone
|
2014-08-10 16:20:21 -04:00 |
|
Connor Turland
|
bc593fe614
|
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new
|
2014-08-10 13:07:27 -04:00 |
|
Connor Turland
|
06b35e550d
|
first draft of explore maps working
|
2014-08-10 13:06:58 -04:00 |
|
Robert Best
|
a9fc2f19f4
|
Added zoom to selected nodes feature
|
2014-08-07 08:21:13 -04:00 |
|
Connor Turland
|
d14d505c3a
|
pulling in Connors work on routers
Merge branch 'connor' of https://github.com/Connoropolous/metamaps_gen002 into new
|
2014-08-06 10:16:53 -04:00 |
|
Connor Turland
|
fe3536e20b
|
remove console log
|
2014-08-06 10:16:43 -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
|
9cab20dc2a
|
Merge robs changes
Merge remote-tracking branch 'origin/develop' into new
|
2014-08-04 12:21:09 -04:00 |
|
Tadasu85
|
e76d780335
|
Filter box coding changes, Full implementgit add .
|
2014-08-04 12:20:16 -04:00 |
|
Robert Best
|
c7b768d7f4
|
Finished selectWithBox using right click and made Ctrl and Shift work in the 'typical' way... Also, holdig alt now selects only nodes
|
2014-08-03 18:34:22 -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
|
e702f7023f
|
renamed application to not be ISSAD, now Metamaps
|
2014-07-30 01:24:20 -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
|
eceb1174c3
|
removed ccircular image processor to test
|
2014-07-08 00:21:43 -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
|
e9b25be060
|
blurred input when closing search so that typing in it is no longer possible
|
2014-06-11 19:29:05 -04:00 |
|
Connor Turland
|
e67a520a24
|
added EsC key to cancel search
|
2014-06-11 19:18:59 -04:00 |
|
Connor Turland
|
60e9a85140
|
fixed issue where adding multiple versions of the same person to the realtime list
|
2014-06-11 18:42:39 -04:00 |
|
Connor Turland
|
0a3f83ade9
|
added realtime box
|
2014-06-11 16:47:46 -04:00 |
|
Connor Turland
|
ceb30ee5d6
|
error in selectEdgeOnClickHandler fixed
|
2014-06-11 11:05:04 -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
|
6cec71fe2c
|
actually fixed metacode set styling issues
|
2014-06-10 20:30:06 -04:00 |
|
Connor Turland
|
3625a750fd
|
fixed metacode sets page styling issue
|
2014-06-10 20:22:35 -04:00 |
|
Raymon Johnstone
|
3d8332056a
|
Addition of scrollbar to search results.
|
2014-06-10 20:13:15 -04:00 |
|
Connor Turland
|
9cedf247f9
|
on topic pages, center on topic using alt+click
|
2014-06-10 19:25:24 -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 |
|
Raymon Johnstone
|
6f2d19c570
|
Addition of scrollbar to search results
|
2014-06-10 17:41:34 -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
|
6454a592bd
|
custom best_in_place that completes change on hitting enter for textaareas
|
2014-06-09 17:56:42 -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
|
cac3a7c93b
|
focus on topic creator after selecting metacode set
|
2014-06-04 16:24:13 -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
|
c1de3abf28
|
switched coffeescript file to javascript
|
2014-05-30 11:01:53 -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 |
|
Connoropolous
|
ce853c594f
|
Merge pull request #319 from Tadasu85/master
Issues Fixed
|
2014-05-17 16:14:51 -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 |
|
Robert Best
|
f62107ba43
|
Merge pull request #317 from Connoropolous/Rob's-1-edits
Changed search shortcut to be Ctrl+/
|
2014-05-15 10:55:42 -04:00 |
|
Robert Best
|
af8de6aff0
|
Changed search shortcut to be Ctrl+/
|
2014-05-15 10:50:19 -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
|
64f3bf8bbe
|
Filter ScrollBar update fixed
|
2014-05-14 15:21:17 -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 |
|
Robert Best
|
2e5947a243
|
Fixes #312
|
2014-05-04 15:12:38 -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
|
8c985add2c
|
styled autocompletes and tooltips
|
2014-03-03 16:58:03 -08:00 |
|
Connor Turland
|
8c1c4e3202
|
fixed registration issues
|
2014-03-03 10:28:16 -08: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
|
d89dddb45c
|
hopefully changed jit to not cause compile error
|
2014-03-03 02:23:14 -08:00 |
|
Connor Turland
|
ee82650e64
|
precompiled
|
2014-03-03 02:17:54 -08:00 |
|
Connor Turland
|
5b2c20e475
|
precompiled
|
2014-03-03 02:17:44 -08:00 |
|
Connor Turland
|
909a5307d0
|
social icons name change
|
2014-03-03 01:37:15 -08:00 |
|
Connor Turland
|
72724c8da5
|
recently active maps
|
2014-03-03 01:11:04 -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
|
c20c3b0e54
|
added ctrl+click for mac to act as right click for nodes and synapses
|
2014-03-02 15:56:07 -08:00 |
|
Connor Turland
|
dfca29c9b3
|
put message above canvas
|
2014-03-02 15:24:13 -08:00 |
|