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

beb52bc471 fix topic view keyboard shortcuts (#597) Devin Howard 2016-08-09 23:53:50 +0800
19a876eb76 make heroku work 4 realz Devin Howard 2016-08-09 22:57:57 +0800
0124c87ec3 update topic url and Metamaps.Active.Topic when you center Devin Howard 2016-08-09 22:49:19 +0800
797a4f210a fetchRelatives recursively handles arrays Devin Howard 2016-08-09 22:40:43 +0800
471fb03bb2 change delete behaviour to be smarter Devin Howard 2016-08-09 22:20:12 +0800
7814ce153c topic view shortcuts switch to Alt Devin Howard 2016-08-09 22:15:21 +0800
2c0ae7e84d fix topic view selection crash on centerAndReveal Devin Howard 2016-08-09 22:12:05 +0800
4478ca43b8 Merge pull request #594 from metamaps/feature/fix-heroku Devin Howard 2016-08-09 20:35:06 +0800
b9247d2692 multi-buildpack setup for heroku: Devin Howard 2016-08-08 21:58:23 +0800
3b24165fd0 Merge pull request #589 from metamaps/feature/topicview-remove-topics Devin Howard 2016-08-08 21:46:15 +0800
9cedf69432 fetch siblings & center topic keyboard shortcuts - fixes #466 (#588) Devin Howard 2016-08-08 21:46:05 +0800
3050f1413a Merge pull request #587 from metamaps/feature/topicview-selection-box Devin Howard 2016-08-08 21:43:22 +0800
5510cb2e99 enable removal of topics from topic view - fixes #467 Devin Howard 2016-08-07 15:34:30 +0800
1e0e77d1e5 zoom extents back to Ctrl+E and use e.preventDefault Devin Howard 2016-08-08 21:37:05 +0800
fc3fc00821 update keyboard shortcuts to Ctrl+E, Ctrl+R, and Ctrl+T, and update docs Devin Howard 2016-08-08 21:34:27 +0800
3b65ad923b only show travis build status badge for develop branch Devin Howard 2016-08-07 21:26:53 +0800
713063e578 fix npm testing script - it will actually break travis now Devin Howard 2016-08-07 19:51:17 +0800
b66b75615a remove frontend folder reference from travis Devin Howard 2016-08-07 19:40:26 +0800
77e8716588 Merge branch 'master' into develop Devin Howard 2016-08-07 17:23:57 +0800
fcc1dbdd11 Merge pull request #592 from metamaps/fix/synapse-import Devin Howard 2016-08-07 17:21:21 +0800
23543ac7ad fix: synapse import fails if synapses are missing desc Devin Howard 2016-08-07 17:18:54 +0800
3d1c258abe Merge 2ef9849dde into 52cbd57367 Devin Howard 2016-08-07 09:17:41 +0000
2ef9849dde fix: synapse import fails if synapses are missing desc Devin Howard 2016-08-07 17:17:21 +0800
5e9e443729 add keyboard shortcut labels Devin Howard 2016-08-07 15:03:10 +0800
5d66c72941 fetch siblings & center topic keyboard shortcuts - fixes #466 Devin Howard 2016-08-07 14:38:48 +0800
d778016571 fix selection box on radial view - fix #463 Devin Howard 2016-08-07 13:17:25 +0800
00c54b7d66 fix another react bug Devin Howard 2016-08-05 10:13:55 +0800
980fca9844 remove spread syntax Devin Howard 2016-08-05 09:32:16 +0800
2274155801 split out a separate MapLink component for code reuse Devin Howard 2016-08-02 09:36:48 +0800
1774f8c530 object destructure + let/const Devin Howard 2016-08-02 09:20:19 +0800
2b2f6e6dc4 add propTypes Devin Howard 2016-08-02 09:19:12 +0800
17da8441f4 fixup react setup Connor Turland 2016-08-01 16:18:34 -0400
4005b301ac uncomment commented header lines Connor Turland 2016-08-01 15:56:14 -0400
804afc3e1d remove famous leftovers Connor Turland 2016-08-01 15:38:02 -0400
ede1dfb91c made the header more generic to serve other functions Connor Turland 2016-08-01 15:33:41 -0400
30e9a27663 almost rid of famous completely Connor Turland 2016-08-01 13:38:57 -0400
aed423214f started using react instead of famous Connor Turland 2016-07-30 23:48:22 -0400
6b2386a545 progress onthe home page Connor Turland 2016-07-26 18:54:27 -0400
293e68da05 remove old stuff Connor Turland 2016-07-26 13:26:50 -0400
a6951920eb fix module.exports javascript bug Devin Howard 2016-08-04 17:08:10 +0800
69bdb0bf01 hotfix master with mappable_policy.try Devin Howard 2016-08-04 17:04:01 +0800
194a4dc975 add production schema file Devin Howard 2016-08-04 16:53:09 +0800
52cbd57367 Merge pull request #586 from metamaps/merge/master-into-develop Devin Howard 2016-08-04 10:53:00 +0800
6df8da16bc Merge branch 'master' into develop Devin Howard 2016-08-04 10:51:36 +0800
dc725c3b9a Merge pull request #583 from metamaps/fix/purple-metacodes Devin Howard 2016-08-04 10:16:04 +0800
17a9a2d23a fix jquery error and move package.json etc to root dir Devin Howard 2016-08-03 22:37:02 +0800
6eff2d91c9 fix backbone jquery Devin Howard 2016-08-03 21:25:44 +0800
d6e00372c4 remove google plus Devin Howard 2016-08-03 09:03:15 +0800
153a1c3556 update readme Devin Howard 2016-07-31 19:57:36 +0800
720f67cee7 move metacode loading earlier, and add a query string to work around amazon aws CORS issues Devin Howard 2016-08-03 08:54:10 +0800
6997142fd9 finish integrating npm. move underscore/backbone into npm management (#577) Devin Howard 2016-08-02 03:59:53 +0800
7ad537566d change underscore version Connor Turland 2016-08-01 15:59:23 -0400
4d99bd2265 allow jsx or js extension Devin Howard 2016-08-01 08:54:09 +0800
2085460c91 update docs for npm integration Devin Howard 2016-08-01 08:54:03 +0800
ad2814b14e finish integrating npm. move underscore/backbone into npm management Devin Howard 2016-08-01 08:32:32 +0800
e6954eb37a Merge pull request #574 from metamaps/fix/synapse-search-duplicates Devin Howard 2016-08-01 08:56:55 +0800
70a4f54399 switch to ruby 2.3.0 (#572) Devin Howard 2016-08-01 08:33:45 +0800
5fe03641cb move frontend code into a folder, and setup react build tooling with es6 transforms (#576) Devin Howard 2016-08-01 02:51:06 +0800
d40ddd8083 move frontend code into a folder, and setup react build tooling with es6 transforms Devin Howard 2016-07-31 23:28:56 +0800
4161f70d2e remove duplicates from synapse search Devin Howard 2016-07-31 19:30:27 +0800
eea6d454ce switch to ruby 2.3.0 Devin Howard 2016-07-31 13:31:40 +0800
7d4da81272 Update code style automatically using rubocop gem (#563) Devin Howard 2016-07-26 08:14:23 +0800
e8cd320e59 Merge 8e9baf54b6 into 17bccd809a Devin Howard 2016-07-26 00:11:54 +0000
17bccd809a Merge pull request #568 from metamaps/fix/import-export Devin Howard 2016-07-26 08:05:00 +0800
e5c9af8f95 use Wildcard if no metacode Devin Howard 2016-07-03 13:31:04 +0800
8e9baf54b6 switch to ruby 2.3.1 Devin Howard 2016-07-08 12:54:57 +0800
27942546b8 fix 2 bugs on develop (#565) Devin Howard 2016-07-02 16:32:02 +0800
39562aad7e if mappable is nil it causes an error Devin Howard 2016-07-02 09:44:32 +0800
d1792d4fd7 fix js bug Devin Howard 2016-07-02 09:40:24 +0800
872ae90832 submit new map form on Enter - fixes #555 (#562) Devin Howard 2016-07-01 16:48:38 +0800
3df6ac1bde travis y u do dis Devin Howard 2016-07-01 15:33:53 +0800
3502aa10e4 schema update - fix travis? Devin Howard 2016-07-01 15:30:20 +0800
dcd3cc6e78 fix some errors with controllers/serializers Devin Howard 2016-07-01 15:18:38 +0800
2ffd62674d update config directory for rails 5 Devin Howard 2016-07-01 15:18:18 +0800
2e49701dea fiddle with javascripts and add sprockets manifest file Devin Howard 2016-07-01 15:17:49 +0800
6d187f556a update Gemfile to rails 5 and ruby 2.3.0 Devin Howard 2016-07-01 15:16:39 +0800
f2eab9ee2d random other warnings fixed Devin Howard 2016-06-30 12:10:58 +0800
f01aed9d37 rubocop lint warnings Devin Howard 2016-06-30 12:03:31 +0800
ed47fbf5be update rubocop.yml to ignore half of the remaining cops Devin Howard 2016-06-30 11:47:37 +0800
a4aac7266d 1961 automatic rubocop fixes Devin Howard 2016-06-30 11:42:46 +0800
e5097adcbc install rubocop Devin Howard 2016-06-30 11:42:20 +0800
0072cebe51 update divs too Devin Howard 2016-06-30 11:29:39 +0800
357e21a96e submit new map form on Enter - fixes #555 Devin Howard 2016-06-30 11:24:52 +0800
6c22ebcc51 have policy_scope always use scope.all or something else to ensure it's an ActiveRecord relation Devin Howard 2016-06-28 14:49:46 +0800
b72536853f fix activemaps_path url bug (#559) Devin Howard 2016-06-20 08:31:32 +0800
f5912d511d fix activemaps_path url bug (#559) Devin Howard 2016-06-20 08:31:32 +0800
e818f494bb lol that would have been dumb Devin Howard 2016-06-20 08:26:43 +0800
dd02d221d4 skip policy scope if redirecting an explore page Devin Howard 2016-06-20 08:24:29 +0800
6028942fb8 annoying doc updates Devin Howard 2016-06-20 08:20:43 +0800
498a9bc15b fix activemaps_path url bug Devin Howard 2016-06-19 16:56:39 +0800
6e1797183e brakeman (#556) Devin Howard 2016-06-16 15:44:08 +0800
97e9f999d9 Merge branch 'master' into develop Devin Howard 2016-06-16 15:43:30 +0800
1f9078638e fix truncate bug when map desc is nil (#557) Devin Howard 2016-06-16 15:42:43 +0800
5cf3416dc6 Merge pull request #558 from metamaps/fix/truncate-bug Devin Howard 2016-06-16 15:42:36 +0800
2989406954 fix truncate bug when map desc is nil Devin Howard 2016-06-15 12:17:32 +0800
f1f0fc40d0 fix brakeman call in travis Devin Howard 2016-06-14 16:59:33 +0800
ac39de74c6 install brakeman gem for static security analysis Devin Howard 2016-06-14 16:56:33 +0800
ffa2f3d1a9 make brakeman happier and add it to travis Devin Howard 2016-06-14 16:53:54 +0800
ca68115b1f fix brakeman gem warning Devin Howard 2016-06-14 16:52:13 +0800
408f6ad866 update rails to 4.2.5.1 Devin Howard 2016-06-14 16:50:10 +0800