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

• b0860ef670 Merge branch 'develop' Devin Howard 2016-06-08 12:47:26 +08:00
• 1d12aed3eb switch to dotenv-rails Devin Howard 2016-06-07 12:55:49 +08:00
• 11f921b058 remove secret key from source control - fixme on production. Devin Howard 2016-06-07 12:54:52 +08:00
• ce3271d8f0 hide the permission box, unless you're the one who can change the permission feature/flex.permission.styling Connor Turland 2016-05-30 18:07:04 -04:00
• c08868a5c1 user presence event (#552) Connor Turland 2016-04-26 08:08:12 -04:00
• 45adda93b1 set up scaffolding for js tests (#553) Devin Howard 2016-04-26 10:22:32 +08:00
• 7e87af591b cache node and bundler Devin Howard 2016-04-26 10:18:38 +08:00
• 2d44c4c599 what about this Devin Howard 2016-04-26 10:15:11 +08:00
• 7a3cf5aba5 does this CI config work? Devin Howard 2016-04-26 10:12:41 +08:00
• 027f0093ed documentation Devin Howard 2016-04-26 10:05:19 +08:00
• 10e82b696a set up scaffolding for tests Devin Howard 2016-04-25 19:09:22 +08:00
• f2384a2b13 user presence event Connor Turland 2016-04-24 16:33:15 -04:00
• 2a3fa80540 wording needed updating Connor Turland 2016-04-24 12:15:40 -04:00
• 8c51108a0c enable shared private and public maps (#530) Connor Turland 2016-04-24 11:50:35 -04:00
• 37d1b71418 don't let it overflow off the page Connor Turland 2016-04-24 11:28:20 -04:00
• 7cc3e100af remove featured from signed in explore maps bar Connor Turland 2016-04-24 11:22:57 -04:00
• ec566f0ea3 some llittle template bugs Connor Turland 2016-04-24 11:22:38 -04:00
• 8000fbd766 Finish breaking out JS files (#551) Devin Howard 2016-04-24 22:58:10 +08:00
• ddaf8f5410 factor out canvas support check function Devin Howard 2016-04-24 13:10:36 +08:00
• 9caeeb0910 move Backbone.init; standard-format on Metamaps.js.erb Devin Howard 2016-04-24 13:08:56 +08:00
• 24368fef60 Metamaps.JIT no more erb extension Devin Howard 2016-04-24 13:01:01 +08:00
• b230c343b1 Metmaps.Account and Metamaps.GlobalUI remove extension Devin Howard 2016-04-24 12:59:24 +08:00
• 21e665450f Remove erb extension from Metamaps.Map.js Devin Howard 2016-04-24 12:56:17 +08:00
• ba7bd2a7d0 Metamaps.Create.js Devin Howard 2016-04-24 12:56:04 +08:00
• e2b8aa5fb7 Metamaps.TopicCard Devin Howard 2016-04-24 12:44:23 +08:00
• c668c774dd Metamaps.SynapseCard Devin Howard 2016-04-24 12:42:36 +08:00
• e8e866c196 Metamaps.Visualize Devin Howard 2016-04-24 12:38:43 +08:00
• 87b6dfb739 Metamaps.Util Devin Howard 2016-04-24 12:33:52 +08:00
• 987a2d16d0 metamaps.Realtime refactor Devin Howard 2016-04-24 12:27:39 +08:00
• 8197d74955 wasn't including the right people in some circumstances Connor Turland 2016-04-22 15:02:16 -04:00
• a3b4f96d37 don't execute if there's no map Connor Turland 2016-04-22 14:32:24 -04:00
• 1c988b5a8f switch to green Connor Turland 2016-04-22 14:31:56 -04:00
• f704d1d2c9 shouldn't have included that Connor Turland 2016-04-22 14:25:24 -04:00
• 71c11cc79e improve wording Connor Turland 2016-04-22 12:35:38 -04:00
• 4c0df041b9 config for mailer previews Connor Turland 2016-04-22 12:02:54 -04:00
• d90e51eb1e better email Connor Turland 2016-04-22 12:02:06 -04:00
• 46540ff753 make recommendation they sign in and retry Connor Turland 2016-04-22 10:58:49 -04:00
• ce72bde309 just do it in the controller Connor Turland 2016-04-22 12:51:07 +00:00
• 7cf0ddc2ee needs to be before? Connor Turland 2016-04-22 12:38:38 +00:00
• 5928969724 when topic or synapse is no longer on a map, don't defer Connor Turland 2016-04-22 12:27:26 +00:00
• b2da15245a I believe this fixes the error connor brought up Devin Howard 2016-04-22 14:00:35 +08:00
• c7402c3ee5 Merge branch 'develop' into feature/flex.permissions Devin Howard 2016-04-22 13:57:27 +08:00
• 6c7ce56e4f yeehaw add collaborators Connor Turland 2016-04-21 18:54:26 -04:00
• 44ae6730a6 fix user search error Devin Howard 2016-04-21 12:30:11 +08:00
• d08143f814 fix user search error Devin Howard 2016-04-21 12:00:35 +08:00
• 437c73b0fe Merge develop v2.8.6 Devin Howard 2016-04-20 11:25:59 +08:00
• e569a0376d Merge pull request #548 from metamaps/feature/refactor-javascript Devin Howard 2016-04-20 11:24:20 +08:00
• fa51ee850e change the list Connor Turland 2016-04-19 23:20:37 -04:00
• af4a958f59 Merge pull request #549 from metamaps/fix/map-fork Devin Howard 2016-04-20 09:36:52 +08:00
• da0da1a117 Merge pull request #546 from metamaps/feature/exception-notification Devin Howard 2016-04-20 09:06:42 +08:00
• 837e4bde1b fix map forking (fix #540) Devin Howard 2016-04-20 08:51:38 +08:00
• ab70d65aab enable shared private and public maps Connor Turland 2016-04-01 00:01:47 -04:00
• 5a60135392 Merge branch 'develop' v2.8.5 Devin Howard 2016-04-15 11:51:40 +08:00
• c1d963d669 remove .erb from files that don't need it Devin Howard 2016-04-15 09:18:17 +08:00
• 8bb96d12a6 Metamaps.Control Devin Howard 2016-04-15 09:11:50 +08:00
• 6a8921ae6d standard-format Metamaps.JIT.js.erb Devin Howard 2016-04-15 08:43:46 +08:00
• 074eaf0bd3 alphabetize dependecies Devin Howard 2016-04-15 08:37:19 +08:00
• 324719e531 Metamaps.Filter Devin Howard 2016-04-15 08:36:50 +08:00
• b10f0cef0e Metamaps.Listeners.js.erb Devin Howard 2016-04-15 08:31:22 +08:00
• a5bd0440a8 Metamaps.Organize Devin Howard 2016-04-15 08:28:28 +08:00
• ca5928113d whoops don't forget standard format Devin Howard 2016-04-14 14:16:16 +08:00
• de62a08307 Metamaps.Topic Devin Howard 2016-04-14 14:12:12 +08:00
• 4833dd8da6 Metamaps.Synapse Devin Howard 2016-04-14 14:05:50 +08:00
• 11a87582c7 Metamaps.Map Devin Howard 2016-04-14 14:01:21 +08:00
• 13d6ab56e5 factor out two more small view modules Devin Howard 2016-04-14 13:54:19 +08:00
• 7bb7f345f1 added an event for conversations starting (#547) Connor Turland 2016-04-14 14:35:28 -04:00
• 958791952c switch to post Connor Turland 2016-04-14 14:34:17 -04:00
• 317f0c245e Merge pull request #545 from metamaps/feature/refactor-javascript Devin Howard 2016-04-14 12:35:21 +08:00
• d94f8f0308 added an event for conversations starting Connor Turland 2016-04-13 23:50:01 -04:00
• fb80f56a7d slack exception notifications Devin Howard 2016-04-13 17:20:01 +08:00
• 134d4171f8 alphabetize gemfile Devin Howard 2016-04-13 17:07:21 +08:00
• 6653d10edf Debug gets a header. Still need to parse through Metamaps, Metamaps.GlobalUI, and Metamaps.JIT Devin Howard 2016-04-13 16:06:01 +08:00
• be99ad8285 factor out Metamaps.Admin Devin Howard 2016-04-13 16:04:15 +08:00
• 799f6e4623 Metamaps.Router standard style Devin Howard 2016-03-27 20:18:37 +08:00
• df9c0a93bc Metamaps.Views standard style Devin Howard 2016-03-27 19:50:07 +08:00
• e8c55df4e8 Metamaps.Backbone standard style Devin Howard 2016-03-27 19:46:36 +08:00
• 5a3ab025b7 Metamaps.Import standard style Devin Howard 2016-03-27 19:43:30 +08:00
• 031e35e50c Merge branch 'develop' Devin Howard 2016-04-13 10:53:46 +08:00
• d2d67d5d6c Merge pull request #544 from metamaps/fix/versioncode Devin Howard 2016-04-13 10:53:31 +08:00
• e6c4313184 reindent upperelements template + fix input tag Devin Howard 2016-04-13 10:50:51 +08:00
• a2ce20b564 versioncode fix Devin Howard 2016-04-13 10:48:34 +08:00
• bd1e1ffe81 ruby gemset Devin Howard 2016-04-13 10:32:27 +08:00
• 3040c004f0 ruby gemset Devin Howard 2016-04-13 10:32:27 +08:00
• 0de7333d6a Merge branch 'develop' Devin Howard 2016-04-13 10:26:01 +08:00
• 5ed1fd3156 v2.8.4 v2.8.4 Devin Howard 2016-04-13 10:19:35 +08:00
• 0a9a1c27d8 Merge pull request #543 from metamaps/feature/rename-repo Devin Howard 2016-04-13 10:17:30 +08:00
• c9bba0cdb2 rename repo Devin Howard 2016-04-13 10:16:54 +08:00
• 33d17ed3bc Merge df8325c58e into 6659a97f28 Connor Turland 2016-04-13 02:14:24 +00:00
• 6659a97f28 Merge pull request #536 from metamaps/feature/metamaps.debug Devin Howard 2016-04-13 10:14:23 +08:00
• fd9c27c631 Merge pull request #535 from metamaps/feature/cors Devin Howard 2016-04-13 10:13:16 +08:00
• df8325c58e repo name changed Connor Turland 2016-04-12 10:18:19 -04:00
• e27d64e643 only allow cors on api routes Devin Howard 2016-04-06 20:09:25 +08:00
• 2e6f04d0be metamaps.debug function, and move VERSION into a rails constant initializer. Devin Howard 2016-04-06 10:27:31 +08:00
• a8d0d9da09 2.8.3: v2.8.3 Devin Howard 2016-04-06 10:06:37 +08:00
• 7de642ccb2 add rack-cors; fix #531 Devin Howard 2016-04-05 10:12:12 +08:00
• 8a6d434fc3 Junto Sounds Connor Turland 2016-04-04 10:50:02 -04:00
• c3595f9cb4 bug fixes and chat sounds on by default Connor Turland 2016-04-04 10:37:36 -04:00
• ac762e0056 prevent double sound Connor Turland 2016-04-03 20:58:17 -04:00
• 1a69b0faf4 awesome news sounnndzzzz Connor Turland 2016-04-03 20:40:40 -04:00
• f21a3d114f Merge pull request #529 from metamaps/fix/import-fixes Devin Howard 2016-04-01 13:37:43 +08:00