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

• 7eb8ae37ee Merge pull request #526 from metamaps/fix/invite-link Devin Howard 2016-04-01 13:37:33 +08:00
• 7d6acb7014 fix json import Devin Howard 2016-03-31 13:03:14 +08:00
• a83382efe9 Merge branch 'develop' v2.8.2 Devin Howard 2016-03-31 10:11:49 +08:00
• b9b9e57c41 Merge pull request #528 from metamaps/fix/import-fixes Devin Howard 2016-03-31 10:04:33 +08:00
• ccd07ddd19 import fixes Devin Howard 2016-03-31 09:25:14 +08:00
• a2fe1399e4 fix invite link Devin Howard 2016-03-29 22:34:47 +08:00
• c1aa7c6a92 Merge pull request #523 from metamaps/feature/production-deploy-steps Devin Howard 2016-03-29 10:00:00 +08:00
• da25dd0d9c add production deploy/update steps (see issue #518) Devin Howard 2016-03-28 10:38:10 +08:00
• b2a4cbf3ec Merge pull request #522 from Tadasu85/master Raymon Johnstone 2016-03-27 18:09:16 -04:00
• e1c0509c91 Merge pull request #520 from metamaps/develop v2.8.1 Connor Turland 2016-03-27 12:12:26 -07:00
• 3c03d30c08 Merge pull request #519 from metamaps/bug/requestinvite Connor Turland 2016-03-27 12:11:21 -07:00
• 8fa856451d request invite page was broken Connor Turland 2016-03-27 12:02:21 -07:00
• fbba487b83 Merge pull request #482 from metamaps/develop v2.8 Connor Turland 2016-03-27 00:43:54 -07:00
• 8a6e702c12 fix js error Devin Howard 2016-03-27 15:32:18 +08:00
• dae3106b34 Merge pull request #509 from metamaps/feature/import.export Devin Howard 2016-03-27 15:22:17 +08:00
• 49f4b2030e gemfile.lock needed to change for travis to be happy Connor Turland 2016-03-27 00:21:32 -07:00
• 30d327f07a solution using backbone events instead of setTimeout Devin Howard 2016-03-27 15:20:09 +08:00
• a82b0048d8 don't need sequenced Connor Turland 2016-03-27 00:14:22 -07:00
• f9e6249615 Fix up import - want more backboney event listening though Devin Howard 2016-03-27 11:46:58 +08:00
• e4145ef9fb Merge pull request #506 from metamaps/feature/import.export Connor Turland 2016-03-26 23:46:28 -07:00
• ae9f4a51a2 fix a few embarassing errors - export is working Devin Howard 2016-03-26 15:21:55 +08:00
• 53867caae8 allow JSON or TSV parsing Devin Howard 2016-03-26 14:20:49 +08:00
• 92f78aa56a update tsv code to handle new export code at the very least. Devin Howard 2016-03-26 12:49:26 +08:00
• d3649f1d26 DRY map exporting with policy_scoping Devin Howard 2016-03-26 11:31:55 +08:00
• 14bdc8546b metacodes#show routes Devin Howard 2016-03-26 10:12:32 +08:00
• 579ddcc047 Merge pull request #505 from metamaps/fix/crappy-export Devin Howard 2016-03-25 16:55:05 +08:00
• 387c863222 fix a bug with synapses and use cid to link new topics with synapses Devin Howard 2016-02-21 17:02:37 +08:00
• c77cc32734 import fixes Devin Howard 2016-02-21 16:28:31 +08:00
• ea677f8a6b DRY up csv/xls rendering, put it into model Devin Howard 2016-02-13 12:53:07 +08:00
• 8f532708ce update xls/csv format to better serialize topics and synapses Devin Howard 2016-02-12 15:57:34 +08:00
• 61262aaec2 implement csv/xls export Devin Howard 2016-02-05 17:49:59 +08:00
• 0c1e12a301 use state machine to implement smarter topic/synapse import Devin Howard 2016-02-14 22:39:29 +08:00
• b47ed7b5b4 don't ask about adding 0 topics Devin Howard 2016-02-07 17:51:01 +08:00
• 6df7fa849a bare minimum topic import functionality - use by Ctrl+V onto the map canvas itself Devin Howard 2016-02-07 16:56:03 +08:00
• 6c055ea3b9 add missing synapses_csv function (fixes #504) Devin Howard 2016-03-25 16:35:43 +08:00
• 87d6dfe8de fix the autocomplete Connor Turland 2016-03-24 23:36:57 -07:00
• b36d5df6cb this may make it work Connor Turland 2016-03-24 23:33:26 -07:00
• c6f1e3cc4a breaking the mapping_policy Connor Turland 2016-03-24 23:29:08 -07:00
• fc1dc591f3 Merge branch 'copy/version.and.peers' into develop Connor Turland 2016-03-24 21:28:24 -07:00
• 415c9b8ac3 final touchups on oauth Connor Turland 2016-03-24 21:26:07 -07:00
• 540b35c757 Merge branch 'feature/no-cancancan' into develop Connor Turland 2016-03-24 20:47:35 -07:00
• 42eea78bc4 Merge branch 'fix/typo' into develop Connor Turland 2016-03-24 20:47:23 -07:00
• 530a16cadb instantiate_resource Devin Howard 2016-03-25 10:26:32 +08:00
• 34d3a80db1 use new pundit-enabled snorlax Devin Howard 2016-03-25 10:05:22 +08:00
• 14dfe3c926 styling for doorkeeper and api functional Connor Turland 2016-03-24 17:16:27 -07:00
• e23224aa16 Merge pull request #1 from metamaps/master Raymon Johnstone 2016-03-23 22:51:42 -04:00
• 4f86c127cd Merge 5054773473 into b6fac7d49b Devin Howard 2016-03-24 02:30:20 +00:00
• 5054773473 this seems to fix the uninitialized constant error Devin Howard 2016-03-24 10:30:10 +08:00
• b783c8b6b2 remove cancan Devin Howard 2016-03-24 10:17:45 +08:00
• 5317711b57 Merge branch 'develop' into oauth.provider Connor Turland 2016-03-23 18:00:59 -07:00
• a9a5ca9136 Merge e4600a987a into b6fac7d49b Connor Turland 2016-03-24 00:54:24 +00:00
• b6fac7d49b Merge pull request #420 from metamaps/feature/realtime.video Connor Turland 2016-03-23 17:46:35 -07:00
• e4600a987a v2.8 actually Devin Howard 2016-03-24 08:26:09 +08:00
• 70bc0959b0 update version, date, and peers Connor Turland 2016-03-23 16:50:53 -07:00
• c4890274f2 switch messages to use pundit Connor Turland 2016-03-23 16:29:26 -07:00
• baa5439f0f auto position videos which haven't been manually positioned Connor Turland 2016-03-23 16:12:23 -07:00
• 3bb3fa9e73 Merge pull request #493 from metamaps/feature/icon-tests Devin Howard 2016-03-22 14:22:05 +08:00
• b305584d5d Merge pull request #490 from metamaps/feature/call-for-developers Devin Howard 2016-03-22 14:21:52 +08:00
• cb4137c13f Merge pull request #491 from metamaps/feature/rails-intro Devin Howard 2016-03-22 14:21:38 +08:00
• 617dec72b9 hide sound option. green 'in call' dot. tooltip Connor Turland 2016-03-21 13:08:34 -07:00
• e6ac4b1dcb make metamaps an oauth provider Connor Turland 2016-03-19 13:28:55 +11:00
• 0c3010be90 Small revisions to rails intro Devin Howard 2016-03-16 11:45:12 +08:00
• a0d38c8fb8 check https manual icons Devin Howard 2016-03-16 11:42:51 +08:00
• 8b54e53743 metacode icon tests Devin Howard 2016-03-16 11:39:24 +08:00
• 5ea61341eb add rails intro for newcomers Devin Howard 2016-03-15 16:16:19 +08:00
• 756fe75664 call for developers in Inspect Element window Devin Howard 2016-02-29 10:46:42 +08:00
• f055f4c7c5 Merge branch 'develop' into feature/realtime.video Connor Turland 2016-03-14 21:45:36 +11:00
• ac9460be77 do still need cancan Connor Turland 2016-03-14 21:44:50 +11:00
• 1ee33b843f Merge branch 'develop' into feature/realtime.video Connor Turland 2016-03-14 21:40:25 +11:00
• 3e24a088da Merge branch 'develop' of github.com:metamaps/metamaps_gen002 into develop Connor Turland 2016-03-14 21:36:57 +11:00
• 8bd032472d topic related things weren't working at all Connor Turland 2016-03-14 21:36:34 +11:00
• f24def8be6 fix up javascript errors Connor Turland 2016-03-14 21:36:16 +11:00
• 10a5a099e7 Merge pull request #489 from metamaps/feature/fix-tests Connor Turland 2016-03-14 18:17:25 +11:00
• 5cb5eac9d6 Merge pull request #488 from metamaps/feature/no-cancan Devin Howard 2016-03-14 14:44:35 +08:00
• a05c7dc5fe avoid pundit error if no map specified with a mapping Devin Howard 2016-03-14 14:37:01 +08:00
• d11f3923dd remove unused has_viewable_synapses function Devin Howard 2016-03-14 14:34:36 +08:00
• 32326ff4af update map/topic delete action test Devin Howard 2016-03-14 11:46:45 +08:00
• 7716462c8f fix topics controller test Devin Howard 2016-03-14 11:40:23 +08:00
• ee0ca3ba35 Merge pull request #487 from metamaps/feature/pundit Devin Howard 2016-03-14 11:46:09 +08:00
• f7201e048e pending mapping policy Devin Howard 2016-03-14 11:15:10 +08:00
• 3823c708fd update mapping policy Devin Howard 2016-03-14 11:09:27 +08:00
• c5009952f3 remove permissions tests Devin Howard 2016-03-14 11:03:30 +08:00
• dbb8052a17 trifecta of policy tests Devin Howard 2016-03-14 11:00:54 +08:00
• 88c070cbbd no cancan Devin Howard 2016-03-14 10:55:26 +08:00
• 8664cc0bd9 Merge branch 'develop' into feature/realtime.video Connor Turland 2016-03-14 11:11:11 +11:00
• 579c36ec75 ensure the search box opens Connor Turland 2016-03-14 11:10:18 +11:00
• 6715ba7e7f not a function Connor Turland 2016-03-14 11:03:11 +11:00
• 604087c592 Merge branch 'develop' into feature/realtime.video Connor Turland 2016-03-14 10:45:16 +11:00
• 6f5258cbb7 needed a policy for tokens Connor Turland 2016-03-14 08:19:26 +11:00
• b40fedda1a Merge pull request #483 from harlantwood/travis Connor Turland 2016-03-14 07:54:20 +11:00
• e0b2991596 Merge pull request #484 from harlantwood/token-entropy Connor Turland 2016-03-14 07:51:37 +11:00
• f3eb558971 fix test regex Harlan T Wood 2016-03-13 13:28:07 -07:00
• 3fbb3d1dc9 more token entropy Harlan T Wood 2016-03-13 00:20:18 -08:00
• 74cf9ba717 Run tests on Travis CI; show build status badge Harlan T Wood 2016-03-12 19:40:56 -08:00
• 4f76d3914d Merge pull request #418 from metamaps/feature/slack Connor Turland 2016-03-13 12:00:17 +11:00
• 72b2e8f8f2 doesn't look good for now, take it out, add it later Connor Turland 2016-03-13 11:58:09 +11:00
• 77d69dd2a3 turns out we do need delayed_job Connor Turland 2016-03-13 11:56:18 +11:00
• fe578ca3b2 add migrations Connor Turland 2016-03-13 11:24:00 +11:00
• d863d1c15b remove traces of delayed_job Connor Turland 2016-03-13 10:42:55 +11:00
• 11e57c1b37 rebase onto develop which now has API and pundit Connor Turland 2016-03-13 10:36:38 +11:00