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

• 7117068d34 add index/collections/paging. overriding most of snorlax now |:) Devin Howard 2016-08-20 17:02:06 +08:00
• 8375b32915 reusable embedding code Devin Howard 2016-08-20 13:44:26 +08:00
• c7343761aa module Api::V1 Devin Howard 2016-08-20 12:32:18 +08:00
• 9abf6d5ba9 new serializers renamed to serializers Devin Howard 2016-08-20 12:28:28 +08:00
• d817f16b4f fix travis and rspec Devin Howard 2016-08-07 18:57:19 +08:00
• 7ba09d3148 fix some errors with controllers/serializers Devin Howard 2016-07-01 15:18:38 +08:00
• 02f402025e update config directory for rails 5 Devin Howard 2016-07-01 15:18:18 +08:00
• 30b1f05112 fiddle with javascripts and add sprockets manifest file Devin Howard 2016-07-01 15:17:49 +08:00
• dd410641ff update Gemfile to rails 5 and ruby 2.3.0 Devin Howard 2016-07-01 15:16:39 +08:00
• 40cb7606e3 enable metamaps.debug whoops Devin Howard 2016-09-13 15:21:00 +08:00
• 0b64b6371f fix pull changes docs Devin Howard 2016-09-13 15:18:19 +08:00
• eaffc346fd v2.9.1 v2.9.1 Devin Howard 2016-09-13 14:30:09 +08:00
• 6b2887e8da namespace the event listeners to turn them off (#637) Connor Turland 2016-09-11 18:47:59 -04:00
• 6759396ae3 namespace the event listeners to turn them off Connor Turland 2016-09-11 18:43:30 -04:00
• 4a8b017144 add nvmrc Connor Turland 2016-09-10 20:30:58 -04:00
• 9070bfc836 use a subset of the simplest metacodes for new users (#633) Connor Turland 2016-09-09 20:36:49 -04:00
• fb88c31ca9 Update user_preference.rb Connor Turland 2016-09-09 20:35:04 -04:00
• d10974f0e8 Update user_preference.rb Connor Turland 2016-09-09 20:31:26 -04:00
• d3bc3e3d18 dont change home link in the mapper profile case Connor Turland 2016-09-10 00:29:10 +00:00
• 75260496be annoying scroll issue fix (#634) Connor Turland 2016-09-09 17:06:05 -04:00
• bf6081d88b annoying scroll issue fix Connor Turland 2016-09-09 21:04:48 +00:00
• b47b09265d use a subset of the simplest ones for new users Connor Turland 2016-09-09 19:43:07 +00:00
• 61465ff148 Merge pull request #630 from metamaps/feature/mapping-policy Devin Howard 2016-09-05 18:58:38 +08:00
• 8d372f780d Merge pull request #626 from metamaps/bug/detached Devin Howard 2016-09-05 11:58:08 +08:00
• 3e38fba215 remove relatives1 and relatives2 Devin Howard 2016-09-05 11:55:19 +08:00
• e761e1693c use Topic.relatives scope to get all relatives Devin Howard 2016-09-05 11:52:35 +08:00
• 158e2d5383 add mapping policy Devin Howard 2016-09-05 10:47:11 +08:00
• 9db6d84898 Merge 54a68800b0 into 7de89cfa0f Devin Howard 2016-09-03 06:07:35 +00:00
• 54a68800b0 use policy scope Devin Howard 2016-09-03 14:02:47 +08:00
• 7de89cfa0f shouldn't reference relatives that are connected in private ways Connor Turland 2016-09-02 12:37:01 -04:00
• 4a2f3203bd Update clean.css.erb Connor Turland 2016-09-01 15:41:20 -04:00
• 3c8e9d3be2 automatic versioning via git Devin Howard 2016-09-01 16:14:37 +08:00
• 8a55491dab forgot last updated Devin Howard 2016-09-01 15:48:47 +08:00
• b36dc03f59 bump version to 2.9.0 v2.9.0 Devin Howard 2016-09-01 10:14:02 +08:00
• 549c086af4 styleee (#620) Connor Turland 2016-08-31 18:57:19 -04:00
• a8c4529140 styleee Connor Turland 2016-08-31 18:55:58 -04:00
• 19dabe81cc Enable users to star maps, and to see their starred collection (#615) Connor Turland 2016-08-31 16:58:49 -04:00
• 264068c84d make phrasing clearer Connor Turland 2016-08-30 18:22:06 -04:00
• 9cd6306cc9 oops Connor Turland 2016-08-30 17:19:25 -04:00
• 1c14b59238 Merge branch 'develop' into feature/stars Connor Turland 2016-08-30 17:05:00 -04:00
• 370499e453 avoid prompt Connor Turland 2016-08-30 16:59:29 -04:00
• 7824477d10 starred maps display as starred without refreshing Connor Turland 2016-08-30 15:05:23 -04:00
• 0fdb38b0a5 proper star icon Connor Turland 2016-08-30 14:55:04 -04:00
• d7759c8c07 Redo all of explore together in React (#617) Connor Turland 2016-08-21 21:02:49 -04:00
• d344e022e5 we're not opening/closing the search anymore Connor Turland 2016-08-22 00:50:59 +00:00
• bc7c831006 no more need for manual scroll reseting Connor Turland 2016-08-22 00:49:37 +00:00
• 208ab8d68d unify explore in react Connor Turland 2016-08-22 00:41:21 +00:00
• 919532af81 users should be able to star others maps Connor Turland 2016-08-20 21:50:50 -04:00
• 69cff163dc enable starring Connor Turland 2016-08-20 21:09:29 -04:00
• c89a6771ea Fix mapper page bugs + other things (#611) Connor Turland 2016-08-17 10:00:37 -04:00
• 92658167b1 enable loading more Connor Turland 2016-08-17 13:53:11 +00:00
• d7ee879590 fixup callbacks when fetching user Connor Turland 2016-08-17 13:28:37 +00:00
• d90c87c35c styling was broken on admin pages Connor Turland 2016-08-17 12:22:42 +00:00
• d011552100 make sure the mobile map title updates Connor Turland 2016-08-17 12:16:36 +00:00
• aab3b781de fix centering of explore headers Connor Turland 2016-08-17 12:16:12 +00:00
• 4cb1dfe401 include link to create new map in mobile menu Connor Turland 2016-08-16 15:45:54 +00:00
• 21e2418281 move apps header out of exploreMapsHeader Connor Turland 2016-08-16 15:38:05 +00:00
• b8c8f25c83 fixup applications page Connor Turland 2016-08-16 14:30:10 +00:00
• b58f55353a switch so that backbone router is opt-in, not opt-out (#610) Connor Turland 2016-08-16 10:25:07 -04:00
• dbabb9c378 switch so that backbone router is opt-in, not opt-out Connor Turland 2016-08-16 14:11:12 +00:00
• 03e98e617b fix login redirect loop - fixes #602 (#609) Devin Howard 2016-08-16 20:03:22 +08:00
• 57181e208f layout tweaks (#607) Connor Turland 2016-08-16 08:03:06 -04:00
• 63389e4982 remove that old code Connor Turland 2016-08-16 12:02:19 +00:00
• 29ae6d5e63 just writing the same code better Connor Turland 2016-08-16 11:57:52 +00:00
• ba48899a64 fix login redirect loop - fixes #602 Devin Howard 2016-08-16 19:29:32 +08:00
• 2c54d906fc add { } Devin Howard 2016-08-16 08:44:44 +08:00
• c17fee4449 Merge branch 'develop' into feature/layout.tweaks Connor Turland 2016-08-15 17:02:02 -04:00
• da30078ef4 er, we use a static/modded version of best_in_place (#608) Connor Turland 2016-08-15 17:01:24 -04:00
• f49e6f1a4d er, we use a static/modded version of best_in_place Connor Turland 2016-08-15 16:59:35 -04:00
• 585cd7035c hide the search on logged out homepage Connor Turland 2016-08-15 16:16:25 -04:00
• 50bafaca67 new map creation pops to new window Connor Turland 2016-08-15 16:07:25 -04:00
• 5b5fc86a3b enable text overflow for title on mob (#606) Connor Turland 2016-08-14 12:50:44 -04:00
• 8dde4ae8cc enable text overflow for title on mob Connor Turland 2016-08-14 16:47:56 +00:00
• 15ca43d49f Merge pull request #601 from metamaps/fix/nil-mapping-export Devin Howard 2016-08-14 14:14:51 +08:00
• 0140d68e87 adjusted media query breakpoints Connor Turland 2016-08-14 00:31:48 +00:00
• d4d992a0da improve styling for mobile of map list (#605) Connor Turland 2016-08-13 20:10:23 -04:00
• a6eafa5523 improve styling for mobile of map list Connor Turland 2016-08-14 00:07:15 +00:00
• 34ecf4f70b enable panning (#603) Connor Turland 2016-08-12 11:07:59 -04:00
• cb32a82486 enable panning Connor Turland 2016-08-12 14:42:38 +00:00
• c77e3b2da5 Merge pull request #578 from metamaps/paring.down Devin Howard 2016-08-12 13:42:57 +08:00
• 6eff5e640e Metamaps.Mobile.js dependencies comment Devin Howard 2016-08-12 13:32:51 +08:00
• ceb335e728 use border radius on profile image Connor Turland 2016-08-12 05:09:10 +00:00
• dc60c3f3ed add profile image and fix exploreMaps bar Connor Turland 2016-08-12 05:03:28 +00:00
• 796f4d57a1 I think this fixes issue #566 but I'm not sure Devin Howard 2016-08-12 12:39:30 +08:00
• b4c75649ba all teh mobile things Connor Turland 2016-08-12 04:04:18 +00:00
• f4eb9250ad npm update Devin Howard 2016-08-12 10:51:14 +08:00
• 449c2084bb make maps go under explore bar Connor Turland 2016-08-11 17:26:11 -04:00
• 44bb0020bc Merge branch 'develop' into paring.down Connor Turland 2016-08-11 15:59:45 -04:00
• fae69133be try fixing react warnings again Devin Howard 2016-08-11 11:42:35 +08:00
• bdac00bc10 fix typo Connor Turland 2016-08-11 01:44:40 +00:00
• 848bb11c08 needed to clear div switching between map view and topic view Connor Turland 2016-08-10 18:37:26 +00:00
• d5cec3844b make sure toast hides again Connor Turland 2016-08-10 18:08:48 +00:00
• a3f1d51bc6 make the toast work Connor Turland 2016-08-10 18:06:28 +00:00
• da090e60db remove homepage changes Connor Turland 2016-08-10 17:32:43 +00:00
• c308e276e8 Merge branch 'develop' into paring.down Connor Turland 2016-08-10 17:16:33 +00:00
• 63b528c8bf don't import into textarea elements either - fix #579 (#598) Devin Howard 2016-08-11 01:14:33 +08:00
• 9db5ce551e inject NODE_ENV into webpack - probably fixes #595 (#599) Devin Howard 2016-08-11 01:13:54 +08:00
• f71d552504 Merge branch 'develop' into paring.down Connor Turland 2016-08-10 17:09:37 +00:00
• 31f3931f71 inject NODE_ENV into webpack - probably fixes #595 Devin Howard 2016-08-10 11:38:42 +08:00
• a116137dcc don't import into textarea elements either - fix #579 Devin Howard 2016-08-10 10:43:18 +08:00