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

• e1441acde0 synapse wasn't updating calculated_permission Connor Turland 2016-11-08 19:50:08 +00:00
• d1f75c8c24 oops! don't change rt server port Connor Turland 2016-11-08 19:45:51 +00:00
• 83b58d43d5 only remove user once they've left all maps Connor Turland 2016-11-08 19:42:22 +00:00
• 3759851621 fix access#access route (#926) Devin Howard 2016-11-08 12:37:06 -05:00
• 0c99d000fc fix access#access route Devin Howard 2016-11-08 12:32:13 -05:00
• a176cdf231 eslint frontend folder (#923) Devin Howard 2016-11-07 15:25:08 -05:00
• 9df974a037 strip whitespace from search terms (#919) Devin Howard 2016-11-07 14:58:53 -05:00
• bd4072f81c Merge pull request #707 from metamaps/feature/split-out-backbone Devin Howard 2016-11-07 14:58:20 -05:00
• 6a2646c9cd fix mailer specs (#921) Devin Howard 2016-11-07 14:56:35 -05:00
• b32e326612 eslint frontend folder Devin Howard 2016-10-30 15:58:36 +08:00
• 2f4fe525ce Fix a bunch of errors and style issues Devin Howard 2016-10-03 08:32:37 +08:00
• 518782e1c7 remove Metamaps.Erb Devin Howard 2016-10-02 22:37:38 +08:00
• 7c9b6a2205 try to move all rails data into Metamaps.ServerData Devin Howard 2016-10-02 22:28:00 +08:00
• 8026969799 start storing data in ServerData Devin Howard 2016-10-02 21:41:05 +08:00
• 4b500a4428 move Metamaps.Loading into node modules Devin Howard 2016-10-02 21:10:41 +08:00
• 0778179ba7 eslint Devin Howard 2016-10-02 18:21:56 +08:00
• bfd23c6d32 split Backbone.js into a bunch of different files. Still more work to do to modularize it Devin Howard 2016-10-02 17:58:37 +08:00
• 9cb3074245 rename Metamaps.Backbone to Metamaps.DataModel Devin Howard 2016-10-02 17:16:02 +08:00
• e4d193572f fix mailer specs Devin Howard 2016-11-07 14:40:25 -05:00
• d3a6753637 strip whitespace from search terms Devin Howard 2016-11-07 13:46:27 -05:00
• 0f85abfda2 add channel to webhooks (#915) v3.0.3 3.0.3 Connor Turland 2016-11-05 09:34:50 -07:00
• 1d8cc35a17 add channel to webhooks Connor Turland 2016-11-05 16:30:10 +00:00
• 887c3f7570 fixes #903 and #831 (#911) Connor Turland 2016-11-04 15:02:56 -07:00
• 5b4478fdb6 fixes #903 and #831 Connor Turland 2016-11-04 21:59:22 +00:00
• 667f5653a7 topic descriptions from old data can be nil Connor Turland 2016-11-04 21:03:11 +00:00
• 48b93b2269 change grant to allow. fixes #909 (#910) Connor Turland 2016-11-04 13:22:06 -07:00
• 9f1bdaca90 change grant to allow. fixes #909 Connor Turland 2016-11-04 20:20:57 +00:00
• 9ad4684825 firefox needs e.pageX not e.x (#906) Connor Turland 2016-11-02 19:20:06 -07:00
• 4fed6b1632 firefox needs e.pageX not e.x Connor Turland 2016-11-03 02:16:03 +00:00
• f516e1e73d fix up deploy docs Devin Howard 2016-11-01 16:31:36 +08:00
• 2588636837 tag v3.0.1 - bugfixes for 3.0 v3.0.1 Devin Howard 2016-11-01 16:06:05 +08:00
• 644df6fcdc fix pasting urls (#901) Devin Howard 2016-11-01 16:01:34 +08:00
• 0d7623e29f fix pasting urls Devin Howard 2016-11-01 10:50:19 +08:00
• c10a4f4837 fix exception notification backtrace (#898) Devin Howard 2016-11-01 10:05:45 +08:00
• 304722b528 fix api docs (#897) Devin Howard 2016-11-01 09:52:10 +08:00
• a9c67e70d4 move webhook and event serializers back (#899) Devin Howard 2016-11-01 09:46:44 +08:00
• bce53d5260 more rake => rails Devin Howard 2016-11-01 09:44:52 +08:00
• c71095183c move webhook and event serializers back Devin Howard 2016-11-01 09:05:27 +08:00
• 492dd82c4b fix exception notification backtrace Devin Howard 2016-11-01 09:02:31 +08:00
• d85c2c92ee fix api docs Devin Howard 2016-11-01 08:37:36 +08:00
• ed3e4780d2 bug when topic was in more than 5 maps fixes #891 (#894) Connor Turland 2016-10-31 17:10:44 -04:00
• b42b16f276 bug when topic was in more than 5 maps fixes #891 Connor Turland 2016-10-31 17:09:09 -04:00
• b013499c76 misnamed variable errors out maps search (#893) Connor Turland 2016-10-31 16:41:37 -04:00
• 1c0838d512 misnamed variable errors out maps search Connor Turland 2016-10-31 16:39:43 -04:00
• 5270c5a611 Merge branch 'develop' for v3.0 v3.0 Devin Howard 2016-10-31 19:51:02 +08:00
• 5cfa8ffdc7 bump version to 3.0 Devin Howard 2016-10-31 19:48:07 +08:00
• 814c1acc0f a few markdown style updates (#885) Devin Howard 2016-10-31 15:38:16 +08:00
• 62e2acdd52 add about lightbox again (#884) Devin Howard 2016-10-31 15:38:09 +08:00
• cd6e26017b fix about lightbox style Devin Howard 2016-10-31 15:28:30 +08:00
• cfbd28921d add about lightbox again Devin Howard 2016-10-31 13:08:57 +08:00
• 543fe098a1 a few more markdown style updates Devin Howard 2016-10-30 12:26:25 +08:00
• d7b179e348 markdown block padding Devin Howard 2016-10-28 13:10:55 +08:00
• 151e96f803 Metamaps.Realtime.synapseRemoved is not a function (#880) Connor Turland 2016-10-29 12:10:13 -04:00
• bc1f212c93 fix tab/shift-tab for metacode selection (#879) Devin Howard 2016-10-30 00:08:51 +08:00
• f0fcd2757d Metamaps.Realtime.synapseRemoved is not a function Connor Turland 2016-10-29 12:02:18 -04:00
• acdd4ff574 fix tab/shift-tab for metacode selection Devin Howard 2016-10-29 23:47:37 +08:00
• b9190233b1 enable sucker punch for heroku (#878) Devin Howard 2016-10-29 23:38:17 +08:00
• 94b9651b9c enable sucker punch for heroku Devin Howard 2016-10-29 22:49:24 +08:00
• 5e0e44b436 supercharge the schemas (#874) Devin Howard 2016-10-29 22:58:31 +08:00
• e4a1ced8c2 update current user schema/examples Devin Howard 2016-10-29 22:34:29 +08:00
• c4509fd054 update other schemas to include embeddable attrs Devin Howard 2016-10-29 22:34:23 +08:00
• 139963e533 fix map schema - woot it works Devin Howard 2016-10-29 22:19:04 +08:00
• 1fbfd56d57 filter maps by user_id in api (#872) Devin Howard 2016-10-29 22:07:27 +08:00
• 9705874ea1 add user id to map schema/examples Devin Howard 2016-10-29 21:49:55 +08:00
• a32f98bde2 to_json should be as_json or there's bugs (#870) Devin Howard 2016-10-29 18:28:29 +08:00
• 412e78dc1a revert search controller and some topic methods Devin Howard 2016-10-29 12:44:30 +08:00
• ae855f6053 revert explore controller, it's better without Devin Howard 2016-10-29 12:26:53 +08:00
• 8dc8685a8f update starred maps example to make starred true lol Devin Howard 2016-10-29 12:20:24 +08:00
• d4c66b466a test user_id map filter Devin Howard 2016-10-29 12:20:12 +08:00
• 0530c9182a filter maps by user_id in api Devin Howard 2016-10-29 11:46:18 +08:00
• 2b2017d059 to_json should be as_json or there's bugs Devin Howard 2016-10-29 11:27:25 +08:00
• 6cc827d11c wasn't updating calculated_permission when updating permission (#869) Connor Turland 2016-10-28 18:26:40 -04:00
• b04e9120b3 wasn't updating calculated_permission when updating permission Connor Turland 2016-10-28 18:23:00 -04:00
• de16420796 fix logCanvasAttributes error (#863) Devin Howard 2016-10-28 15:20:39 +08:00
• 5503a3f625 fix logCanvasAttributes error Devin Howard 2016-10-28 15:17:50 +08:00
• e49e5c258a make synapse permissions depend on topic1 and topic2 (#839) Devin Howard 2016-10-28 11:03:59 +08:00
• 42d3850f2e fix policy(Synapse).create? Devin Howard 2016-10-28 10:59:32 +08:00
• 053da92dde inline documentation Devin Howard 2016-10-25 13:14:15 +08:00
• 01e6480920 more synapse controller tests Devin Howard 2016-10-25 11:45:33 +08:00
• 070bb0c368 use a transaction to handle authorization vs invalid record in synapse controller Devin Howard 2016-10-25 11:39:34 +08:00
• 496a15a836 make synapse policy resilient to nil topic1/topic2/map Devin Howard 2016-10-25 11:32:20 +08:00
• 0442b3e56c deep change to synapse policy - is this ok? Devin Howard 2016-10-25 10:45:58 +08:00
• 4dc32d7d2e fix metacodes page scrolling (#862) Devin Howard 2016-10-28 10:55:04 +08:00
• 9d821c920b reorder API authentication precedence to be: token, oauth, cookie (#860) Devin Howard 2016-10-28 10:51:58 +08:00
• 1efac33b58 switch overflow:hidden to be on explicit controllers Devin Howard 2016-10-28 10:50:58 +08:00
• 0b3bdab16f fix metacodes page scrolling Devin Howard 2016-10-28 09:16:45 +08:00
• 8c136d8128 fix mapping order Devin Howard 2016-10-28 09:07:13 +08:00
• 6b1220b533 overflow-y: hidden on body to prevent openLightbox from showing a scrollbar (#859) Devin Howard 2016-10-28 06:40:42 +08:00
• 02fe7d543d all APIs but tokens are accessible anonymously (so add mappings to the list) Devin Howard 2016-10-27 17:04:50 +08:00
• 5e203cd89a reorder authentication to be: token, then oauth, then cookie Devin Howard 2016-10-27 17:04:32 +08:00
• 2f965b65ff overflow-y: hidden on body to prevent openLightbox from showing a scrollbar Devin Howard 2016-10-27 16:52:23 +08:00
• 4f3d12d7a5 fix import promises (#858) Devin Howard 2016-10-27 14:03:18 +08:00
• c090c50f56 fix import promises Devin Howard 2016-10-27 12:35:45 +08:00
• 7b4a072fd8 attempt to fix import problems (#852) Devin Howard 2016-10-26 20:34:22 +08:00
• e69f5b29ed attempt to fix import problems Devin Howard 2016-10-26 20:31:28 +08:00
• 175a3ee73e policy_scope on has_many relationships in serializers (#840) Devin Howard 2016-10-26 19:56:30 +08:00
• b13587456d fix coordsToPixels calls even more Devin Howard 2016-10-26 19:10:09 +08:00
• f023a18069 fix pixel stuff for real? (#851) Devin Howard 2016-10-26 19:04:00 +08:00
• e640048386 fix topic card title word break css (#844) Devin Howard 2016-10-26 17:01:05 +08:00
• 98725b3ee4 fix getPastelColor function (I think) (#850) Devin Howard 2016-10-26 14:26:48 +08:00