Connor Turland
f49a674566
tweaks for developing on this branch
2017-02-06 03:41:28 +00:00
Connor Turland
7951f08e45
Merge branch 'develop' into feature/convo.algo
2017-02-06 03:36:26 +00:00
Connor Turland
0441850504
Secret.convo ( #1059 )
...
* set up for using secret css/js
* testing
* add stuff
* final tweak for secret convos
* looks like its all working
* realized this change is just good all around
* minor touch ups
* only us for now
* no longer validate presence of xloc/yloc
* fix syntax issue
2017-02-05 14:30:23 -05:00
Connor Turland
72fd2717b6
Merge branch 'develop' into feature/convo.algo
2017-02-05 05:26:58 +00:00
Devin Howard
b16617286f
revert back to jquery 1 to fix best in place
2017-01-23 19:50:59 -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
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
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
Connor Turland
bf9b25da9f
merge develop
2017-01-04 10:50:59 -05:00
Connor Turland
3868910dde
Stream map related events from rails server via actioncable instead of nodejs ( #1010 )
...
* actioncable needs puma not webrick
* add framework
* remove the old way
* send events from server to client
* get all events working
* clean up receivable
* map is polymorphic on message
* add the moved event
* make todo comments clear
* verify before streaming from map channel
* rubocop fixes
* wasn't set up correctly for nodejs realtime
2017-01-03 16:12:58 -05:00
Devin Howard
01cd624bfa
add polyfill so chrome 49 can upload map thumbnail screenshots ( #946 )
2016-12-06 12:36:06 -05:00
Devin Howard
4533a0f2fe
merge changes from metamapscc instance branch ( #913 )
...
* homepage video fallback
* public/50x.html
* remove blog from public/ html pages
* remove video file since it's on metamaps.cc server
* eslint
2016-11-09 09:34:10 -05:00
Devin Howard
518782e1c7
remove Metamaps.Erb
2016-11-07 14:55:20 -05:00
Devin Howard
bc1f212c93
fix tab/shift-tab for metacode selection ( #879 )
2016-10-30 00:08:51 +08:00
Devin Howard
a63cd02bc6
fix develop branch bug
2016-10-23 22:51:16 +08:00
Devin Howard
5db8e27496
make metacode selector reliable after switching metacode sets ( #816 )
2016-10-23 22:11:26 +08:00
Devin Howard
261ed49977
replace uservoice with docs.metamaps.cc + Hylo ( #777 )
...
* replace uservoice with docs.metamaps.cc + Hylo
* re-add the feedback tab as link to hylo
2016-10-19 13:39:57 -04:00
Connor Turland
139837e997
restructure realtime server for clarity ( #780 )
...
* restructure realtime server for clarity
* better indenting on signal.js
* don't need it because socketioconnection is being imported now
2016-10-18 20:29:21 -04:00
Connor Turland
517cfcb913
remove static lib files in favor of npm ones ( #773 )
...
* remove static lib files in favor of npm ones
* update howler to work correctly
* patch npm modules to not use window
2016-10-17 10:39:08 -04:00
Devin Howard
0ee1b3284a
fix check-canvas-support require
2016-10-17 13:47:42 +08:00
Devin Howard
179849b639
remove check-canvas-support.js
2016-10-17 11:42:11 +08:00
Devin Howard
9ac24f7468
Merge pull request #744 from metamaps/feature/markdown-in-topic-cards
...
markdown in topic card description field
2016-10-08 16:58:32 +08:00
Devin Howard
fe1c57b458
further updates - make Enter update bip fields whaaat
2016-10-08 16:55:46 +08:00
Devin Howard
0764133d11
Merge pull request #661 from metamaps/feature/file-upload-component
...
set up a dialog box to help with import/export
2016-10-08 12:34:28 +08:00
Devin Howard
0085ce71e6
upgrade to best in place 3.0.0 alpha
2016-10-08 09:24:16 +08:00
Connor Turland
85dcad928f
enable pulling in of references to maps through typeahead ( #636 )
2016-10-06 09:12:01 -04:00
Devin Howard
518773d6e1
pop up a lightbox using React to help you export
2016-10-06 16:22:21 +08:00
Devin Howard
5819447828
fix git versioning
2016-09-25 19:35:37 +08:00
Devin Howard
bda740491c
moved JIT to npm. tests pass. whoop whoop
2016-09-23 11:59:23 +08:00
Devin Howard
07e4ac3865
attempt to get npm testing working; fail
2016-09-23 10:37:59 +08:00
Connor Turland
f59a5775ae
tweaks to import/exports
2016-09-22 20:16:18 -04:00
Devin Howard
30894a313f
move views to their own frontend folder
2016-09-23 00:07:30 +08:00
Devin Howard
a4d31241a8
move Metamaps code into webpack
2016-09-22 14:28:20 +08:00
Connor Turland
2219e0d0dd
Update Metamaps.Topic.js
2016-09-21 14:53:17 -04:00
Devin Howard
1efd78ad7b
initial attempt at focussing input field when entering multiple topics
2016-09-21 14:27:49 +08:00
Devin Howard
49084b98dd
omg import bookmarks 😍
2016-09-21 10:48:47 +08:00
Devin Howard
fac59f346f
fix topic init function
2016-09-21 10:24:57 +08:00
Devin Howard
ec96d69876
refactor import view:
...
-Paste Input wrapper class to abstract away getting input
-Add ability to drop files in PasteInput
-Add ability to drop .webloc files or paste a link to create a new topic with that link in the link and desc fields
2016-09-21 10:11:08 +08:00
Devin Howard
9515152315
move auto layout function into its own file
2016-09-21 10:10:08 +08:00
Connor Turland
ce7c88c78c
add more space between nodes using auto-layout
2016-09-20 12:27:46 -04:00
Connor Turland
74630c2631
messed up comment
2016-09-20 12:04:42 -04:00
Connor Turland
966dd79187
Merge branch 'develop' into feature/better.select
2016-09-20 11:55:25 -04:00
Connor Turland
aace6796f5
allow topic carousel to be pinned open ( #643 )
...
* so that rapid topic creation can happen in succession
* close when map closes
2016-09-19 20:30:34 -04:00
Connor Turland
5d04d16590
create MetacodeSelect component
2016-09-18 15:22:51 +00:00
Connor Turland
61e27a4dcb
height shouldn't stay hard set. fixes 622
2016-09-17 23:45:04 +00:00
Connor Turland
823c0c5990
no room is created if anon user ( #642 )
2016-09-17 15:06:54 -04:00
Devin Howard
4bbb9df5af
can't use ` with uglify
2016-09-14 10:45:42 +08:00
Devin Howard
40cb7606e3
enable metamaps.debug whoops
2016-09-13 15:21:00 +08:00
Connor Turland
6b2887e8da
namespace the event listeners to turn them off ( #637 )
2016-09-11 18:47:59 -04:00
Connor Turland
d3bc3e3d18
dont change home link in the mapper profile case
2016-09-10 00:29:10 +00:00
