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

567bc9d69d Merge pull request #1145 from metamaps/feature/lower.case.headings Connor Turland 2017-10-04 11:22:33 -0400
15f512efef improve notificationbox readability Connor Turland 2017-09-29 14:05:39 -0400
5e6fb6290c refactor for clarity Connor Turland 2017-09-29 13:06:33 -0400
8695297a0f wasn't using the proper serializer causing frontend error Connor Turland 2017-09-29 13:06:19 -0400
216a19476b add hover states and empty case Connor Turland 2017-09-28 12:28:33 -0400
a0c9530c91 Update index.js Connor Turland 2017-09-25 16:01:25 -0400
277644f59d improve styling, fix index notifs page Connor Turland 2017-09-25 15:21:04 -0400
0ffc01b3fb Merge pull request #1144 from metamaps/feature/hide-learn-markdown Connor Turland 2017-09-25 14:46:44 -0400
9471efb6bd hide "learn markdown" unless you're editing the topic card desc Devin Howard 2017-09-23 13:19:43 -0700
8f5d9f2c67 no comments? test-codeclimate Devin Howard 2017-09-23 12:47:37 -0700
c9bf245c85 ok Devin Howard 2017-09-23 12:46:26 -0700
edda8b6989 fix Devin Howard 2017-09-23 12:46:11 -0700
3483e628f6 fix Devin Howard 2017-09-23 12:44:18 -0700
bb1cbef0f8 test codeclimate yml change Devin Howard 2017-09-23 12:42:14 -0700
e0eb3e6333 fix pathname feature/pan-zoom-in-url Devin Howard 2016-12-31 12:07:53 -0500
6bbd35d644 cache path name to avoid race conditions when updating url Devin Howard 2016-12-18 17:11:49 -0500
d219bde48d rework debouncing and lodash in Visualize.js Devin Howard 2016-12-18 16:55:41 -0500
e30d05f71d fix initial scale/translate algorithm Devin Howard 2016-12-18 16:14:39 -0500
7af5972765 monkey patch scale/translate functions so they update the URL Devin Howard 2016-12-11 19:01:48 -0500
75e41619eb enable specifying scale/translate in query params for a map Devin Howard 2016-10-30 13:59:23 +0800
2e5750e91e socket.io upgraded to 1.7.2 feature/update-backbone-and-socket.io Devin Howard 2017-01-22 15:01:24 -0500
fc8ac6eef1 nest inconsistent data under data key Connor Turland 2017-09-23 11:20:02 -0400
9cc700c64d use decorator pattern for notifs api Connor Turland 2017-09-22 18:38:38 -0400
64ffc78f45 add the container for the notifications dropdown Connor Turland 2017-09-19 23:48:46 -0400
322da431eb Merge pull request #1139 from metamaps/feature/right.click.react Connor Turland 2017-09-19 11:49:30 -0400
3c7c8812a4 tempplate strings and new lines Connor Turland 2017-09-19 11:46:19 -0400
0d6963ebb0 eslint Connor Turland 2017-09-19 10:16:14 -0400
c4d0bf8ce4 clean up jquery ref and strings Connor Turland 2017-09-19 10:02:05 -0400
3406f2e04d make render a callback and use async apply for ease of use Connor Turland 2017-09-19 09:58:59 -0400
a4c905df4e move each li into its own function Connor Turland 2017-09-19 09:04:21 -0400
5f1fe4dc3f reimplement shifting menu according to click position Connor Turland 2017-09-19 08:37:00 -0400
2515073393 replace old edgeRightClick code Connor Turland 2017-09-19 00:46:23 -0400
a04cd0d395 call the right callbacks and show in the right context Connor Turland 2017-09-19 00:34:37 -0400
da9e44afa0 clear the right click menu the right way Connor Turland 2017-09-18 23:49:35 -0400
e290244404 beginning to come together Connor Turland 2017-09-18 23:30:33 -0400
6e1878413f wip right click in react Connor Turland 2017-09-12 15:17:15 -0400
77846cfcb7 missing period for consistency Connor Turland 2017-09-18 16:59:52 -0400
1ffc513617 Merge pull request #1137 from metamaps/feature/improve.desc Connor Turland 2017-09-17 16:25:53 -0400
3886e62a7b make desc edit area larger and resizable Connor Turland 2017-09-17 09:01:44 -0400
ad2ba33db6 downgrade redis to 3.3.3 Devin Howard 2017-09-16 13:41:50 -0700
cf9f54c738 tag v3.5 v3.5 Devin Howard 2017-09-16 12:27:02 -0700
f323796030 Merge pull request #1132 from metamaps/feature/mod.follow Connor Turland 2017-09-13 22:45:50 -0400
a080b82e7f Merge pull request #1133 from metamaps/feature/topic.follow Connor Turland 2017-09-13 10:32:44 -0400
1174123b60 use scss vars and font fallbacks Connor Turland 2017-09-13 10:31:48 -0400
35f77129ad email job needs to respect active as well Connor Turland 2017-09-13 10:20:25 -0400
a56991aede add exception notifier for failed jobs Connor Turland 2017-09-13 10:11:04 -0400
672b456193 add markdown clarifications Connor Turland 2017-09-12 21:37:49 -0400
21518c8696 revert react router update and webpack config Connor Turland 2017-09-12 17:07:57 -0400
29bf2a23e8 review changes Connor Turland 2017-09-12 17:01:08 -0400
61eac509de Merge branch 'develop' into feature/topic.follow Connor Turland 2017-09-10 18:16:11 -0400
4cc420eb63 eslint fixes Connor Turland 2017-09-10 18:13:25 -0400
ec3e09c578 topic card design changes Connor Turland 2017-09-10 17:17:56 -0400
3e03e0ebbf update npm/gem dependencies (#1131) Devin Howard 2017-09-09 09:38:18 -0700
05d62e615e eslint? Devin Howard 2017-09-09 09:30:20 -0700
5c01754df1 fix test support Devin Howard 2017-09-09 09:29:05 -0700
c0021c7d40 fix sinon Devin Howard 2017-09-08 23:39:13 -0700
7bdf04ab9e move to react prop-types package and fix jsdom usage Devin Howard 2017-09-08 23:18:52 -0700
b7abfec8c0 update npm/gem dependencies Devin Howard 2017-09-07 08:22:28 -0700
9ab7e7e170 topic card re-org Connor Turland 2017-09-08 16:58:17 -0400
5af2b8f216 add active scope to follows model Connor Turland 2017-09-08 13:17:42 -0400
8af66b1b2c Merge pull request #1130 from metamaps/feature/release.notifs Connor Turland 2017-09-03 18:44:33 -0400
9b2193ad8c show autofollow on client and mute on unfollow Connor Turland 2017-09-03 15:11:52 -0400
1a8c7810be fix eslint issue picked up by codeclimate Connor Turland 2017-09-03 09:13:15 -0400
d87bb7c75c make notifs and follows work for all users Connor Turland 2017-09-03 09:07:29 -0400
aceb3ff31e Merge pull request #1129 from metamaps/feature/map.activity.improved Connor Turland 2017-09-03 08:33:13 -0400
f26c6cf0b7 Merge pull request #1128 from metamaps/feature/prevent.notif.fork Connor Turland 2017-09-03 08:29:03 -0400
42f4ecb37b added bg color to sections Connor Turland 2017-09-03 08:27:05 -0400
64f4249f44 add comment Connor Turland 2017-09-02 14:12:07 -0400
958bd8c70c improve email styling for release Connor Turland 2017-09-02 14:06:23 -0400
3830946723 dont send notif for each topic of forked map Connor Turland 2017-09-02 09:59:21 -0400
bacaf75db3 NTREE_DATA is a topic too feature/xml-schema-import Devin Howard 2017-08-21 20:18:33 -0700
1102218720 add two test cases to specify XMLParser::parseSchema behaviour Devin Howard 2017-08-21 19:46:39 -0700
b87482cb48 skeleton code to parse XML. Still need: Devin Howard 2017-08-21 08:35:55 -0700
3482e799fd Merge pull request #1127 from metamaps/update-docs Connor Turland 2017-07-26 09:26:59 -0700
e016b923a4 Update WindowsInstallation.md Connor Turland 2017-07-26 09:25:41 -0700
bb546779cd Update VagrantInstallation.md Connor Turland 2017-07-26 09:24:51 -0700
3829d32390 Update UbuntuInstallation.md Connor Turland 2017-07-26 09:22:34 -0700
9783a5ee1e Update MacInstallation.md Connor Turland 2017-07-26 09:22:06 -0700
12fc0c71f6 Update README.md Connor Turland 2017-07-26 09:21:16 -0700
c2cb8949eb Create VagrantInstallation.md Connor Turland 2017-07-25 17:22:27 -0700
4e7bf02749 Update README.md Connor Turland 2017-07-25 17:19:17 -0700
3203c2b4d0 de-prioritize vagrant docs, as its no longer our setup of choice Connor Turland 2017-07-25 17:18:07 -0700
1ec9dc20e4 Update MacInstallation.md Connor Turland 2017-07-25 17:07:46 -0700
1af4728073 Update UbuntuInstallation.md Connor Turland 2017-07-25 17:06:27 -0700
785e16eeae make Vagrantfile realtime server port match default Connor Turland 2017-07-25 16:57:37 -0700
d08cb3f95e Update UbuntuInstallation.md Connor Turland 2017-07-25 16:52:11 -0700
271fc7ebd0 Update MacInstallation.md Connor Turland 2017-07-25 16:47:33 -0700
9d590295cb Update WindowsInstallation.md Connor Turland 2017-07-25 16:44:40 -0700
dc4d44951e Update UbuntuInstallation.md Connor Turland 2017-07-25 16:41:47 -0700
767414ad9f Update MacInstallation.md Connor Turland 2017-07-25 16:37:16 -0700
1ec897b8c8 Update MacInstallation.md Connor Turland 2017-07-17 20:45:34 -0700
00e2aefb4e Delete ISSUE_TEMPLATE.md Connor Turland 2017-07-16 20:50:14 -0700
aec0f104b8 Merge pull request #1121 from JohnGillanders/develop Connor Turland 2017-07-09 23:32:41 -0700
db6d2e77da Merge pull request #1 from metamaps/develop John Gillanders 2017-07-04 12:59:20 +1200
9585dce511 Update README.md John Gillanders 2017-07-04 12:49:28 +1200
78acd7e0b0 fix NoMethodError in mappings after_created when synapse's topic1/topic2 are nil Devin Howard 2017-05-20 10:57:52 -0700
328c1a14f3 mark v3.4.1 one commit too late Devin Howard 2017-05-13 19:32:51 -0700
10ac64c574 before destroy callback on maps to remove source_id foreign key relations (#1119) v3.4.1 Devin Howard 2017-05-13 19:26:43 -0700
f9d628cf9b before destroy callback on maps to remove source_id foreign key relations Devin Howard 2017-05-13 14:12:55 -0700
3b04e19196 Merge 39d28ee136 into edce66c44d Devin Howard 2017-05-13 17:50:55 +0000