Connor Turland
0a52de714e
make it match develop
2017-02-05 05:41:29 +00:00
Connor Turland
597efb36e1
add this back in
2017-02-05 05:31:37 +00:00
Connor Turland
72fd2717b6
Merge branch 'develop' into feature/convo.algo
2017-02-05 05:26:58 +00:00
Connor Turland
500a74bd5f
don't include the controller yet
2017-02-05 04:15:51 +00:00
Connor Turland
2423608fd3
actually optimize the island layout
2017-02-05 04:08:36 +00:00
Connor Turland
0929380e91
divide up the islands to the north and south
2017-02-05 03:34:59 +00:00
Connor Turland
6e347dc33a
fixup synapse creation
2017-02-05 03:26:18 +00:00
Connor Turland
96f66a2f8c
fix up topic creator
2017-02-04 04:27:08 +00:00
Connor Turland
74dd20f02e
got topic and synapse creation working
2017-02-04 04:13:59 +00:00
Connor Turland
04036882ab
do the bounds and translate
2017-02-03 20:58:49 +00:00
Connor Turland
fd54eb718a
its workking
2017-02-03 19:58:15 +00:00
Robert Best
00ecb0f6bb
Make DEL key delete selected items (With confirmation still :P ) ( #1058 )
...
* add del key
* made DEL key into delete shortcut
2017-02-03 14:23:04 -05:00
Connor Turland
ba230e1eed
only find parents for parents and children for children
2017-02-01 21:30:48 +00:00
Connor Turland
274b86532a
its vorkingg....
2017-02-01 18:08:02 +00:00
Connor Turland
6ed9796e05
no more matter
2017-02-01 17:49:16 +00:00
Connor Turland
08d2cbb00d
running algo each time an edge is added
2017-02-01 17:47:45 +00:00
Devin Howard
45a15da896
fix error in loading url titles
2017-02-01 12:37:50 -05:00
Devin Howard
a96c8ae75c
fix bug
2017-01-31 23:44:10 -05:00
Connor Turland
fc2604376a
add the gitignore
2017-01-31 03:23:01 +00:00
Devin Howard
a137c21d2d
searchfields api parameter ( #1054 )
2017-01-28 16:53:54 -05:00
Connor Turland
952cf4e79f
keep permission of topic/synapse in sync with map its deferring to from beginning ( #1053 )
...
* Update topic.rb
* Update synapse.rb
2017-01-28 16:40:41 -05:00
Devin Howard
53bc4ee1c8
fix mapper page ( #1050 )
2017-01-28 15:44:38 -05:00
Connor Turland
c60f7f4525
add Story, which is on metamaps, total is now 48
2017-01-28 01:04:23 -05:00
Connor Turland
8df2cd8732
fix metacode names
2017-01-28 01:01:20 -05:00
Devin Howard
2c6da79df3
redirect /explore to / ( #1051 )
2017-01-27 15:16:31 -05:00
Connor Turland
6e913efbae
track pageloads with google analytics. fixes #1012 ( #1048 )
...
* track pageloads with google analytics. fixes #1012
* Update Router.js
2017-01-25 20:57:34 -08:00
Connor Turland
db81962c91
some c9 files to gitignore
2017-01-26 00:24:31 +00:00
Connor Turland
8330ef9679
treat cable sub/unsub as joined/left map. fixes #1035 ( #1047 )
2017-01-25 15:32:13 -08:00
Devin Howard
696ff396b0
file attachments in db (re: #124 ) ( #1043 )
...
* file attachments in db
* rubocop
* factor out a bunch of file types
* thumb and medium image styles"
* syntax error in concern
* markdown is also plaintext
* rubocop
2017-01-24 15:10:40 -05:00
Devin Howard
b16617286f
revert back to jquery 1 to fix best in place
2017-01-23 19:50:59 -05:00
Devin Howard
fee011bba6
fix readme bullets
2017-01-23 19:37:50 -05:00
Devin Howard
d16709e8e7
fix codeclimate style issues ( #1046 )
...
* bunch of code climate fixes
* more
2017-01-23 19:30:13 -05:00
Devin Howard
0ad10c0f5a
fix style of thumb button on map card ( #1044 )
2017-01-23 14:02:14 -05:00
Devin Howard
d11278b63b
map rdf export ( fixes #1015 ) ( #1036 )
...
* simple rdf export of maps
* register ttl mime type
* owl
* mm
* fix up export service
* implement base url thing whoo
* add more rdf fields
* fix rdf syntax errors
* hide unused fields in rdf
* some code climate fixes
* update ontology a bit more
* syntax fix
* typo
2017-01-22 16:42:04 -05:00
Devin Howard
2652d53e9b
update ruby dependencies too ( #1042 )
...
* update rubygem dependencies
* update backbone
* brakeman fix
* brakeman
* ugh syntax fix
2017-01-22 16:41:51 -05:00
Devin Howard
dc8d274487
whoops, I guess we do need jquery in package.json
2017-01-22 14:07:04 -05:00
Devin Howard
2fd972ddce
ajax queue ( fixes #853 ) ( #1037 )
...
* jquery.ajaxq
* install jquery.ajaxq from npm
* patch ajaxq into Backbone code
* use ajaxq library with more github stars
* eslint
2017-01-22 13:50:34 -05:00
Devin Howard
bba8231e8c
update npm dependencies ( #1038 )
...
* only one github dependency left
* update npm deps
* exact versions of npm deps
2017-01-21 15:37:14 -05:00
Devin Howard
1229e92feb
fix bug in Debug.js
2017-01-21 13:34:39 -05:00
Devin Howard
ba3d5f07dd
try to fix metamaps.debug
2017-01-21 13:09:26 -05:00
Devin Howard
d47d7e50e7
mark v3.2 on develop
2017-01-21 13:04:28 -05:00
Devin Howard
af2c6ebef1
split screenshot function/button into two parts ( #1027 )
...
* split screenshot function into 4 separate helpers
* screenshot download button in import dialog box
* thumbnail button inside map info box
* import blue button styling
* fight with styling to make the button at least appear
* add more text
* fix tooltip display
* automatically start downloading the screenshot
* eslint
* revamp GlobalUI.notifyUser
* fix object destructuring syntax
* fix
2017-01-19 14:50:08 -05:00
Devin Howard
a9f19815e4
fix api embed to use the correct serializers ( fix #998 ) ( #1029 )
...
* use correct serializer for singular embeds in api (almost fixes #998 )
* fix has_many api embeds too!
* unused arg
2017-01-19 14:49:40 -05:00
Devin Howard
460de840b6
redis server
2017-01-18 16:38:34 -05:00
Devin Howard
36ed85312e
fix crontab
2017-01-18 16:29:52 -05:00
Devin Howard
991c4cabdb
move node installation further up
2017-01-18 13:40:48 -05:00
Devin Howard
38004c1f1f
fix npm install isntructions
2017-01-18 13:34:32 -05:00
Devin Howard
cd796f3ade
gist for unicode error on db:setup
2017-01-18 13:25:50 -05:00
Devin Howard
c57015cb15
rvm install needs sudo
2017-01-18 13:16:33 -05:00
Devin Howard
9223295320
add node source
2017-01-18 13:14:39 -05:00
