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

• b321c76390 bare minimum topic import functionality - use by Ctrl+V onto the map canvas itself Devin Howard 2016-02-07 16:56:03 +08:00
• 40a833b069 Merge pull request #473 from metamaps/feature/fix-invite-link Devin Howard 2016-02-21 15:22:34 +08:00
• bd6a5ee9c4 Merge pull request #472 from metamaps/feature/allow-embedding Devin Howard 2016-02-21 15:19:54 +08:00
• e629a9bf71 fix get_invite_link function. fixes #471 Devin Howard 2016-02-19 18:09:46 +08:00
• 7b9c6459e3 allow embedding Devin Howard 2016-02-19 09:23:39 +08:00
• 5dc32186e8 Merge pull request #470 from metamaps/feature/remove-phantomjs Devin Howard 2016-02-18 15:04:38 +08:00
• 00c10c99d8 remove phantom js Devin Howard 2016-02-18 14:25:47 +08:00
• affb1672ae bite the bullet and link build icon to the jenkins job Devin Howard 2016-02-18 14:11:39 +08:00
• 2f4b3b3761 call was ending in wrong situation Connor Turland 2016-02-17 13:49:48 +13:00
• d82288c9f2 fixed up call ending/starting events Connor Turland 2016-02-17 13:27:22 +13:00
• d61b6c1280 smarter db creation. don't use db:reset or db:setup. Devin Howard 2016-02-14 14:02:53 +08:00
• 9ff6375e62 don't need to create synapse on canvas click Devin Howard 2016-02-12 15:30:36 +08:00
• dc1aa1e28e document synapse cancellation in cheatsheet Devin Howard 2016-02-12 15:08:24 +08:00
• 9469b08ffa cancel synapse creation with esc, backspace, or delete Devin Howard 2016-02-12 11:21:22 +08:00
• 056ef2b5b6 smoother synapse creation with clicks/tabs Devin Howard 2016-02-11 14:54:00 +08:00
• 48863ce246 create synapse if you click away from the synapse title form Devin Howard 2015-03-02 18:05:45 -05:00
• c3a1bf5187 don't need to create synapse on canvas click Devin Howard 2016-02-12 15:30:36 +08:00
• 800ce954dd document synapse cancellation in cheatsheet Devin Howard 2016-02-12 15:08:24 +08:00
• f125c31e2a cancel synapse creation with esc, backspace, or delete Devin Howard 2016-02-12 11:21:22 +08:00
• 830f10d42e smoother synapse creation with clicks/tabs Devin Howard 2016-02-11 14:54:00 +08:00
• 8e61865de4 create synapse if you click away from the synapse title form Devin Howard 2015-03-02 18:05:45 -05:00
• 1be102467e Merge pull request #461 from metamaps/feature/rspec-tests Devin Howard 2016-02-12 15:09:32 +08:00
• f9bcd33344 update synapses specs; all specs pass again. all models/controllers tested Devin Howard 2016-02-09 14:25:39 +08:00
• 0c81c8d9de topics controller spec Devin Howard 2016-02-09 13:42:24 +08:00
• 7f50db1ae9 ok metacode spec done Devin Howard 2016-02-09 13:30:49 +08:00
• 6d0dcec1ba mess with metacode tests Devin Howard 2016-02-09 12:43:34 +08:00
• f3f8bfbea8 remove map screenshot tests for now. maps controller spec passes Devin Howard 2016-02-09 11:59:04 +08:00
• 43bdda61de maps controller spec passes, 3 pending Devin Howard 2016-02-09 11:48:07 +08:00
• 374ac701c9 filling out map controller spec Devin Howard 2016-02-09 11:33:43 +08:00
• 005250f330 typo Devin Howard 2016-02-09 11:26:42 +08:00
• 7956e6d289 check map#contains matches json schema in spec Devin Howard 2016-02-09 11:20:27 +08:00
• 0b98e446ca fiddle with maps_controller code style Devin Howard 2016-02-09 11:20:04 +08:00
• e29b683b38 new junto images Connor Turland 2016-02-09 09:14:33 +13:00
• 451ed81010 remove tests that shouldn't be there Devin Howard 2016-02-08 12:00:38 +08:00
• 17ee69b147 start fixing other controller specs Devin Howard 2016-02-08 11:56:46 +08:00
• 80a6bcbca2 remove annoying rcov gem Devin Howard 2016-02-05 15:35:06 +08:00
• e460899ea3 testing simplecov and rcov stuff Devin Howard 2016-02-01 17:25:06 +08:00
• d64fe002dc suppress devise warnings on rspec tests Devin Howard 2016-01-26 18:47:42 +08:00
• cc99ed001d fix mapping_controller_spec.rb Devin Howard 2016-01-26 18:42:24 +08:00
• 46013bc1b5 start speccing out mappings controller Devin Howard 2016-01-26 18:14:32 +08:00
• fa3a725df9 mapping spec Devin Howard 2016-01-26 17:58:33 +08:00
• b3f8f6652a simplecov added Devin Howard 2016-01-26 17:53:10 +08:00
• caa65c1170 metacode spec Devin Howard 2016-01-26 17:29:18 +08:00
• 987cd7f5a0 Merge branch 'feature/xls.export' into release/v2.8 Devin Howard 2016-02-08 09:58:09 +08:00
• f42b30e8b5 Merge branch 'feature/auto.synapse' into release/v2.8 Devin Howard 2016-02-08 09:57:58 +08:00
• 0ae8ea0ca5 implement csv/xls export Devin Howard 2016-02-05 17:49:59 +08:00
• 83551e317e create synapse if you click away from the synapse title form Devin Howard 2015-03-02 18:05:45 -05:00
• 786eeae72a Merge branch 'develop' into feature/realtime.video Devin Howard 2016-02-06 12:56:23 +08:00
• e4d53162a7 Merge branch 'master' into develop Devin Howard 2016-02-06 12:55:02 +08:00
• f9128dad7a vendor in gitignore v2.7.2 Devin Howard 2016-02-06 12:52:38 +08:00
• 9e28fa1ea7 public dir perms Devin Howard 2016-02-06 12:52:25 +08:00
• 798035107f Merge branch 'master' into develop Devin Howard 2016-02-06 10:11:55 +08:00
• 246c344959 add rake perms:fix task for public dir Devin Howard 2016-02-06 09:42:40 +08:00
• ea11ce69e5 update public dir, including 503.html' Devin Howard 2016-02-06 09:42:33 +08:00
• 785e7dda4b create 503.html for server maintenance Devin Howard 2016-02-06 09:34:51 +08:00
• 67da49c1be max height on search results so they scroll Devin Howard 2016-02-05 22:13:23 +08:00
• 57a8b654ba smoother 'added by me' filtering Devin Howard 2016-02-05 21:25:20 +08:00
• 3fe93be987 Merge branch 'master' into develop Devin Howard 2016-02-05 20:21:31 +08:00
• ef307f1d46 Merge pull request #459 from metamaps/fix/searchbox Devin Howard 2016-02-05 20:20:13 +08:00
• cd10ee97ee typo Devin Howard 2016-02-05 20:16:54 +08:00
• 48ec4a024e mark 2.7.1 v2.7.1 Devin Howard 2016-02-05 20:12:05 +08:00
• 6b9aa52224 well, the loading icon mostly works now too Devin Howard 2016-02-05 20:09:00 +08:00
• 5f90843da2 gross, but it works. checkboxes in search results work Devin Howard 2016-02-05 20:02:57 +08:00
• c427e7fd7e mess with typeahead(val) calls. looks like the header is being destroyed during suggestion rendering, need a variable Devin Howard 2016-02-05 19:54:38 +08:00
• 353872001f vertical align no results Devin Howard 2016-02-05 19:21:09 +08:00
• aabdaaf21b nicer icon positioning Devin Howard 2016-02-05 19:19:16 +08:00
• f1f56f9286 centre topic icons if there are results Devin Howard 2016-02-05 19:11:19 +08:00
• 461b62628d fix minimizing search results Devin Howard 2016-02-05 19:06:57 +08:00
• 3405bf5942 fix the problem where it always closes on you Devin Howard 2016-02-05 18:56:16 +08:00
• a05fe70eda topic headers on resultnoresults Devin Howard 2016-02-05 18:35:45 +08:00
• b3d321c7e9 topic icon <-- Devin Howard 2016-02-05 18:27:26 +08:00
• 27e5830c4f move configure.sh into bin folder Devin Howard 2016-02-05 18:12:25 +08:00
• ed88445c6b update configure.sh Devin Howard 2016-02-05 18:12:00 +08:00
• 821966c5db update schema.rb Devin Howard 2016-02-05 18:11:35 +08:00
• 9a68a2d3c1 jenkins ruby versioning smarter Devin Howard 2016-02-05 18:02:30 +08:00
• 8202fb38f3 Merge branch 'develop' into feature/realtime.video Devin Howard 2016-02-05 16:27:43 +08:00
• 5d4cb4829a Merge f31be9a3f3 into a1d2ef70b9 Devin Howard 2016-02-05 07:44:43 +00:00
• f31be9a3f3 add two functions to demonstrate a simple input-from-Excel. Open an Excel document, create two columns, put name in the first column and metacode in the second, and then populate it with names and valid metacodes. Copy-paste the cells (just click, drag, and copy) and paste them into the textarea created by Metamaps.Topic.createCSVInputTextarea. Hit enter and it'll call parseTopicCSVInput and create your topics. Devin Howard 2015-02-28 19:55:45 -05:00
• f2cbde50ca dos2unix on the whole repo Devin Howard 2016-02-03 21:38:41 +08:00
• 3e28831595 Merge branch 'develop' into feature/realtime.video Devin Howard 2016-02-05 11:38:19 +08:00
• c80efac7de tag v2.8 Devin Howard 2016-02-05 11:32:52 +08:00
• a1d2ef70b9 Merge pull request #451 from metamaps/feature/contributing.md.updates Devin Howard 2016-02-05 11:35:42 +08:00
• 85290d0e70 Update CONTRIBUTING.md Devin Howard 2015-12-29 10:47:51 +08:00
• b43804bf80 Merge pull request #421 from metamaps/develop v2.7 Devin Howard 2016-02-05 11:31:24 +08:00
• e73ade0442 tag v2.7 Devin Howard 2016-02-05 11:29:05 +08:00
• 9a548e261b Merge branch 'master' into develop Devin Howard 2016-02-04 18:10:07 +08:00
• c8d6563f45 changed links from old uservoice url. poietic 2016-01-29 16:00:30 -08:00
• 5ec77b44cd add develop branch build status badge Devin Howard 2016-01-26 18:54:04 +08:00
• 38f46bd8c4 add jenkins-test.sh script Devin Howard 2016-01-26 16:58:15 +08:00
• 8e07c10ecc make sure the chat pane is closed for opening the next map Connor Turland 2016-01-26 15:29:32 +13:00
• 1fa84e0d29 chat only displays on maps Connor Turland 2016-01-26 14:46:26 +13:00
• b80fabcbcf was just old copied code not a file in use Connor Turland 2016-01-26 14:14:33 +13:00
• c9ebfee968 default branch to develop in README.md Devin Howard 2016-01-25 17:19:53 +08:00
• 8a74118cb1 Merge branch 'develop' into feature/realtime.video Devin Howard 2016-01-25 11:23:32 +08:00
• 79431f8515 fix user seeds Devin Howard 2016-01-25 11:23:10 +08:00
• 74d372b942 fix the scrolling in the chat messages box Connor Turland 2016-01-22 16:49:50 +13:00
• 5d838303a8 broken gemfile.lock and pass recent migrations Connor Turland 2016-01-22 16:14:35 +13:00
• 4557b8e305 merge develop Connor Turland 2016-01-22 14:59:09 +13:00
• cbd82b92fe Merge branch 'develop' of https://github.com/metamaps/metamaps_gen002 into develop Devin Howard 2016-01-20 10:19:03 +08:00
• 8a8ac92a8f data safety Devin Howard 2016-01-20 10:18:44 +08:00