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

• 310222aef9 factories for synapse, topic, user Devin Howard 2015-10-19 15:23:49 +08:00
• e3a4207827 random_string helper function Devin Howard 2015-10-19 15:23:07 +08:00
• d913f50cf9 remove views specs and non-applicable routing specs Devin Howard 2015-10-12 17:19:16 +08:00
• 25117cf0e6 add rspec scaffold tests and a test db environment Devin Howard 2015-10-12 11:37:44 +08:00
• 16c47d75d4 delete test directory, add spec directory Devin Howard 2015-10-12 11:26:48 +08:00
• 0d2ddbd9b6 add rspec to Gemfile Devin Howard 2015-10-12 11:24:30 +08:00
• 053f035d31 move fixtures to seeds.rb Devin Howard 2015-10-12 11:22:55 +08:00
• 85b3012cd9 fix a few more mappable/topic/synapse things in JS Devin Howard 2015-10-02 17:39:53 +08:00
• 6d1e382d5c change from category/topic_id/synapse_id to mappable_type/mappable_id Devin Howard 2015-10-02 16:28:45 +08:00
• 69f4b8c645 migrate to polymorphic mappings - DB MIGRATION Devin Howard 2015-10-02 16:04:30 +08:00
• c80569a449 bg color on EXisting synapses heading Devin Howard 2015-10-02 15:53:06 +08:00
• 120edfc278 fix typo + debug statements to make existingSynapse autocomplete work Devin Howard 2015-10-02 15:46:48 +08:00
• 80b2b1876a deal with https://github.com/twitter/typeahead.js/issues/1195 Devin Howard 2015-10-02 14:39:17 +08:00
• e1d4dafa5e Merge branch 'instance/synbioleap' of https://github.com/metamaps/metamaps_gen002 into instance/synbioleap instance/synbioleap leap 2015-10-02 01:47:21 -04:00
• 7350b9bb9a add to metacode_sets fixtures Devin Howard 2015-10-02 13:43:50 +08:00
• a51777b0ba 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
• 14eeb0cbe6 upgrade typeahead to 1.10 and new syntax Devin Howard 2015-10-01 14:55:26 +08:00
• d895bca1a4 code tweaks to searchsynapses Devin Howard 2015-10-01 12:33:38 +08:00
• b3b065e623 Revert "upgrade typeahead to allow new syntax" Devin Howard 2015-10-01 11:34:19 +08:00
• 347d77df82 upgrade typeahead to allow new syntax Devin Howard 2015-10-01 11:14:25 +08:00
• b0efe6aea8 Merge branch 'develop' into rails4 Devin Howard 2015-10-01 11:05:27 +08:00
• 9e43cc2e96 dependent destroy models for topics/maps/synapses on mappings Devin Howard 2015-10-01 11:02:39 +08:00
• bb29e0e724 fiddle with Gemfile Devin Howard 2015-10-01 11:02:03 +08:00
• 5c903bbab5 Merge 0a5b62871c into c0d29e54bd Connor Turland 2015-10-01 02:34:26 +00:00
• 0a5b62871c first 2 slack events Connor Turland 2015-09-30 22:30:53 -04:00
• 485c0f6d2a Merge 11f673f7c5 into a8dc64a6fe Connor Turland 2015-09-30 16:16:08 +00:00
• a8dc64a6fe Merge pull request #415 from metamaps/less-autocomplete Devin Howard 2015-10-01 00:08:43 +08:00
• 19e675617e Merge a9b034637b into 6767771d7d Devin Howard 2015-09-30 05:57:24 +00:00
• a9b034637b only autocomplete topic/synapse if the user types more than 2 characters Devin Howard 2015-09-30 13:55:23 +08:00
• c0d29e54bd Merge branch 'rails4' of ssh://github.com/metamaps/metamaps_gen002 into rails4 Devin Howard 2015-09-28 14:43:16 +08:00
• b9140e9b8d add qa steps file first draft Devin Howard 2015-09-28 14:43:09 +08:00
• 8f8f40c0e4 replace the obvious spots with asset_path Devin Howard 2015-09-22 22:27:34 +08:00
• 741c584651 Merge branch 'develop' into rails4 Devin Howard 2015-09-20 13:55:21 +08:00
• 7841f6c96b Merge pull request #412 from devvmh/dotenv_install Devin Howard 2015-09-20 13:48:16 +08:00
• f5dbfd5d72 configuration for production environments like heroku Connor Turland 2015-09-19 13:25:30 -04:00
• 869fb816e9 this enables the vagrant port forwarding Connor Turland 2015-09-19 13:16:07 -04:00
• 1fbd16ac95 fix problem with join route Devin Howard 2015-09-19 20:46:10 +08:00
• b2e15c6483 cancan => cancancan Devin Howard 2015-09-19 20:25:07 +08:00
• 1ebbdb2e97 Merge 7a1b68960d into 6767771d7d mix irving 2015-09-19 12:23:07 +00:00
• 086acb09af select metacodes with one query instead of n queries, move logic to application_helper Devin Howard 2015-09-19 20:17:56 +08:00
• 62035ed015 fix other controllers needing create/update changed for rails 4 Devin Howard 2015-09-19 20:05:36 +08:00
• e14001061c fiddle with topic and mapping controllers so they work again Devin Howard 2015-09-19 20:01:44 +08:00
• 31015295f8 fix best in place deprecation warnings in map info box Devin Howard 2015-09-19 17:11:48 +08:00
• 6692c28965 delete_if threw errors, so convert things to arrays for it Devin Howard 2015-09-19 17:08:12 +08:00
• 1aa4d862a1 whoo new gems for development. binding.pry is so cool Devin Howard 2015-09-19 17:01:27 +08:00
• 2f9b09db86 fix map/mapping associations that I broke Devin Howard 2015-09-19 16:48:24 +08:00
• c361349c20 add required params to all controllers Devin Howard 2015-09-19 16:26:34 +08:00
• a31a92b321 Merge branch 'develop' into rails4 Devin Howard 2015-09-15 20:37:47 +08:00
• a8cef723a2 fix has_many relationships in map & mapping models for rails 4 Devin Howard 2015-09-10 22:48:35 +08:00
• d67d098b2a remove old jquery-ui file Devin Howard 2015-09-10 22:40:45 +08:00
• 8cf8277573 add jquery_ui to gemfile Devin Howard 2015-09-10 22:13:10 +08:00
• dc51d0080e remove attr_accessible Devin Howard 2015-09-10 22:12:50 +08:00
• f81fdbf8cc secret_token => secret_key_base Devin Howard 2015-09-10 22:12:39 +08:00
• 7a73f3bc07 remove match method from routes.rb Devin Howard 2015-09-10 22:06:58 +08:00
• c250f5d395 asset precompiling simpler in rails 4 Devin Howard 2015-09-10 22:03:39 +08:00
• 3c0bdff823 some config changes for rails 4 found on the Internet Devin Howard 2015-09-10 17:43:58 +08:00
• 5848af7765 update Gemfile for rails 4 Devin Howard 2015-09-10 17:43:48 +08:00
• 526fc6064c Merge d925e89d00 into 6767771d7d mix irving 2015-08-05 15:47:07 +00:00
• 6767771d7d dont show the embedly share links Connor Turland 2015-08-03 14:11:58 -04:00
• 5cd4db66c6 needed to update embedly Connor Turland 2015-08-03 14:02:30 -04:00
• 73b3c499cf added metacodes poietic 2015-06-13 23:29:46 -07:00
• 5c2129e219 LEAP branding, content & aesthetic tweaks poietic 2015-06-09 12:38:27 -07:00
• 44e8b8d581 Merge branch 'master' into thevalueweb Devin Howard 2015-06-03 18:14:05 -04:00
• 3f5d2bd7f3 add gem install bundler to configure.sh Devin Howard 2015-05-09 23:22:23 -04:00
• 499f6349e6 add ability for admin to delete any topics and synapses v2.6 Connor Turland 2015-04-28 18:43:47 -04:00
• 58c35c50e9 Merge 3473cf3736 into 9ce81df9f9 Devin Howard 2015-04-01 19:48:45 +00:00
• 7a1b68960d install dotenv to help managed env vars mix irving 2015-03-08 20:21:25 +13:00
• d925e89d00 add cancancan mix irving 2015-03-08 20:25:12 +13:00
• 9ce81df9f9 Merge pull request #406 from s01us/extract_mail_env Connor Turland 2015-03-07 15:01:53 -05:00
• c17cc39880 extract email settings into ENV ✂️ fixes #405 mix irving 2015-03-04 11:27:37 +13:00
• 8816031b20 Merge pull request #404 from s01us/add_ruby_version Connor Turland 2015-03-03 09:33:59 -05:00
• 4d311cb371 add .reuby-version for rbenv support mix irving 2015-03-03 23:15:44 +13:00
• 3473cf3736 add desc and link to xls and csv exporters Devin Howard 2015-03-02 17:45:15 -05:00
• 7509216a74 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
• a525f9d89e change line encoding of models/topic.rb to unix Devin Howard 2015-03-01 20:25:39 -05:00
• 44c8779d89 add synapses to XLS and CSV output Devin Howard 2015-03-01 20:25:23 -05:00
• 657925e0e2 added metacode to the xls and csv views Devin Howard 2015-03-01 13:13:52 -05:00
• b5b13841bc implement CSV and XLS export for map topics Devin Howard 2015-02-28 19:55:45 -05:00
• 253ceb4b48 added imagemagick to vagrantfile Connor Turland 2015-02-19 19:03:22 -05:00
• 11f673f7c5 basic code in place for taking a screenshot of the current view Connor Turland 2015-02-19 18:23:26 -05:00
• 97aca38d53 table is there and page views are being tracked feature/latest.viewed Connor Turland 2015-02-08 20:42:55 -05:00
• 96cee3cf21 Merge branch 'master' into thevalueweb instance/thevalueweb Connor Turland 2015-02-06 17:44:10 -05:00
• fb8c006be1 fixed small alignment bug on tooltips in firefox Connor Turland 2015-02-01 12:29:16 -05:00
• aec2a97704 fixed the alignment of the tutorial video links Connor Turland 2015-02-01 11:56:54 -05:00
• 9ed0d412df .width() returned wrong result in firefox, causing the map to load with off dimensions Connor Turland 2015-02-01 11:50:22 -05:00
• 531f09c6d3 active lists are sorting right. explore url breaking doesn't happen. explore maps pages do nicer infinite scrolling, properly loading only 20 at a time Connor Turland 2015-01-31 12:39:48 -05:00
• 4d7695a767 this will clear up any remaining issues with urls ending up wrong Connor Turland 2015-01-30 21:08:37 -05:00
• 4ca12c70ab explore maps lists were rendering bajillions too many times causing everything to go slow. timeouts weren't canceling. very wow Connor Turland 2015-01-30 20:49:30 -05:00
• 5cf75f3ea2 prevented map from loading before all metacode images were loaded Connor Turland 2015-01-30 00:09:45 -05:00
• 84e03d5475 Merge pull request #381 from metamaps/dont.delete Connor Turland 2015-01-29 22:25:21 -05:00
• 670dd5d874 added user feedback, and moved the edge actually hiding into the if statement where it should be Connor Turland 2015-01-29 22:23:24 -05:00
• cc66a851bd Merge pull request #382 from gitter-badger/gitter-badge Connor Turland 2015-01-29 17:59:23 -05:00
• 4857a02e45 Added Gitter badge The Gitter Badger 2015-01-29 20:35:48 +00:00
• a048c87356 mapper who doesn't own a topic or synapse should not be able to delete it. Connor Turland 2015-01-28 22:35:03 -05:00
• c61de991af re-added buildpack file for heroku Connor Turland 2015-01-28 21:49:58 -05:00
• 463a25f0a4 re-added procfile for heroku Connor Turland 2015-01-28 21:48:18 -05:00
• 5a31c91597 Merge branch 'master' of github.com:metamaps/metamaps_gen002 into prevent.scrolling Connor Turland 2015-01-28 21:39:33 -05:00
• 5d9305fb11 adding preventDefault will keep the page from doing weird scrolling on mac, or when the map is embedded Connor Turland 2015-01-28 21:38:44 -05:00
• dbfc0e4f4d Merge pull request #380 from metamaps/bug-labelsDisappearing Connor Turland 2015-01-28 21:35:20 -05:00
• d2e9d87037 when a topic was deleted, renderEdgeArrows was trying to call on a topic that was no longer existent to draw synapse direction, breaking the graph render Connor Turland 2015-01-28 21:04:00 -05:00