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

Mono Color

• 3a4fa90c49 Merge branch 'develop' into feature/convo.algo Connor Turland 2017-02-05 06:28:49 +00:00
• 3ae4072b5d add ability to keep metacode focus Connor Turland 2017-02-05 06:28:10 +00:00
• 0a52de714e make it match develop Connor Turland 2017-02-05 05:41:29 +00:00
• 597efb36e1 add this back in Connor Turland 2017-02-05 05:31:37 +00:00
• 72fd2717b6 Merge branch 'develop' into feature/convo.algo Connor Turland 2017-02-05 05:26:58 +00:00
• 2eb38edd6e testing Connor Turland 2017-02-05 05:20:06 +00:00
• 7a70ad4a73 set up for using secret css/js Connor Turland 2017-02-05 04:43:09 +00:00
• 500a74bd5f don't include the controller yet Connor Turland 2017-02-05 04:15:51 +00:00
• 2423608fd3 actually optimize the island layout Connor Turland 2017-02-05 04:08:36 +00:00
• 0929380e91 divide up the islands to the north and south Connor Turland 2017-02-05 03:34:59 +00:00
• 6e347dc33a fixup synapse creation Connor Turland 2017-02-05 03:26:18 +00:00
• 96f66a2f8c fix up topic creator Connor Turland 2017-02-04 04:27:08 +00:00
• 74dd20f02e got topic and synapse creation working Connor Turland 2017-02-04 04:13:59 +00:00
• 04036882ab do the bounds and translate Connor Turland 2017-02-03 20:58:49 +00:00
• fd54eb718a its workking Connor Turland 2017-02-03 19:58:15 +00:00
• 00ecb0f6bb Make DEL key delete selected items (With confirmation still :P ) (#1058) Robert Best 2017-02-03 14:23:04 -05:00
• 92af611e9b Merge ace0b35cbe into 45a15da896 Robert Best 2017-02-01 23:14:26 +00:00
• 5ee6441d6c made DEL key into delete shortcut Robert Best 2017-02-01 23:12:22 +00:00
• ba230e1eed only find parents for parents and children for children Connor Turland 2017-02-01 21:30:48 +00:00
• 274b86532a its vorkingg.... Connor Turland 2017-02-01 18:08:02 +00:00
• 6ed9796e05 no more matter Connor Turland 2017-02-01 17:49:16 +00:00
• 08d2cbb00d running algo each time an edge is added Connor Turland 2017-02-01 17:47:45 +00:00
• 45a15da896 fix error in loading url titles Devin Howard 2017-02-01 12:37:50 -05:00
• a8c47291cd add del key Connor Turland 2017-02-01 07:53:53 +00:00
• a96c8ae75c fix bug Devin Howard 2017-01-31 23:44:10 -05:00
• fc2604376a add the gitignore Connor Turland 2017-01-31 03:23:01 +00:00
• a137c21d2d searchfields api parameter (#1054) Devin Howard 2017-01-28 16:53:54 -05:00
• 952cf4e79f keep permission of topic/synapse in sync with map its deferring to from beginning (#1053) Connor Turland 2017-01-28 16:40:41 -05:00
• 53bc4ee1c8 fix mapper page (#1050) Devin Howard 2017-01-28 15:44:38 -05:00
• f09a83ebb9 searchfields api parameter Devin Howard 2017-01-28 15:37:10 -05:00
• c60f7f4525 add Story, which is on metamaps, total is now 48 Connor Turland 2017-01-28 01:04:23 -05:00
• 8df2cd8732 fix metacode names Connor Turland 2017-01-28 01:01:20 -05:00
• 3f75e436ba Update synapse.rb Connor Turland 2017-01-27 23:33:50 -05:00
• 479ccc9fd3 Update topic.rb Connor Turland 2017-01-27 23:30:52 -05:00
• 2c6da79df3 redirect /explore to / (#1051) Devin Howard 2017-01-27 15:16:31 -05:00
• 05ad6795f3 redirect /explore to / Devin Howard 2017-01-26 16:22:17 -05:00
• 7a5f74cfb9 fix mapper page Devin Howard 2017-01-26 15:57:01 -05:00
• 6e913efbae track pageloads with google analytics. fixes #1012 (#1048) Connor Turland 2017-01-25 20:57:34 -08:00
• d48f60f164 Update Router.js Connor Turland 2017-01-25 20:56:42 -08:00
• 18086090f2 track pageloads with google analytics. fixes #1012 Connor Turland 2017-01-26 00:27:26 +00:00
• db81962c91 some c9 files to gitignore Connor Turland 2017-01-26 00:24:31 +00:00
• 8330ef9679 treat cable sub/unsub as joined/left map. fixes #1035 (#1047) Connor Turland 2017-01-25 15:32:13 -08:00
• 9b3982d679 treat cable sub/unsub as joined/left map. fixes #1035 Connor Turland 2017-01-25 14:18:11 -08:00
• 696ff396b0 file attachments in db (re: #124) (#1043) Devin Howard 2017-01-24 15:10:40 -05:00
• b16617286f revert back to jquery 1 to fix best in place Devin Howard 2017-01-23 19:50:59 -05:00
• fee011bba6 fix readme bullets Devin Howard 2017-01-23 19:37:50 -05:00
• d16709e8e7 fix codeclimate style issues (#1046) Devin Howard 2017-01-23 19:30:13 -05:00
• bb2122d854 more Devin Howard 2017-01-23 17:39:21 -05:00
• 77d39e445a bunch of code climate fixes Devin Howard 2017-01-23 17:36:36 -05:00
• 0ad10c0f5a fix style of thumb button on map card (#1044) Devin Howard 2017-01-23 14:02:14 -05:00
• d9a2b2b2e0 fix style of thumb button on map card Devin Howard 2017-01-23 13:56:13 -05:00
• 94e94a62a2 rubocop Devin Howard 2017-01-23 13:43:51 -05:00
• 3007cb78c1 markdown is also plaintext Devin Howard 2017-01-23 13:42:13 -05:00
• 0b110cf469 syntax error in concern Devin Howard 2017-01-23 13:30:11 -05:00
• 8d40c03cce thumb and medium image styles" Devin Howard 2017-01-23 13:28:25 -05:00
• 52b5ecb622 factor out a bunch of file types Devin Howard 2017-01-23 13:21:44 -05:00
• d11278b63b map rdf export (fixes #1015) (#1036) Devin Howard 2017-01-22 16:42:04 -05:00
• 2652d53e9b update ruby dependencies too (#1042) Devin Howard 2017-01-22 16:41:51 -05:00
• 9a9cb44201 ugh syntax fix Devin Howard 2017-01-22 16:33:41 -05:00
• 2bf8ccbf01 brakeman Devin Howard 2017-01-22 16:31:50 -05:00
• 4a99d74fd8 rubocop Devin Howard 2017-01-22 16:28:18 -05:00
• 3cc2439df7 brakeman fix Devin Howard 2017-01-22 16:22:48 -05:00
• 3dc1db8836 file attachments in db Devin Howard 2017-01-22 15:23:24 -05:00
• f022d4ac7a typo Devin Howard 2017-01-22 15:37:16 -05:00
• 4a4e6b1e11 syntax fix Devin Howard 2017-01-22 15:11:24 -05:00
• 71155cf961 update backbone Devin Howard 2017-01-22 14:55:57 -05:00
• 54d817e461 update rubygem dependencies Devin Howard 2017-01-22 14:55:39 -05:00
• 6f5f21f255 update ontology a bit more Devin Howard 2017-01-22 14:21:45 -05:00
• 0eac267075 some code climate fixes Devin Howard 2017-01-21 15:25:53 -05:00
• 8c24b7e717 hide unused fields in rdf Devin Howard 2017-01-21 14:32:24 -05:00
• f1cf05ce75 fix rdf syntax errors Devin Howard 2017-01-21 14:01:55 -05:00
• 3f02df3564 add more rdf fields Devin Howard 2017-01-21 12:48:06 -05:00
• 609d58b0b6 implement base url thing whoo Devin Howard 2017-01-21 11:44:10 -05:00
• b9c5b59269 fix up export service Devin Howard 2017-01-21 11:13:46 -05:00
• 9c302d1779 mm Devin Howard 2017-01-19 13:58:18 -05:00
• b833ce0fbd owl Devin Howard 2017-01-19 13:56:48 -05:00
• 16a6c15725 register ttl mime type Devin Howard 2017-01-16 17:11:55 -05:00
• 2fedbc0787 simple rdf export of maps Devin Howard 2017-01-16 17:08:25 -05:00
• 2fe326e01c update backbone and socket.io Devin Howard 2017-01-21 15:37:14 -05:00
• dc8d274487 whoops, I guess we do need jquery in package.json Devin Howard 2017-01-22 14:07:04 -05:00
• 2fd972ddce ajax queue (fixes #853) (#1037) Devin Howard 2017-01-22 13:50:34 -05:00
• bba8231e8c update npm dependencies (#1038) Devin Howard 2017-01-21 15:37:14 -05:00
• 34b5c2675b exact versions of npm deps Devin Howard 2017-01-21 15:31:34 -05:00
• 64a0b52654 update npm deps Devin Howard 2017-01-21 15:30:54 -05:00
• 4d20723be1 eslint Devin Howard 2017-01-21 15:27:56 -05:00
• c379855ffb only one github dependency left Devin Howard 2017-01-21 13:56:22 -05:00
• e14b7ecc14 use ajaxq library with more github stars Devin Howard 2017-01-21 13:48:55 -05:00
• 6edcbc58ab patch ajaxq into Backbone code Devin Howard 2017-01-21 13:42:34 -05:00
• 3662f4c6fc install jquery.ajaxq from npm Devin Howard 2017-01-19 15:26:52 -05:00
• 63c83773ff jquery.ajaxq Devin Howard 2017-01-19 14:37:33 -05:00
• 1229e92feb fix bug in Debug.js Devin Howard 2017-01-21 13:34:39 -05:00
• ba3d5f07dd try to fix metamaps.debug Devin Howard 2017-01-21 13:09:26 -05:00
• d47d7e50e7 mark v3.2 on develop Devin Howard 2017-01-21 13:04:28 -05:00
• af2c6ebef1 split screenshot function/button into two parts (#1027) Devin Howard 2017-01-19 14:50:08 -05:00
• a9f19815e4 fix api embed to use the correct serializers (fix #998) (#1029) Devin Howard 2017-01-19 14:49:40 -05:00
• 460de840b6 redis server Devin Howard 2017-01-18 16:38:34 -05:00
• 36ed85312e fix crontab Devin Howard 2017-01-18 16:29:52 -05:00
• 991c4cabdb move node installation further up Devin Howard 2017-01-18 13:40:48 -05:00
• 38004c1f1f fix npm install isntructions Devin Howard 2017-01-18 13:34:32 -05:00
• cd796f3ade gist for unicode error on db:setup Devin Howard 2017-01-18 13:25:50 -05:00