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

• 7f1c04015e fix topic autocomplete controller action Devin Howard 2016-10-19 22:10:38 +08:00
• f75d5253b3 Merge pull request #781 from metamaps/fix/registration Devin Howard 2016-10-19 14:36:39 +08:00
• bb6566a45e clean up and fix devise code Devin Howard 2016-10-19 12:40:52 +08:00
• 63274e8454 replace uservoice with docs.metamaps.cc + Hylo Devin Howard 2016-10-18 15:49:26 +08:00
• 2529e0d44f copy share invite link to clipboard automatically where possible Devin Howard 2016-10-18 15:59:15 +08:00
• 139837e997 restructure realtime server for clarity (#780) Connor Turland 2016-10-18 20:29:21 -04:00
• e545c3e69e don't need it because socketioconnection is being imported now Connor Turland 2016-10-18 20:09:32 -04:00
• 786ea64480 better indenting on signal.js Connor Turland 2016-10-18 19:59:13 -04:00
• 5921513c79 restructure realtime server for clarity Connor Turland 2016-10-18 19:46:34 -04:00
• d8cd536a95 too much logging Connor Turland 2016-10-18 14:10:41 -04:00
• 29913cd10b fix for heroku Connor Turland 2016-10-18 12:56:30 -04:00
• d004e98ada holy insanity realtime refactor (#779) Connor Turland 2016-10-18 12:34:19 -04:00
• a0efb2cac8 make it all work Connor Turland 2016-10-18 08:04:23 -04:00
• 9ae28866d9 all the refactoring Connor Turland 2016-10-18 06:59:18 -04:00
• d2e097fd05 add webrtc logging Connor Turland 2016-10-17 22:59:28 -04:00
• fe0da255dd [WIP] display whether a map is live on every map card (#775) Connor Turland 2016-10-17 22:27:15 -04:00
• 6e75274737 access request tests (#772) Devin Howard 2016-10-17 22:53:53 +08:00
• 6c9d464a9f Global => All Maps (#774) Devin Howard 2016-10-17 22:53:33 +08:00
• 7a8586e906 checkwhethertosave was no longer correct Connor Turland 2016-10-17 10:53:07 -04:00
• 92c4ffea74 tidy up Connor Turland 2016-10-17 10:36:51 -04:00
• 517cfcb913 remove static lib files in favor of npm ones (#773) Connor Turland 2016-10-17 10:39:08 -04:00
• 4f0c87492b Global => All Maps Devin Howard 2016-10-17 22:35:01 +08:00
• f66661d090 patch npm modules to not use window Devin Howard 2016-10-17 22:34:28 +08:00
• 35091cd1ce update howler to work correctly Connor Turland 2016-10-17 03:44:03 -04:00
• dd21eb49da remove static lib files in favor of npm ones Connor Turland 2016-10-17 03:29:04 -04:00
• 83b9e441c5 map mailer spec update Devin Howard 2016-10-17 15:09:15 +08:00
• 9e9f71bb4f access request tests Devin Howard 2016-10-17 15:00:43 +08:00
• 0ee1b3284a fix check-canvas-support require Devin Howard 2016-10-17 13:47:42 +08:00
• b976c13db2 Merge pull request #770 from metamaps/feature/remove-canvas-function Devin Howard 2016-10-17 13:40:34 +08:00
• c0955d7c5e multiple policy issues (#771) Connor Turland 2016-10-17 01:20:48 -04:00
• 24c4f7d631 make some things more explicit Connor Turland 2016-10-17 01:15:18 -04:00
• 77e17b005f multiple policy errors Connor Turland 2016-10-17 00:50:54 -04:00
• 332bb2ec08 Map Card changes (#769) Connor Turland 2016-10-16 23:46:55 -04:00
• 02265566fa css fix Connor Turland 2016-10-16 23:43:52 -04:00
• 179849b639 remove check-canvas-support.js Devin Howard 2016-10-17 11:42:11 +08:00
• 403f270968 star count Connor Turland 2016-10-16 23:38:05 -04:00
• 1983f695b8 map card rewrite underway Connor Turland 2016-10-16 23:35:58 -04:00
• 4f6dae304c Merge pull request #768 from metamaps/feature/default-rails-scripts Devin Howard 2016-10-17 10:51:47 +08:00
• 3479fb7ff7 Merge pull request #767 from metamaps/fix/schema Devin Howard 2016-10-17 10:46:57 +08:00
• c113253fc5 add scripts from default rails install Devin Howard 2016-10-17 10:41:56 +08:00
• e46aa54ba3 schema update Devin Howard 2016-10-17 10:39:46 +08:00
• 4602ded8a4 access requests (#762) Connor Turland 2016-10-16 20:22:00 -04:00
• 5e97898a4b set default values for approved and answered Connor Turland 2016-10-16 20:09:45 -04:00
• 88e550c13a set up access requests further Connor Turland 2016-10-16 20:04:44 -04:00
• 14ea18a967 Merge pull request #764 from metamaps/fix/import-dialog-box Devin Howard 2016-10-16 22:11:36 +08:00
• 8180a8cc71 fix file upload box Devin Howard 2016-10-14 14:29:16 +08:00
• da5191171a Merge pull request #760 from metamaps/feature/mailer-tests Devin Howard 2016-10-14 11:24:31 +08:00
• 8d6ae2321c start on access requests Connor Turland 2016-10-13 22:34:58 -04:00
• 26a8cddd14 mailer spec Devin Howard 2016-10-13 15:39:13 +08:00
• 407ac1f29c more simplecov groups Devin Howard 2016-10-13 15:31:45 +08:00
• fc2849824f fix js syntax error Devin Howard 2016-10-13 16:48:46 +08:00
• 6f3c74b7f1 token policy fix Devin Howard 2016-10-13 15:21:27 +08:00
• c3dbd59280 Merge pull request #758 from metamaps/feature/remove-gems Devin Howard 2016-10-13 14:55:04 +08:00
• 0e7e649f56 don't need coffeescript, tunemygc fails on Windows Devin Howard 2016-10-12 22:01:42 +08:00
• 6e03132f1b fix spec Devin Howard 2016-10-13 14:51:58 +08:00
• b2a4acc99d make default category explicit in import.js Devin Howard 2016-10-13 14:23:55 +08:00
• 7eae8deacb revamp HTML template a bit for api docs (#757) Devin Howard 2016-10-13 01:54:43 +08:00
• f31d95d374 Merge branch 'develop' into feature/api-updates Connor Turland 2016-10-12 17:52:50 +00:00
• 62c489cba7 suggesting api doc updates (#756) Devin Howard 2016-10-13 00:22:38 +08:00
• ca2541da48 ok looks OK Devin Howard 2016-10-12 11:59:42 +08:00
• f5decffe3f remove unneeded Endpoints header Devin Howard 2016-10-12 11:54:02 +08:00
• ff989e2b16 getting closer Devin Howard 2016-10-12 11:44:04 +08:00
• c17c66cead oauth tutorial Devin Howard 2016-10-12 11:39:58 +08:00
• e48c4de5bd move login tutorials into security tab Devin Howard 2016-10-12 11:39:18 +08:00
• b96afa3f33 better ordering Devin Howard 2016-10-12 11:17:04 +08:00
• 73ce78b40e gross authentication notes at the top of every endpoint Devin Howard 2016-10-12 11:15:41 +08:00
• 440011cba9 convenience open Devin Howard 2016-10-12 11:11:33 +08:00
• 9352ecc446 fix securedBy Devin Howard 2016-10-12 11:10:59 +08:00
• 94092ca716 mess with template Devin Howard 2016-10-12 11:08:09 +08:00
• 9c55883eeb ch ch ch changes Devin Howard 2016-10-12 10:46:40 +08:00
• 903824720d suggesting api doc updates Devin Howard 2016-10-12 10:09:28 +08:00
• 25a2522446 remove secured_by from metacodes/users Devin Howard 2016-10-12 10:15:34 +08:00
• ed6682ba29 my_tokens endpoint moved to normal index Devin Howard 2016-10-12 10:14:50 +08:00
• 3051723bcf [WIP] add markdown getting started page to api docs (#752) Devin Howard 2016-10-12 00:08:31 +08:00
• e5cfa9fb83 Update getting-started.md Connor Turland 2016-10-11 12:07:11 -04:00
• ccd537458e update windows docs to use rubyinstaller.org feature/update-windows-docs Devin Howard 2016-10-11 15:30:54 +08:00
• 858ca66d69 eslint updates Devin Howard 2016-10-10 17:20:43 +08:00
• a0c0dcbc79 Merge pull request #753 from metamaps/fix/screenshot-no-file Devin Howard 2016-10-10 13:01:50 +08:00
• 6e6d33abbe fix screenshot no file error Devin Howard 2016-10-10 12:12:42 +08:00
• f88a870dbb add markdown getting started page to api docs. TODO section 3 Devin Howard 2016-10-07 12:23:45 +08:00
• 8b1d85c3ca actually the smart option is dumb Devin Howard 2016-10-09 10:24:13 +08:00
• 56d3ef8bea Merge pull request #751 from metamaps/feature/markdown-xss-safe Devin Howard 2016-10-09 10:23:00 +08:00
• ba9e26bc05 enable xss filtering and smart quote replacement in markdown Devin Howard 2016-10-09 10:20:17 +08:00
• 9ac24f7468 Merge pull request #744 from metamaps/feature/markdown-in-topic-cards Devin Howard 2016-10-08 16:58:32 +08:00
• fe1c57b458 further updates - make Enter update bip fields whaaat Devin Howard 2016-10-08 16:42:34 +08:00
• 9d85dab975 Merge pull request #747 from metamaps/fix/unauth-error Devin Howard 2016-10-08 14:16:13 +08:00
• ab76b77bdd Merge pull request #748 from metamaps/feature/api-json-404 Devin Howard 2016-10-08 14:16:00 +08:00
• 9513087bbd remove unnecessary api v1 code Devin Howard 2016-10-08 14:00:29 +08:00
• 2c64b67abd return 404s for all unmatched api routes Devin Howard 2016-10-08 12:42:17 +08:00
• be6a2401b6 fix spec. not sure how this should work Devin Howard 2016-10-08 13:42:25 +08:00
• 0764133d11 Merge pull request #661 from metamaps/feature/file-upload-component Devin Howard 2016-10-08 12:34:28 +08:00
• 129e3db946 redirect to root_path if you get a 403 Devin Howard 2016-10-08 12:26:08 +08:00
• 7eacda2ae7 code style Devin Howard 2016-10-08 00:31:32 +08:00
• f775629371 showCard .desc css for ul and a tags Devin Howard 2016-10-08 00:03:50 +08:00
• 0085ce71e6 upgrade to best in place 3.0.0 alpha Devin Howard 2016-10-07 17:26:20 +08:00
• fc044294f1 add markdown to topic cards Devin Howard 2016-10-07 17:23:11 +08:00
• 20da1ef39f fiddle with import icon Devin Howard 2016-10-08 00:21:04 +08:00
• 42bb2cd86a look and feel updates Devin Howard 2016-10-08 00:16:37 +08:00
• dc55bae243 Merge pull request #740 from metamaps/feature/ctrl-or-meta Devin Howard 2016-10-08 00:07:07 +08:00
• b6da38e29e Update Listeners.js Robert Best 2016-10-07 02:36:41 -04:00