metamaps--metamaps

glenux-contrib/metamaps--metamaps

Fork 0

Commit graph

Select branches

Hide pull requests

add-user-route

backup/mailboxer

develop

feature/better.select

feature/browser-support

feature/convo.algo

feature/copy-paste

feature/emoji-fixes

feature/export.streaming

feature/extract.front.end

feature/flex.permission.styling

feature/import.export.more.parsers

feature/jit.react

feature/json

feature/latest.viewed

feature/limit.delete

feature/new.home

feature/overhaul-synapse-creation

feature/pan-zoom-in-url

feature/particles

feature/reconstruct

feature/refactor.jit

feature/thinner-topic-titles

feature/topic-card-uploads

feature/update-backbone-and-socket.io

feature/update-windows-docs

feature/uploads-api

feature/xml-schema-import

fix-null-pointer

frontendonly

homepage.good

instance/metamapscc

instance/synbioleap

instance/thevalueweb

instance/uts

master

rails-5.1

rubocop-fixes

stub-import-for-tests

test-codeclimate

#1010

#1011

#1013

#1019

#1021

#1022

#1025

#1026

#1027

#1028

#1029

#1030

#1031

#1036

#1037

#1038

#1039

#1040

#1040

#1042

#1043

#1044

#1045

#1045

#1046

#1047

#1048

#1050

#1051

#1053

#1054

#1058

#1059

#1060

#1060

#1063

#1064

#1065

#1066

#1069

#1070

#1071

#1072

#1073

#1074

#1078

#1080

#1081

#1083

#1084

#1086

#1088

#1089

#1090

#1091

#1099

#1101

#1102

#1103

#1106

#1109

#1112

#1112

#1115

#1116

#1117

#1117

#1119

#1121

#1127

#1128

#1129

#1130

#1131

#1132

#1133

#1137

#1139

#1142

#1144

#1145

#1148

#1149

#1150

#1151

#1152

#1153

#1154

#1154

#1155

#1156

#1157

#1158

#1158

#1159

#1159

#1160

#1161

#1161

#1162

#1163

#1164

#1165

#1166

#1167

#1168

#1169

#1170

#1172

#1173

#1173

#1174

#1175

#1175

#1178

#1178

#303

#317

#319

#342

#361

#362

#364

#364

#365

#370

#371

#376

#377

#378

#380

#381

#382

#383

#397

#397

#400

#400

#402

#402

#404

#406

#407

#407

#408

#408

#411

#412

#414

#414

#415

#416

#416

#417

#418

#419

#419

#420

#421

#440

#442

#442

#443

#443

#446

#446

#447

#448

#449

#449

#450

#451

#455

#456

#459

#460

#460

#461

#470

#472

#473

#474

#476

#477

#478

#480

#480

#481

#482

#483

#484

#487

#488

#489

#490

#491

#493

#496

#496

#497

#497

#498

#499

#500

#505

#506

#509

#519

#520

#522

#523

#526

#528

#529

#530

#533

#535

#536

#542

#542

#543

#544

#545

#546

#547

#548

#549

#550

#551

#552

#553

#556

#557

#558

#559

#562

#563

#564

#564

#565

#568

#572

#573

#574

#575

#576

#577

#578

#582

#583

#586

#587

#588

#589

#591

#591

#592

#593

#594

#597

#598

#599

#601

#603

#605

#606

#607

#608

#609

#610

#611

#615

#617

#618

#618

#620

#621

#626

#628

#628

#630

#633

#634

#636

#637

#639

#640

#641

#642

#643

#644

#644

#648

#649

#650

#651

#652

#653

#654

#655

#656

#659

#660

#661

#662

#663

#665

#667

#668

#669

#670

#672

#673

#674

#675

#676

#677

#678

#679

#681

#682

#683

#685

#687

#688

#689

#690

#691

#693

#695

#696

#697

#698

#699

#702

#707

#708

#709

#710

#714

#715

#716

#717

#718

#719

#724

#729

#730

#731

#732

#733

#734

#738

#739

#739

#740

#744

#747

#748

#751

#752

#753

#756

#757

#758

#760

#762

#764

#767

#768

#769

#770

#771

#772

