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

• 5fbf7ac34d hide metamaps_mobile in gitignore Connor Turland 2016-03-13 03:16:31 +11:00
• b236f4c689 handle not logged in scenarios Connor Turland 2016-03-13 02:41:32 +11:00
• 7ff24fb3b6 Merge pull request #481 from metamaps/feature/api Connor Turland 2016-03-13 02:29:44 +11:00
• 3aec00e07c just don't include mappable for now Connor Turland 2016-03-13 02:28:39 +11:00
• f072e39c4c pundit: sometimes no user Connor Turland 2016-03-13 02:27:05 +11:00
• ada29c6832 cleanup Connor Turland 2016-03-12 21:35:56 +11:00
• efe13dc7c0 Merge branch 'develop' into feature/api Connor Turland 2016-03-12 21:30:27 +11:00
• f58185fd40 Merge branch 'feature/pundit' into develop Connor Turland 2016-03-12 21:26:06 +11:00
• 446619c451 omg not having this was breaking things Connor Turland 2016-03-12 13:20:15 +11:00
• 8b8db40c67 Merge branch 'feature/pundit' into feature/api Connor Turland 2016-03-12 12:59:42 +11:00
• a295c61322 json response was broken Connor Turland 2016-03-12 12:58:13 +11:00
• e4ac5b0134 Merge branch 'feature/pundit' into feature/api Connor Turland 2016-03-12 12:40:11 +11:00
• 7e7ef173e5 map policy spec Devin Howard 2016-03-12 09:27:31 +08:00
• bf4fbbeb06 fix tokens Connor Turland 2016-03-12 12:26:23 +11:00
• bb03b49d80 update main controller (searching) to use policies Devin Howard 2016-03-12 09:09:41 +08:00
• 521aa6b5d0 function no longer exists Connor Turland 2016-03-12 11:58:26 +11:00
• 7f86810f62 remove things again not needed Connor Turland 2016-03-12 11:53:12 +11:00
• a78312f90c Merge branch 'feature/pundit' into feature/api.pundit Connor Turland 2016-03-12 11:49:41 +11:00
• bc505a1361 pundit: now updating maps actually works Connor Turland 2016-03-12 11:35:03 +11:00
• 5d179ae5ec pundit: policy didn't exist Connor Turland 2016-03-12 11:24:49 +11:00
• d0aecc0b31 pundit: make it work Connor Turland 2016-03-12 11:16:46 +11:00
• dc6ccd2022 pundit: fixing up topics and synapses Connor Turland 2016-03-12 11:10:30 +11:00
• 1cf3182e75 pundit: exclude topic action Connor Turland 2016-03-12 10:13:22 +11:00
• bd3afff069 pundit: fix queries Connor Turland 2016-03-12 10:10:31 +11:00
• 5f3f5212c5 pundit: syntax error Connor Turland 2016-03-12 10:06:00 +11:00
• 2d53922f1c can load maps Connor Turland 2016-03-12 09:54:23 +11:00
• d8c328468e changess for pundit Connor Turland 2016-03-12 09:37:32 +11:00
• d0fd676aa0 pundit: now updating maps actually works Connor Turland 2016-03-12 11:35:03 +11:00
• fdd9351378 pundit: policy didn't exist Connor Turland 2016-03-12 11:24:49 +11:00
• cb79f2deae pundit: make it work Connor Turland 2016-03-12 11:16:46 +11:00
• 4ed00240eb api: revert silly js change Connor Turland 2016-03-12 11:15:14 +11:00
• bef21341c6 pundit: fixing up topics and synapses Connor Turland 2016-03-12 11:10:30 +11:00
• 09a7b336bf pundit: exclude topic action Connor Turland 2016-03-12 10:13:22 +11:00
• c7075dab48 pundit: fix queries Connor Turland 2016-03-12 10:10:31 +11:00
• 0095a8daf4 pundit: syntax error Connor Turland 2016-03-12 10:06:00 +11:00
• fc1a7fd23d api: adjust serializers Connor Turland 2016-03-12 10:05:42 +11:00
• 623b3c7ad7 can load maps Connor Turland 2016-03-12 09:54:23 +11:00
• 77d39d6649 redid so they won't interfere Connor Turland 2016-03-12 09:48:07 +11:00
• 450db5eb8d changes for pundit Connor Turland 2016-03-12 09:37:32 +11:00
• 669b337d04 changes for api Connor Turland 2016-03-12 09:37:18 +11:00
• e6017c4129 Merge remote-tracking branch 'origin/feature/pundit' into feature/api.pundit Connor Turland 2016-03-12 07:19:19 +11:00
• eb56755068 implement five policies into their controllers Devin Howard 2016-03-11 22:10:31 +08:00
• 7395811ba5 handle unauthorized with baaaaad 403 Devin Howard 2016-03-11 21:35:48 +08:00
• 73b82801cc consistent permissions Devin Howard 2016-03-11 21:32:18 +08:00
• 615eaf580e mapping policy Devin Howard 2016-03-11 21:30:54 +08:00
• d8cc588efb basics of admin_override policy function Devin Howard 2016-03-11 21:25:24 +08:00
• ccfba03fdb clean up duplicate code Connor Turland 2016-03-11 17:26:54 +11:00
• 059591b78b first pass at important API endpoints, token auth Connor Turland 2016-03-11 17:16:04 +11:00
• ef60aefe88 fix js bug Connor Turland 2016-02-29 17:05:11 +13:00
• b6d0e9aadd Merge 5b47527f46 into 2e6493fd23 Devin Howard 2016-03-07 05:50:38 +00:00
• f7e8b2de1e Merge a0d9d9caa4 into 2e6493fd23 Devin Howard 2016-03-03 09:25:40 +00:00
• dfafa79c66 Merge 4e90e4808d into 2e6493fd23 Devin Howard 2016-03-02 20:53:29 +00:00
• 616dc9ed0e messages weren't being displayed in order Connor Turland 2016-03-01 12:55:00 +13:00
• 26025d6ee9 store the right number of mappers in conversation Connor Turland 2016-03-01 12:30:49 +13:00
• dd457d8362 remove npm debug Connor Turland 2016-03-01 12:26:09 +13:00
• bd5c88fb0b display initial state of call to new mapper Connor Turland 2016-03-01 12:25:38 +13:00
• 2e6493fd23 Merge pull request #478 from metamaps/feature/cleanup Devin Howard 2016-02-29 16:51:49 +08:00
• 4e92d4c2c5 change video border width Connor Turland 2016-02-29 17:05:36 +13:00
• d50923b6bd fix js bug Connor Turland 2016-02-29 17:05:11 +13:00
• a0d9d9caa4 do what you have to do Devin Howard 2016-02-29 11:54:01 +08:00
• b64558f860 ensure Metamaps[prop] is an object Devin Howard 2016-02-29 11:49:14 +08:00
• 6cd988fb31 fix #479 Devin Howard 2016-02-29 11:45:20 +08:00
• c6fea78054 merge develop Connor Turland 2016-02-29 13:58:47 +13:00
• e64a16f1b8 main#home view simplify for only unauthenticated users Devin Howard 2016-02-28 18:55:48 +08:00
• ef5d85c2bf before_filter => before_action Devin Howard 2016-02-28 17:48:18 +08:00
• 36c5ddab1f before_filter => before_action Devin Howard 2016-02-28 17:48:18 +08:00
• 155eac41d8 @ symbols unneeded Devin Howard 2016-02-28 17:24:00 +08:00
• 895b872bda remove unneeded https stuff Devin Howard 2016-02-28 16:57:25 +08:00
• 25774d9f16 remove unneeded https stuff Devin Howard 2016-02-28 16:57:25 +08:00
• cbb6b648be implement main_policy (headless). also remove all @current references Devin Howard 2016-02-28 16:53:59 +08:00
• 3ed6ffbdba @record/@user in topic/synapse policy Devin Howard 2016-02-28 13:29:33 +08:00
• 1e01ff8bc9 map policy Devin Howard 2016-02-28 13:28:28 +08:00
• cec6d3bfcd handle pundit errors with http 403 Devin Howard 2016-02-28 13:24:55 +08:00
• bc7db85c8c update map index views Devin Howard 2016-02-28 13:13:44 +08:00
• bbc36de628 update maps spec Devin Howard 2016-02-13 17:44:11 +08:00
• 8ef847bd6d factor maps#index into 4 separate functions Devin Howard 2016-02-13 17:42:36 +08:00
• baca4aac83 synapse policy Devin Howard 2016-02-13 17:28:21 +08:00
• 52facb9c1d topic policy Devin Howard 2016-02-13 17:28:16 +08:00
• 66f1d2ec0b install pundit Devin Howard 2016-02-13 17:28:09 +08:00
• 8916ff20b6 Merge pull request #477 from metamaps/feature/metacode-icon-on-aws Devin Howard 2016-02-28 12:19:00 +08:00
• ba1427af45 update rspec for metacodes Devin Howard 2016-02-26 14:20:14 +08:00
• ac1d4f70b6 show old image on metacode edit form; tweak css of admin area Devin Howard 2016-02-26 14:04:01 +08:00
• f9b23499dc styling. add self to participants Connor Turland 2016-02-26 12:43:27 +13:00
• 40cd1ebb5c modify metacodes to instead have two fields, and validate that only one is present. Manual icons can be entered through rake tasks or on the rails console or in db seed Devin Howard 2016-02-25 14:41:47 +08:00
• 941b37b8e2 Merge pull request #476 from metamaps/feature/cleanup Devin Howard 2016-02-24 10:19:45 +08:00
• e1b2ddde7d add another TODO... Devin Howard 2016-02-23 19:04:39 +08:00
• 09ceb8ceec move 4 global variables into Metamaps namespace Devin Howard 2016-02-23 19:04:30 +08:00
• 59f84cfe20 cleanup TODO lines Devin Howard 2016-02-23 18:59:45 +08:00
• 7a74668c8d tweaks to lightboxes view post-SSL Devin Howard 2016-02-23 18:56:50 +08:00
• 295534e4ab migrate to using aws/paperclip for metacodes. RUN RAKE TASK ON PRODUCTION Devin Howard 2016-02-23 14:58:20 +08:00
• cb43ebce92 Merge pull request #474 from metamaps/feature/fix-synapse-mappings Devin Howard 2016-02-22 12:33:05 +08:00
• 5b47527f46 don't need xloc or yloc for Synapse mappings Devin Howard 2016-02-21 17:25:39 +08:00
• b385efafa9 don't need xloc or yloc for Synapse mappings Devin Howard 2016-02-21 17:25:39 +08:00
• 1f1cd37553 fix a bug with synapses and use cid to link new topics with synapses Devin Howard 2016-02-21 17:02:37 +08:00
• 7d73da7f7b import fixes Devin Howard 2016-02-21 16:28:31 +08:00
• 4e90e4808d DRY up csv/xls rendering, put it into model Devin Howard 2016-02-13 12:53:07 +08:00
• 987d68198c update xls/csv format to better serialize topics and synapses Devin Howard 2016-02-12 15:57:34 +08:00
• b36722da78 implement csv/xls export Devin Howard 2016-02-05 17:49:59 +08:00
• 85e9486b50 use state machine to implement smarter topic/synapse import Devin Howard 2016-02-14 22:39:29 +08:00
• 669c3c7e44 don't ask about adding 0 topics Devin Howard 2016-02-07 17:51:01 +08:00