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

• 3c9d722945 accept or reject video offers Connor Turland 2015-12-11 17:29:17 -05:00
• 089528c46d great progress Connor Turland 2015-12-11 14:23:41 -05:00
• 1597665be5 merge develop with rails4 stuff Devin Howard 2015-12-07 13:58:42 +08:00
• b037c84f15 fix small error in user model Devin Howard 2015-12-07 11:44:08 +08:00
• 2929547736 position the chat box, and remove the old junto panel Connor Turland 2015-10-29 18:34:05 -07:00
• b958c6ff89 removed precompiled assets Connor Turland 2015-10-27 22:03:16 -07:00
• 75554d58bf temp Connor Turland 2015-09-19 12:02:05 -04:00
• fa67ec0444 update Gemfile for rails 4 Devin Howard 2015-09-10 17:43:48 +08:00
• 519342a468 fix filter bug Devin Howard 2015-11-30 10:01:33 +08:00
• 31fceab45d search box css fixes Devin Howard 2015-11-28 22:50:32 +08:00
• 47a7e161ee fix error with mapper search rendering Devin Howard 2015-11-28 22:07:57 +08:00
• 7336c262e3 fix up user model json output function Devin Howard 2015-11-28 21:51:28 +08:00
• 48ea29b13e refactor search css into scss for clearer organization, plus do some fixes to the typeahead css Devin Howard 2015-11-28 20:39:11 +08:00
• 38662fcda8 split search css out into its own file Devin Howard 2015-11-28 20:17:14 +08:00
• d3814708a9 gc tuning Devin Howard 2015-11-25 11:59:56 +08:00
• 9575a62e67 add .ruby-gemset file - you may need to reinstall gems if using rvm Devin Howard 2015-11-23 18:08:27 +08:00
• cde6eaa564 Update windows installer docs Devin Howard 2015-11-20 14:34:05 +08:00
• 7db75b8d6d more fixes Devin Howard 2015-11-08 23:14:53 +08:00
• 43624caf88 get autocomplete working again with new typeahead.js, but not the CSS Devin Howard 2015-11-08 22:53:34 +08:00
• 4139c2c84a syntax error Devin Howard 2015-11-07 01:34:08 +08:00
• 53d7ccab56 fix cannot set readonly property highlight Connor Turland 2015-11-04 19:50:32 -05:00
• 5b0e7ffcde switching metacode sets was being caught by Metamaps.Router.intercept Connor Turland 2015-11-04 18:10:20 -05:00
• 5f14601c74 styling of the vertical tab selectors needed improvement Connor Turland 2015-11-04 18:09:44 -05:00
• 1b60927641 had to update because jquery ui version changed Connor Turland 2015-11-04 18:09:12 -05:00
• dcbe24bb7e getting uploads working Connor Turland 2015-11-04 17:52:58 -05:00
• 67d4a2aa34 sandi metz function simplification Devin Howard 2015-11-06 17:08:42 +08:00
• 520fe095bd fix #465, metacode sort problem Devin Howard 2015-11-04 17:22:46 +08:00
• 87389a88ed current_user can be nil Connor Turland 2015-11-04 00:14:14 -05:00
• f8814c060f reorganize documentation Devin Howard 2015-11-04 11:41:04 +08:00
• 1874c67a66 reorganize metamaps-qa-steps a bit Devin Howard 2015-11-04 11:40:52 +08:00
• 75700f06a9 make invite link use REQUEST_URI Devin Howard 2015-11-03 22:22:53 +08:00
• 3e03e64845 css fixes for heroku Devin Howard 2015-11-03 21:02:54 +08:00
• f4456d06ef fix devise integration for rails 4 Devin Howard 2015-11-03 20:56:50 +08:00
• dfaadc691e update WindowsInstallation.md Devin Howard 2015-11-03 19:10:21 +08:00
• 20e698f69d devise locale text Devin Howard 2015-11-02 00:07:52 +08:00
• 506f93e144 Gemfile.lock Devin Howard 2015-11-02 00:06:12 +08:00
• 6df2f22080 update devise.rb with new changes Devin Howard 2015-11-02 00:05:57 +08:00
• 3674aefb04 remove secrets.yml stuff because it doesn't work with heroku Devin Howard 2015-10-30 14:30:24 +08:00
• 10b58399a7 ok put ruby back in Gemfile' Devin Howard 2015-10-30 14:21:47 +08:00
• ede4e7a509 fix references to Rails.application.secrets Devin Howard 2015-10-30 14:18:50 +08:00
• 570fa931b7 use secrets.yml to allow overriding config variables Devin Howard 2015-10-29 16:23:41 +08:00
• dd02129b0d remove ruby from Gemfile in favour of .ruby-version Devin Howard 2015-10-29 16:18:06 +08:00
• d99ed6b627 migrate metacodes that started with /assets/icons to use amazonaws urls. Remove last migration I made Devin Howard 2015-10-28 14:24:52 +08:00
• d8da2d93fd updated files to use amazon assets Connor Turland 2015-10-27 21:44:38 -07:00
• 8e427ea8f2 add secrets.yml.default Devin Howard 2015-10-27 18:17:04 +08:00
• 2cbf1cad7f fix Devin Howard 2015-10-27 18:16:35 +08:00
• 4b6e33f983 does this fix missing-map.png? Devin Howard 2015-10-26 21:12:18 +08:00
• 204544dc22 metacode asset_path calls Devin Howard 2015-10-26 21:04:07 +08:00
• f0c0dc48d8 add highlight to typeahead Devin Howard 2015-10-26 21:01:13 +08:00
• 0b96171aa3 bugfix Devin Howard 2015-10-26 20:41:37 +08:00
• 4245703084 see if we can make missing-map.png show up Devin Howard 2015-10-26 20:16:49 +08:00
• 89424dcd7f try to fix custom metacode icon path Devin Howard 2015-10-26 18:28:25 +08:00
• f63a242256 whoops again Devin Howard 2015-10-26 12:39:40 +08:00
• 47205883a9 whoops Devin Howard 2015-10-26 12:24:17 +08:00
• f4987bffc0 change css files to use asset_data_uri Devin Howard 2015-10-26 12:22:40 +08:00
• 684dcd8d33 only run metacode.icon through asset_path if the path doesn't start with http Devin Howard 2015-10-26 12:12:07 +08:00
• bdb5623a02 woot fix metacodes Devin Howard 2015-10-26 11:53:54 +08:00
• 60898fadb2 binding_of_caller gem for devel debug Devin Howard 2015-10-26 11:53:50 +08:00
• d8dffad38a metacodes#index map in asset_path Devin Howard 2015-10-25 17:14:56 +08:00
• a972074306 environment assets config Devin Howard 2015-10-25 17:09:57 +08:00
• bd60f68cfe try to compile but not compress assets Devin Howard 2015-10-25 16:51:47 +08:00
• 96f5e6ac35 add asset_path calls Devin Howard 2015-10-25 16:50:07 +08:00
• d3080906b1 add db migration to remove asset paths from metacodes Devin Howard 2015-10-25 16:37:13 +08:00
• 29411cf1e5 asset_path Devin Howard 2015-10-23 23:56:29 +08:00
• c782c4d0bb remove binding.pry Devin Howard 2015-10-23 23:42:21 +08:00
• 52b37e7ac6 asset_path in css erb files Devin Howard 2015-10-23 23:34:18 +08:00
• 6a21b84a23 resume ignoring public/assets Devin Howard 2015-10-23 23:23:23 +08:00
• d52caac1d6 add indexes to schema Devin Howard 2015-10-23 23:22:54 +08:00
• 4d7f509235 change some css to erb Devin Howard 2015-10-23 23:19:25 +08:00
• b9ac614057 asset_path doesn't work in models Devin Howard 2015-10-23 23:09:14 +08:00
• cef83e1f3d asset_path Devin Howard 2015-10-23 23:06:24 +08:00
• 2505ce36a5 syntax Devin Howard 2015-10-23 23:01:02 +08:00
• 235aa7a6b3 convert javascript to asset_path syntax Devin Howard 2015-10-23 22:56:09 +08:00
• 6e9b0ac9ef rename js files to js.erb files Devin Howard 2015-10-23 22:51:16 +08:00
• 3f5404b043 add missing indexes for speed Devin Howard 2015-10-23 22:38:42 +08:00
• 53d77a0e5b fix migration for heroku Devin Howard 2015-10-23 22:32:09 +08:00
• 5b882b1332 pry byebug Devin Howard 2015-10-23 22:27:33 +08:00
• 566a0a3aa6 brute force prevent nil synapse descriptions Devin Howard 2015-10-23 22:10:45 +08:00
• 617fe43f71 fix problem with mappings and forking maps Devin Howard 2015-10-23 22:07:44 +08:00
• 1453a3c181 function naming Devin Howard 2015-10-23 21:04:16 +08:00
• 840484178b fix mapping problem Devin Howard 2015-10-23 21:03:49 +08:00
• ae16f8f08d fix a few more mappable/topic/synapse things in JS Devin Howard 2015-10-02 17:39:53 +08:00
• 3e8c971155 change from category/topic_id/synapse_id to mappable_type/mappable_id Devin Howard 2015-10-02 16:28:45 +08:00
• 5dc53543f7 migrate to polymorphic mappings - DB MIGRATION Devin Howard 2015-10-02 16:04:30 +08:00
• a4f910b66d bg color on EXisting synapses heading Devin Howard 2015-10-02 15:53:06 +08:00
• 379b37b445 fix typo + debug statements to make existingSynapse autocomplete work Devin Howard 2015-10-02 15:46:48 +08:00
• 675bcadda0 deal with https://github.com/twitter/typeahead.js/issues/1195 Devin Howard 2015-10-02 14:39:17 +08:00
• a7e512e25a working version of autocomplete that includes the new typeahead.js syntax. So much more complicated than before... Devin Howard 2015-10-02 13:36:51 +08:00
• bd9c275ada upgrade typeahead to 1.10 and new syntax Devin Howard 2015-10-01 14:55:26 +08:00
• 4bc03e3d2a code tweaks to searchsynapses Devin Howard 2015-10-01 12:33:38 +08:00
• ff48b2456a Revert "upgrade typeahead to allow new syntax" Devin Howard 2015-10-01 11:34:19 +08:00
• 8826dfdcf6 upgrade typeahead to allow new syntax Devin Howard 2015-10-01 11:14:25 +08:00
• e5c83a2a0c dependent destroy models for topics/maps/synapses on mappings Devin Howard 2015-10-01 11:02:39 +08:00
• 0a63b5e79a fiddle with Gemfile Devin Howard 2015-10-01 11:02:03 +08:00
• b743476115 add qa steps file first draft Devin Howard 2015-09-28 14:43:09 +08:00
• b395bd0b50 replace the obvious spots with asset_path Devin Howard 2015-09-22 22:27:34 +08:00
• 1a01d3b568 configuration for production environments like heroku Connor Turland 2015-09-19 13:25:30 -04:00
• 8b7ec73f48 this enables the vagrant port forwarding Connor Turland 2015-09-19 13:16:07 -04:00
• 50d9866939 fix problem with join route Devin Howard 2015-09-19 20:46:10 +08:00
• 95e1806500 cancan => cancancan Devin Howard 2015-09-19 20:25:07 +08:00