#773

#774

#775

#777

#778

#779

#780

#781

#786

#787

#791

#792

#793

#795

#796

#804

#813

#814

#815

#816

#820

#825

#828

#839

#840

#841

#842

#844

#850

#851

#852

#854

#854

#858

#859

#860

#862

#863

#869

#870

#872

#874

#878

#879

#880

#883

#883

#884

#885

#893

#894

#897

#898

#899

#901

#902

#906

#910

#911

#913

#915

#916

#916

#919

#921

#922

#923

#926

#928

#928

#929

#930

#931

#932

#933

#934

#937

#941

#944

#946

#947

#950

#956

#956

#968

#970

#971

#971

#973

#984

#985

#985

#989

#991

#991

#994

#997

#999

#999

3.0.3

3.4

v2.6

v2.7

v2.7.1

v2.7.2

v2.8

v2.8.1

v2.8.2

v2.8.3

v2.8.4

v2.8.5

v2.8.6

v2.9.0

v2.9.1

v3.0

v3.0.1

v3.0.3

v3.0.4

v3.1

v3.2

v3.3

v3.4

v3.4.1

v3.5

v3.6

v3.6.1

17ce74e473 update signature of coord/pixel functions in Util.spec.js Devin Howard 2016-10-26 14:12:52 +0800
0f76d83a6e fix pixelsToCoords and coordsToPixels function calls Devin Howard 2016-10-26 14:06:54 +0800
f5712e6979 fix getPastelColor function (I think) Devin Howard 2016-10-26 13:53:58 +0800
460c6097c1 fix topic card title word break css Devin Howard 2016-10-26 08:40:28 +0800
8a95262f2c allow anonymous users to GET api routes (#842) Devin Howard 2016-10-26 08:37:23 +0800
ed89f80f49 Update README.md Robert Best 2016-10-25 14:24:10 -0400
db0f9b180d open up GET routes on maps/topics/synapses and update api docs Devin Howard 2016-10-25 16:50:39 +0800
eaa9a662c3 test for logged out maps GET api Devin Howard 2016-10-25 16:46:06 +0800
4875a8b0c4 make map methods use ActiveRecord relations so they don't error on pundit Devin Howard 2016-10-25 16:44:01 +0800
8eee4495b5 handle policy_scope returning nil in application serializer Devin Howard 2016-10-25 12:47:55 +0800
0ba69f34a5 fix hard coded topics - whoops Devin Howard 2016-10-25 12:41:22 +0800
4f312d7c21 policy scope has_many relationships Devin Howard 2016-10-25 10:35:19 +0800
4b2ecc3fac token overrides current user in api Devin Howard 2016-10-25 10:35:10 +0800
47bca5907e add tests for Metamaps.Util (#825) Devin Howard 2016-10-25 12:28:51 +0800
5163794698 anonymous users are nil, so need to remove the raise (#841) Devin Howard 2016-10-25 12:26:22 +0800
0990c57f4f anonymous users are nil, so need to remove the raise Devin Howard 2016-10-25 10:49:43 +0800
0b6348e13f This fix closes the topic creation spinner when the map is panned. (Since, sometimes a click turns into a really small pan) (#828) Robert Best 2016-10-24 11:48:34 -0400
a7d6e4fec3 This fix closes the topic creation spinner when the map is panned. (Since, sometimes a click turns into a really small pan) Robert Best 2016-10-24 15:19:55 +0000
ce1205f6d7 one more mapper card style fix Connor Turland 2016-10-24 14:35:23 +0000
96d25cc91d mapper profile mobile styling Connor Turland 2016-10-24 14:23:05 +0000
a9ef6feebd mapper page bug fix and styling Connor Turland 2016-10-24 13:42:26 +0000
6bd577e42e eslint Devin Howard 2016-10-24 16:52:15 +0800
7b67066f7d remove dead code Devin Howard 2016-10-24 10:58:05 +0800
ad5200a62b more Util tests Devin Howard 2016-10-24 10:51:26 +0800
1809293031 first few Util tests Devin Howard 2016-10-20 18:49:11 +0800
58fe65a4af decouple Util from other Metamaps modules Devin Howard 2016-10-20 18:17:28 +0800
98e2de68da oooh was using ineffective media queries for desktop Connor Turland 2016-10-23 16:49:16 -0400
4c68fd90ca set useful num for desc truncation on map cards Connor Turland 2016-10-23 16:30:54 -0400
cda0c21a0b make it responsive (#820) Connor Turland 2016-10-23 16:12:07 -0400
175facb329 make it responsive Connor Turland 2016-10-23 16:04:48 -0400
a44edbb17e better transition from map to explore Connor Turland 2016-10-23 11:44:20 -0400
aa96d074af dont show import on topic page Connor Turland 2016-10-23 11:21:38 -0400
4f9b9460ad don't block all right clicks Connor Turland 2016-10-23 11:12:43 -0400
a63cd02bc6 fix develop branch bug Devin Howard 2016-10-23 22:51:16 +0800
fb6c8a74a7 scoping on topic json properties (#813) Devin Howard 2016-10-23 22:11:38 +0800
5db8e27496 make metacode selector reliable after switching metacode sets (#816) Devin Howard 2016-10-23 22:11:26 +0800
87dc20fa50 stop showing map info box on topic view (#815) Devin Howard 2016-10-23 22:07:38 +0800
dbf72c03b8 make metacode selector reliable after switching metacode sets Devin Howard 2016-10-23 22:05:06 +0800
8465686d48 stop showing map info box on topic view Devin Howard 2016-10-23 21:10:07 +0800
154257d062 fix Ctrl+A (#814) Devin Howard 2016-10-23 18:02:59 +0800
639807f945 fix Ctrl+A Devin Howard 2016-10-23 17:24:20 +0800
910518b2f6 scoping on topic json properties Devin Howard 2016-10-23 16:52:57 +0800
497c6ae017 spelling mistake fix Connor Turland 2016-10-22 15:16:55 -0400
9600983311 remove Connor thinking out loud comment Connor Turland 2016-10-22 11:07:50 -0400
cbcdd912c9 Comments were for non-redux scenario Connor Turland 2016-10-22 11:04:14 -0400
1d13da4ab5 Update README.md Connor Turland 2016-10-22 10:59:43 -0400
d359eb063a fixed the oauth redirect bug and a bit more (#796) Connor Turland 2016-10-22 04:46:39 -0400
4187dbd803 fix it up (#804) Connor Turland 2016-10-22 03:58:19 -0400
d50c7e8b93 fix it up Connor Turland 2016-10-22 03:56:41 -0400
d549083cce prefer variable height lightbox over scrolling visually Connor Turland 2016-10-22 03:10:33 -0400
bc8660c83e remove about lightbox in prep for homepage redo and about page Connor Turland 2016-10-22 03:10:09 -0400
c0b35280f6 Middle.mouse.click features (Open contained link & copy text to clipboard) (#792) Robert Best 2016-10-22 02:58:13 -0400
e93d7e4ccc fixed merge conflict with develop Robert Best 2016-10-22 06:55:02 +0000
31078c554e just make it 'tutorial' Connor Turland 2016-10-22 02:41:36 -0400
6911c56709 Update Util.js Robert Best 2016-10-22 02:41:16 -0400
03ef93bf0c Update index.js Robert Best 2016-10-22 02:40:38 -0400
8d3a45bb17 Update JIT.js Robert Best 2016-10-22 02:40:01 -0400
e761655df8 Update JIT.js Robert Best 2016-10-22 02:32:41 -0400
ea20ba45b3 Merge pull request #738 from metamaps/window.resize.fix Robert Best 2016-10-22 02:12:54 -0400
26fe5fed4e fixed the oauth redirect bug and a bit more Connor Turland 2016-10-22 01:54:10 -0400
37b989c38e Update Listeners.js Robert Best 2016-10-22 01:52:43 -0400
759ec7845b cleaned up the window resize function even further Robert Best 2016-10-22 05:50:31 +0000
cfb8f51214 simplified the window resize function by adding a Util function that logs the canvas attributes. Robert Best 2016-10-22 05:21:32 +0000
1cd7e22c40 Merge commit '858ca66d69ed9e43f4d3a4ce6be288508cf4efa1' of github.com:metamaps/metamaps into window.resize.fix Robert Best 2016-10-22 05:00:10 +0000
ad1889dfc5 Merge branch 'develop' of github.com:metamaps/metamaps into window.resize.fix Robert Best 2016-10-22 04:54:31 +0000
cbc8e6cdd4 the return of the infinite scroll (#795) Connor Turland 2016-10-22 00:15:10 -0400
c4d52e71fe the return of the infinite scroll Connor Turland 2016-10-22 00:01:24 -0400
f8556c30a5 resize every time it renders Connor Turland 2016-10-21 19:10:28 -0400
8af1e69460 undo last commit, don't need for rails5 Connor Turland 2016-10-21 18:25:07 -0400
d1e8ecbf3b readd 12factor for debugging on heroku Connor Turland 2016-10-21 18:22:15 -0400
8e38469b1f add border radius to mapper list Connor Turland 2016-10-21 18:10:37 -0400
abb997c75c some quick fixes for realtime server after devins refactor Connor Turland 2016-10-21 18:04:18 -0400
be8efa6025 add card features (#793) Connor Turland 2016-10-21 17:42:21 -0400
439527c464 Merge pull request #724 from metamaps/feature/edge.shift Robert Best 2016-10-21 17:03:25 -0400
f68deea202 changed all logical operators to be more strict Robert Best 2016-10-21 20:59:16 +0000
b61cdb04fc Fixed the glitchyness, and made it suitable to merge with develop Robert Best 2016-10-21 20:47:14 +0000
5c67fcbff7 this time I actually addressed the conflicts Robert Best 2016-10-21 20:38:17 +0000
2eeb0a671f Fixed cherry pick conflicts Robert Best 2016-10-05 09:17:45 +0000
2ba5384599 add card features Connor Turland 2016-10-21 13:59:33 -0400
071294bfa9 Update Util.js Robert Best 2016-10-21 10:20:51 -0400
d74f232570 Update JIT.js Robert Best 2016-10-21 10:20:16 -0400
76f4e796da changed the code to be based off of the current dev branch Robert Best 2016-10-21 13:51:28 +0000
fb427a11f0 [WIP] keep client fresh with junto info globally (#791) Connor Turland 2016-10-21 09:29:04 -0400
1e96f2fff2 i think this makes realtime work without needing babel-node Devin Howard 2016-10-21 15:18:37 +0800
689ac34584 remove object rest spread Devin Howard 2016-10-21 15:15:20 +0800
1d801f036f eslint stuff Devin Howard 2016-10-21 15:02:53 +0800
5471c2a350 little fixes Connor Turland 2016-10-21 02:50:52 -0400
3c885b35ac junto status is live on map cards XD Connor Turland 2016-10-21 02:17:32 -0400
b26fe651db push state to client Connor Turland 2016-10-21 00:59:02 -0400
7a09a1c620 last commit broke stuff Connor Turland 2016-10-20 18:27:14 -0400
103ed5cbd7 max at 4, use fewer if not enough maps Connor Turland 2016-10-20 18:09:20 -0400
b1a7e548a2 add email/twitter links Devin Howard 2016-10-20 07:01:15 +0800
52c340b8f5 center the explore maps div! (#787) Connor Turland 2016-10-19 14:40:42 -0400
8a4ae45cb8 will add displayStyle again later if we actually build it Connor Turland 2016-10-19 18:39:17 +0000
440fdced73 ooh baby Connor Turland 2016-10-19 18:37:31 +0000
9299ca5f2c dont do translate with arrow keys till we can block conflicts Connor Turland 2016-10-19 17:47:10 +0000
261ed49977 replace uservoice with docs.metamaps.cc + Hylo (#777) Devin Howard 2016-10-20 01:39:57 +0800
1d3e328801 re-add the feedback tab as link to hylo Connor Turland 2016-10-19 17:38:40 +0000
e2d9b6aef2 Merge pull request #786 from metamaps/fix/empty-autocomplete Devin Howard 2016-10-19 22:16:26 +0800
1042fb020d Merge pull request #778 from metamaps/feature/auto-copy-invite-link Devin Howard 2016-10-19 22:15:21 +0800