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

• c57015cb15 rvm install needs sudo Devin Howard 2017-01-18 13:16:33 -05:00
• 9223295320 add node source Devin Howard 2017-01-18 13:14:39 -05:00
• b4bffbe427 database called metamaps, not metamap002 in example Devin Howard 2017-01-18 13:10:09 -05:00
• 6296df1102 need postgres dev headers Devin Howard 2017-01-18 13:09:47 -05:00
• 2e0acfc170 update docs Devin Howard 2017-01-18 12:04:31 -05:00
• 99b21be27b tag v3.2 v3.2 Devin Howard 2017-01-16 14:18:49 -05:00
• 2c60d7335c Merge branch 'develop' (v3.2) Devin Howard 2017-01-16 11:14:04 -05:00
• 6f6e5bea06 Update README.md Connor Turland 2017-01-15 20:23:18 -05:00
• 6f0d391aaa Update ISSUE_TEMPLATE.md Connor Turland 2017-01-15 20:17:30 -05:00
• b1a64c6e7a Update ISSUE_TEMPLATE.md Connor Turland 2017-01-15 20:16:53 -05:00
• 5cf93a234c fix Devin Howard 2017-01-14 16:14:13 -05:00
• f3383e8bea fix object destructuring syntax Devin Howard 2017-01-14 16:11:57 -05:00
• e2a60be417 revamp GlobalUI.notifyUser Devin Howard 2017-01-14 16:10:48 -05:00
• 2ca1efbb49 Merge 65dadfe044 into 59b3d254dd Devin Howard 2017-01-14 09:40:38 +00:00
• 59b3d254dd include new info zones Connor Turland 2017-01-14 01:35:48 -05:00
• e7a52dc14e bugs feature/particles Connor Turland 2017-01-12 14:11:01 -05:00
• 149b7ecbd6 include matter-js in package json Connor Turland 2017-01-12 12:37:16 -05:00
• b2b5090b28 still make it work for logged out users Connor Turland 2017-01-12 12:31:08 -05:00
• 38c01c4e8f fix the carousel Connor Turland 2017-01-12 12:19:54 -05:00
• b13ac98c9f chat iss working Connor Turland 2017-01-12 04:55:57 -05:00
• 4a17d00123 stuff with metacodes working well again Connor Turland 2017-01-12 04:00:52 -05:00
• 9c13f5a281 metacode selector working nicely Connor Turland 2017-01-12 00:04:49 -05:00
• f3539f54bf hotfix ugh Devin Howard 2017-01-11 23:36:30 -05:00
• 75ccfb0ab3 hotfix map title in meta tags whoops Devin Howard 2017-01-11 23:31:31 -05:00
• 2167a74fd9 unused arg Devin Howard 2017-01-11 23:27:27 -05:00
• 7b5bd53c28 I think this will fix the meta tags (#1030) Devin Howard 2017-01-11 23:27:05 -05:00
• dd2e930edc I think this will fix the meta tags Devin Howard 2017-01-11 23:21:06 -05:00
• 616a489ae4 Merge branch 'feature/better.select' into feature/particles Connor Turland 2017-01-11 23:18:26 -05:00
• 9e2b7e267e fix has_many api embeds too! Devin Howard 2017-01-11 23:18:23 -05:00
• 816815d1b5 awesome Connor Turland 2017-01-11 23:17:57 -05:00
• a6fadc482f use correct serializer for singular embeds in api (almost fixes #998) Devin Howard 2017-01-11 23:07:36 -05:00
• 5302f03196 remove exclamation mark Connor Turland 2017-01-11 23:00:19 -05:00
• 536c458981 add code climate to the readme Devin Howard 2017-01-11 22:40:01 -05:00
• e7b021aa0a eslint Devin Howard 2017-01-11 22:33:15 -05:00
• f64612f99b add meta tags to maps (#1028) Devin Howard 2017-01-11 22:26:45 -05:00
• f96a49cc0d add meta tags to maps Devin Howard 2017-01-11 22:05:39 -05:00
• b3dfc02647 automatically start downloading the screenshot Devin Howard 2017-01-11 21:48:34 -05:00
• b40a25eaa4 fix tooltip display Devin Howard 2017-01-11 21:40:11 -05:00
• c9c779dc5f add more text Devin Howard 2017-01-11 21:21:31 -05:00
• 5eed326900 fight with styling to make the button at least appear Devin Howard 2017-01-11 18:44:04 -05:00
• cbc38e0c93 emoji-mart styling fix Connor Turland 2017-01-11 14:02:11 -05:00
• 2114519778 import blue button styling Devin Howard 2017-01-11 13:32:05 -05:00
• ccf9353d9d thumbnail button inside map info box Devin Howard 2017-01-11 13:18:45 -05:00
• 4c53dcce3d screenshot download button in import dialog box Devin Howard 2017-01-11 13:02:44 -05:00
• 12a0d96332 split screenshot function into 4 separate helpers Devin Howard 2017-01-11 12:57:18 -05:00
• 42d671c05b stop replacing shortcodes/emoticon in the live NewMessage textarea (#1026) Devin Howard 2017-01-11 13:56:44 -05:00
• a3cd14d92b stop replacing shortcodes/emoticon in the live NewMessage textarea Devin Howard 2017-01-11 13:48:42 -05:00
• 08109ee5de remove instructions from ImportDialogBox (#1022) Devin Howard 2017-01-11 13:50:37 -05:00
• a83d5864d0 link back to docs.metamaps.cc for import instructions Devin Howard 2017-01-11 13:47:36 -05:00
• 0952c0f3c9 Bug/name.overflow (#1025) Connor Turland 2017-01-11 13:36:07 -05:00
• e729a00dea Update MapCard.js Connor Turland 2017-01-11 13:33:07 -05:00
• 910bbc0fa8 creator name was pushing 'view only' off card Connor Turland 2017-01-11 13:30:39 -05:00
• 25b4d388de eslint commands and apply some style fixes (#1021) Devin Howard 2017-01-11 12:52:34 -05:00
• 9e2fd3b17f remove instructions from ImportDialogBox Devin Howard 2017-01-11 12:37:51 -05:00
• 8b738f3d28 emoticons turned on by default Devin Howard 2017-01-10 22:05:04 -05:00
• dbbaf37d5a eslint the entire frontend folder Devin Howard 2017-01-10 18:42:17 -05:00
• 71bed1a919 auto eslint and add commands for eslint Devin Howard 2017-01-10 18:11:19 -05:00
• 17adf5a6c5 Merge branch 'develop' into feature/better.select feature/better.select Devin Howard 2017-01-10 18:01:56 -05:00
• da94cd0c8b systemd job in deploy docs Devin Howard 2017-01-10 18:00:37 -05:00
• daab6ef78b add custom emoticons feature/emoji-fixes Devin Howard 2017-01-09 15:34:50 -05:00
• e9e6b1dc09 tweak chat emoji (#1019) Devin Howard 2017-01-09 14:55:21 -05:00
• 492a41f19b tweak chat emoji Devin Howard 2017-01-09 14:25:12 -05:00
• e84dfbaa33 fix message styling Connor Turland 2017-01-09 13:27:39 -05:00
• cb95e027c4 Add emoji to chat (#1013) Devin Howard 2017-01-09 13:14:20 -05:00
• 9939988957 codeclimate (eslint) Devin Howard 2017-01-09 13:09:19 -05:00
• 0e422a24ed tweak styling Devin Howard 2017-01-04 13:34:47 -05:00
• c5a3c92902 bigger font size on chat messages Devin Howard 2017-01-04 13:04:20 -05:00
• 0072887338 add emoji back into messages on display Devin Howard 2017-01-04 12:59:40 -05:00
• e12281ffaa remove unicode emoji from messages before sending to db Devin Howard 2017-01-04 12:57:08 -05:00
• 5ad5a714bc emoji are replaced in the text area Devin Howard 2017-01-03 16:27:11 -05:00
• 533eb99f80 add emoji mart css Devin Howard 2017-01-03 15:14:40 -05:00
• c65bbe7dff junto scss-ified Devin Howard 2017-01-03 14:31:55 -05:00
• f18c42bcf4 rename junto.css.erb => junto.scss.erb Devin Howard 2017-01-03 14:23:57 -05:00
• eb0a7b20aa add emoji picker unstyled Devin Howard 2017-01-03 14:23:44 -05:00
• 3ff102b228 initial particle test Connor Turland 2017-01-05 00:05:18 -05:00
• 8e50efb3c1 render messages nicer Connor Turland 2017-01-04 18:11:44 -05:00
• 5ab5f6fec2 Update README.md Connor Turland 2017-01-04 17:17:53 -05:00
• cbf1ec3afb fix missing npm github dep (#1011) Devin Howard 2017-01-04 12:34:08 -05:00
• df9d973f4f fix missing npm github dep Devin Howard 2017-01-04 12:26:02 -05:00
• d3315d962d only render google analytics if a tracking code envvar is set Connor Turland 2017-01-04 12:08:12 -05:00
• ae05fb35d3 more config updates for heroku Connor Turland 2017-01-04 11:14:03 -05:00
• 9e6ce90950 update config for heroku and prod Connor Turland 2017-01-04 11:08:32 -05:00
• bf9b25da9f merge develop Connor Turland 2017-01-04 10:50:59 -05:00
• 3868910dde Stream map related events from rails server via actioncable instead of nodejs (#1010) Connor Turland 2017-01-03 16:12:58 -05:00
• 1775c6a8b2 wasn't set up correctly for nodejs realtime Connor Turland 2017-01-03 16:11:56 -05:00
• 50e7e400e1 rubocop fixes Connor Turland 2017-01-03 15:14:40 -05:00
• eacd9dae67 verify before streaming from map channel Connor Turland 2017-01-03 15:09:20 -05:00
• 40488b74f2 make todo comments clear Connor Turland 2016-12-31 06:15:55 +00:00
• dda1a065f3 add the moved event Connor Turland 2016-12-31 06:01:14 +00:00
• 107b42bc88 map is polymorphic on message Connor Turland 2016-12-29 23:46:15 +00:00
• c871c0e504 clean up receivable Connor Turland 2016-12-29 20:34:05 +00:00
• b6ce1d8c19 get all events working Connor Turland 2016-12-29 20:28:30 +00:00
• 36449cce47 send events from server to client Connor Turland 2016-12-29 05:52:00 +00:00
• 829e3ad29b remove the old way Connor Turland 2016-12-28 16:22:34 +00:00
• c3cf74f126 add framework Connor Turland 2016-12-28 16:06:55 +00:00
• c7c25255d2 actioncable needs puma not webrick Connor Turland 2016-12-28 15:48:11 +00:00
• db14e4a524 Merge d1680c1895 into 5c1261892f Connor Turland 2016-12-27 02:19:35 +00:00
• 964dbeb2d1 Merge 03a6d45822 into 5c1261892f Connor Turland 2016-12-27 02:19:35 +00:00
• 5c1261892f remove the one pixel gap between search input and icon Connor Turland 2016-12-26 21:03:22 -05:00
• 9ada1ca935 remove exclamation mark Connor Turland 2016-12-26 17:19:56 -05:00