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

• 0e7690f2af fix metacode asset path update db migration Devin Howard 2016-01-20 10:18:22 +08:00
• 31f5d464f1 S3_BUCKET_NAME in .example-env Devin Howard 2016-01-19 22:14:35 +08:00
• 3aea952e40 Merge branch 'develop' of https://github.com/metamaps/metamaps_gen002 into develop Devin Howard 2016-01-19 14:27:33 +08:00
• 14a292331b two tweaks to help production deploy Devin Howard 2016-01-19 14:27:25 +08:00
• 1e010c69c2 doc formatting Devin Howard 2016-01-17 10:17:02 +08:00
• c2a2fe4997 better readme for realtime server Devin Howard 2016-01-17 10:14:19 +08:00
• 11fc7a01f3 fixes the issue where video feeds go black after first call Connor Turland 2016-01-09 16:11:28 +13:00
• fe76f340a0 change to the db name causes local dev issues Connor Turland 2016-01-09 12:10:33 +13:00
• 678ec1bbab Update windows installer docs Devin Howard 2015-11-20 14:34:05 +08:00
• f3400d4654 install dotenv to help managed env vars mix irving 2015-03-08 20:21:25 +13:00
• 0e7b01296a dotenv.load in application.rb now Devin Howard 2016-01-08 08:19:46 +08:00
• 1c0f6f2e2a don't put RAILS_ENV into the .env file - chicken and egg Devin Howard 2016-01-07 18:47:58 +08:00
• da03d59d46 comment out uninitialized variables Devin Howard 2016-01-07 18:36:37 +08:00
• e21096f00a initializers for .env Devin Howard 2016-01-07 18:34:24 +08:00
• c6b0ccdbdb database name configurable in .env Devin Howard 2016-01-07 18:29:15 +08:00
• a06a80eb43 Merge pull request #456 from metamaps/feature/rspec-tests Devin Howard 2016-01-07 16:09:40 +08:00
• 4be263c223 prominence to rspec command Devin Howard 2016-01-07 16:06:35 +08:00
• 4842856358 merge develop into rspec-tests Devin Howard 2016-01-07 16:04:23 +08:00
• 4a1e4ef333 refactor user factories to handle codes better Devin Howard 2016-01-07 15:47:45 +08:00
• 4469b29ec2 in user model Devin Howard 2016-01-07 15:32:19 +08:00
• 61d914caba 80 columns on RspecTesting.md Devin Howard 2016-01-07 15:32:11 +08:00
• 8550b68290 Merge branch 'feature/rspec-tests' of https://github.com/metamaps/metamaps_gen002 into feature/rspec-tests Devin Howard 2016-01-07 15:23:25 +08:00
• f4b2e34627 Merge pull request #455 from metamaps/feature/dotenv-for-reals Devin Howard 2016-01-07 12:10:47 +08:00
• 7d7003a1bc get more hard headed about having development values in .example-env Devin Howard 2016-01-06 23:16:34 +08:00
• bf21dcc3e6 merge develop into rspec tests Devin Howard 2016-01-06 23:03:34 +08:00
• 3cdab531a6 move more config into .example-env Devin Howard 2016-01-06 22:57:01 +08:00
• 70f5a5db11 centralize config in .env file, which includes remaving database.yml.default and overriding that file's local changes in favour of env variables. In future, all instance config can go in .env Devin Howard 2016-01-06 22:36:29 +08:00
• 062522bfdc remove unnecessary step from windows docs Devin Howard 2016-01-06 11:25:55 +08:00
• 75d9339010 make mapping polymorphism migration handle mapping problems Devin Howard 2016-01-06 10:23:01 +08:00
• 21aba2fe5e more modular database.yml.default Devin Howard 2015-12-24 16:36:58 +08:00
• 844a52fc52 Merge pull request #450 from metamaps/feature/fix-searchbox Devin Howard 2015-12-24 15:44:12 +08:00
• ba0e4f0bef Merge 40561c629a into f58412b715 Devin Howard 2015-12-24 07:43:10 +00:00
• 40561c629a fix handleResultClick on search box Devin Howard 2015-12-24 15:42:51 +08:00
• a45d0f7791 fix search box on authenticated homepage Devin Howard 2015-12-24 15:19:03 +08:00
• 6db91ea703 broken funnnnnction Connor Turland 2015-12-22 22:28:03 -05:00
• 26bc04262a broken funnnnnction Connor Turland 2015-12-22 22:28:03 -05:00
• 5ad1504494 handle socketio reconnect situation Connor Turland 2015-12-22 18:05:13 -05:00
• 64283850e3 add junto spinner for call in progress Connor Turland 2015-12-22 17:46:19 -05:00
• dfc94b4079 fix up styling on chat text input Connor Turland 2015-12-22 16:34:30 -05:00
• 49dd2f2e92 merge develop Connor Turland 2015-12-22 13:16:03 -05:00
• 8d85f8d308 videos positioning decently. chats loading more smoothly Connor Turland 2015-12-22 12:43:50 -05:00
• 8394e0ce86 re-add regular uservoice code Devin Howard 2015-12-22 07:13:26 +08:00
• c58b2c805e syntax error Devin Howard 2015-12-21 21:38:02 +08:00
• d96e991de3 don't use // for heroku either Devin Howard 2015-12-21 21:29:15 +08:00
• 6e10b4c508 make use of realtime.metamaps.cc server Devin Howard 2015-12-21 21:28:18 +08:00
• 914ff46bb9 syntax error in development.rb Devin Howard 2015-12-21 11:40:30 +08:00
• 7ea91273c8 remove random string spec helper function in favour of factory girl sequences Devin Howard 2015-12-21 10:59:09 +08:00
• 61c03e2736 Merge pull request #448 from metamaps/feature/https-preparation Devin Howard 2015-12-21 10:18:46 +08:00
• 603b9dc52e remove uservoice code Devin Howard 2015-12-21 10:16:51 +08:00
• 9a7ef25afc Merge branch 'develop' into feature/https-preparation Devin Howard 2015-12-20 22:28:43 +08:00
• 888edae6f6 finish remove asset_path_icon whoops Devin Howard 2015-12-20 22:28:05 +08:00
• c79a5f0072 Merge branch 'develop' into feature/https-preparation Devin Howard 2015-12-20 22:24:47 +08:00
• 96ec672779 Merge branch 'develop' into feature/rspec-tests Devin Howard 2015-12-20 22:24:39 +08:00
• df485002b1 remove redundant asset_path_icon function Devin Howard 2015-12-20 22:22:01 +08:00
• 7930f1a216 one test in metacode spec Devin Howard 2015-12-20 22:20:51 +08:00
• fe8794e814 fix topic spec Devin Howard 2015-12-20 22:18:40 +08:00
• f85bf74b2e synapse desc validation Devin Howard 2015-12-20 21:55:10 +08:00
• daf2dd3691 Merge 1479367cb3 into f58412b715 Devin Howard 2015-12-20 12:47:55 +00:00
• 1479367cb3 create synapse if you click away from the synapse title form Devin Howard 2015-03-02 18:05:45 -05:00
• d33f4bffb1 typekit https Devin Howard 2015-12-20 20:19:24 +08:00
• f35d4d51a9 s3 over https by default Devin Howard 2015-12-20 20:19:09 +08:00
• e2bf1d5eb1 try to make metamaps more tls friendly Devin Howard 2015-12-20 18:36:57 +08:00
• c7f7fa1d1b reorganize synapse spec pendingness Devin Howard 2015-12-18 09:35:56 +08:00
• 63e4939592 remove TODO Devin Howard 2015-12-18 09:35:40 +08:00
• 6bb8ac7e1f fix dumb errors - only 2 topic specs fail now Devin Howard 2015-12-18 09:33:16 +08:00
• ca282f7879 topic spec owner Devin Howard 2015-12-18 09:28:28 +08:00
• d2680fd9f3 permissions on synapse spec Devin Howard 2015-12-18 09:28:20 +08:00
• acd048bd0d can't properly use rspec on a boolean field validation Devin Howard 2015-12-18 09:28:08 +08:00
• 4b22a856c3 synapse spec Devin Howard 2015-12-18 09:26:15 +08:00
• a4c309a677 finish topic spec Devin Howard 2015-12-18 09:26:07 +08:00
• c4be57e525 topic and synapse validate permission Devin Howard 2015-12-18 09:25:54 +08:00
• cf6411988d topic spec - need to add permissions and fix 2 failing tests Devin Howard 2015-12-17 23:45:38 +08:00
• 9522c30273 finish map spec permissions Devin Howard 2015-12-17 23:20:53 +08:00
• 006acac6b5 remove redundant authorize_to_view function Devin Howard 2015-12-17 23:20:19 +08:00
• d5f66487b7 update map spec - add authorize_to_delete. TODO: add other map authorize specs Devin Howard 2015-12-17 09:44:48 +08:00
• 9e4a7b821f cleanup topic model a bit Devin Howard 2015-12-17 09:34:49 +08:00
• 86b79c1e55 add brief testing docs Devin Howard 2015-12-17 09:34:34 +08:00
• 696bac17e6 map spec Devin Howard 2015-12-17 09:16:02 +08:00
• 2525a6fb65 add permission service, refactor map model a bit, add validations Devin Howard 2015-12-17 09:10:52 +08:00
• bfd4e4f228 add permission service, add validations to map.rb Devin Howard 2015-12-17 09:03:51 +08:00
• b3ba6d3a80 add shoulda-matchers gem Devin Howard 2015-12-17 08:53:45 +08:00
• 1ff235f547 who needs routing specs bah Devin Howard 2015-12-16 22:36:41 +08:00
• 4dbff85443 default value if no request.env in application controller passes the rspec test woot. Only 80 more tests to implement Devin Howard 2015-12-16 22:36:12 +08:00
• a93473f2c9 rubocop spec folder Devin Howard 2015-12-16 22:33:29 +08:00
• 846d04dd0d rubocop style updates Devin Howard 2015-12-16 22:19:58 +08:00
• ae1117338a set up devise authentication more srsly. Still doesn't pass the test though haha Devin Howard 2015-12-16 22:16:02 +08:00
• be3924aa54 setup bare minimum devise authentication in tests Devin Howard 2015-12-16 21:32:50 +08:00
• 6148f55e1c handle nil unsafe_uri in app conttroller function Devin Howard 2015-12-16 21:05:18 +08:00
• 235d4f6c24 remove unneeded NEW tests, fix test.rb environment Devin Howard 2015-12-15 22:33:48 +08:00
• 229b7d2cc5 Merge branch 'develop' into feature/rspec-tests Devin Howard 2015-12-15 22:12:30 +08:00
• b2aa2074a7 update generation calcuation code, incl. fix user signup bug Devin Howard 2015-12-15 12:33:22 +08:00
• a905094d4d inviting, joining, and leaving conversations Connor Turland 2015-12-14 02:28:13 -05:00
• 8b090be0b3 convert to something more 'call' style Connor Turland 2015-12-12 19:00:51 -05:00
• be2997d7e4 fix bad tooltip placement Connor Turland 2015-12-12 11:31:54 -05:00
• eec7dcb9c3 make the messages box fill up all available space Connor Turland 2015-12-11 19:18:53 -05:00
• 56e3fc753a use asset_path for link to sound files Connor Turland 2015-12-11 19:15:18 -05:00
• 20aa78208e rename junto to erb file Connor Turland 2015-12-11 18:49:22 -05:00
• 6c7ba76937 update to https for sockets Connor Turland 2015-12-11 18:45:51 -05:00
• 92ddbbaf4f remove metacode asset path migration Connor Turland 2015-12-11 18:10:53 -05:00
• 5f1ef5f5c8 remove extra code Connor Turland 2015-12-11 18:10:38 -05:00