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
|
fb35bbf716
|
Update templates.js
|
2014-08-11 09:21:58 -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 |
|
|
Robert Best
|
910c6a8984
|
merge application.js
|
2014-08-06 02:37:29 -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 |
|
|
Robert Best
|
a939e7ef23
|
Merge remote-tracking branch 'origin/develop' into new
|
2014-08-02 14:32:29 -04:00 |
|
|
Robert Best
|
b09eed715b
|
specify redis gem version number
|
2014-08-02 14:32:07 -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 |
|