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

• be1323ce85 got some hacky way of having the showcard show up on the page. TODO: figure out how to drop the application.html wrapper stuff and how to get this into Javascript Devin Howard 2012-12-30 23:40:43 -05:00
• ae95cbf6f4 I did something with config/routes.rb and now showcard/1 shows an empty html page instead of giving an error Devin Howard 2012-12-30 23:33:08 -05:00
• 8d1171c2c8 made showcard into a non-partial view, in desperation Devin Howard 2012-12-30 23:30:18 -05:00
• 5d552a5d00 added showcard partial view to items so we can load them with AJAX...\! Devin Howard 2012-12-30 23:05:33 -05:00
• abe34696da added an empty div at the bottom of the page containing nodes Devin Howard 2012-12-30 23:04:30 -05:00
• 293b3727a2 Merge branch 'master' into devel Devin Howard 2012-12-30 22:56:09 -05:00
• a7412cd162 initialization code for best_in_place Devin Howard 2012-12-30 22:56:05 -05:00
• 460e992f32 added best_in_place gem Devin Howard 2012-12-30 18:50:23 -05:00
• 95ee65f58a added assets for staging Connor Turland 2012-12-26 23:16:00 -05:00
• 704bb2f0f7 fixed images (mostly) and fixed accidental topic double creation Connor Turland 2012-12-26 23:00:05 -05:00
• 8577a40503 added precompiled assets for staging Connor Turland 2012-12-26 21:07:34 -05:00
• 510ab5fabb added proper images Connor Turland 2012-12-26 20:57:06 -05:00
• 3be8d56406 switched the feedback map back in as map 7 Connor Turland 2012-12-25 23:01:17 -05:00
• e4dfa7f384 added public assets for staging Connor Turland 2012-12-25 22:56:54 -05:00
• 475ccad493 increased line size. fixed ability to see synapses on Rgraph pages Connor Turland 2012-12-25 22:47:02 -05:00
• 3a071204f5 removed public assets again Connor Turland 2012-12-25 18:48:39 -05:00
• 3356160af4 moved all the menus in the upper right to the logo. created the console at /console. changed synapse creation to be either on right click and drag or alt+left click. fixed scrolling and spacing on list pages of maps and topics. added ability to clear the canvas on the console and to save to map. removed metamap page, and extraneous controllers. Connor Turland 2012-12-25 18:29:20 -05:00
• cea2ea7e2a adjusted the console/canvas to be clear when you start, and the ability to load topics to your canvas by mapper, or by map. fixed issue where synapse was asking for description when there was no topic at the other end Connor Turland 2012-12-23 01:34:27 -05:00
• 783894461e testing ability to pull topics onto the canvas Connor Turland 2012-12-23 01:12:56 -05:00
• 79f931bede updated finding topic by name to be aware whether they are searching in the commons, or on their canvas, and only show the autocomplete if they're searching in the commons Connor Turland 2012-12-22 14:52:16 -05:00
• 55328aaf3a attempt two at array max limit on home page Connor Turland 2012-12-22 03:46:30 -05:00
• 87d1d02bb2 added limit to how many topics can show up on main console for testing Connor Turland 2012-12-22 03:43:25 -05:00
• c5a0387917 added public assets for staging Connor Turland 2012-12-22 03:37:01 -05:00
• c4194923a3 got filtering on canvas working Connor Turland 2012-12-22 03:32:12 -05:00
• 37e41c87bf made it so that only synapses can be created on topic pages, not new topics. Restructured the URL address system Connor Turland 2012-12-21 18:07:13 -05:00
• 84e9f59b8a removed public/assets again, as they screw up local dev Connor Turland 2012-12-21 00:39:13 -05:00
• 69ad435e2c added precompiled assets for staging Connor Turland 2012-12-21 00:17:19 -05:00
• c92508d909 made it so that the synapse still appears even while you write the description of the connection Connor Turland 2012-12-21 00:08:52 -05:00
• 355a6d4d0f got basic right click on node and drag to create synapse working! Connor Turland 2012-12-20 23:45:44 -05:00
• 18a7675067 cleaned up css files Devin Howard 2012-12-20 20:19:55 -05:00
• cdec4b2ffa pushhh Connor Turland 2012-12-20 19:24:27 -05:00
• 6e75b93e3b added public assets for staging Connor Turland 2012-12-16 15:05:12 -05:00
• 3931fdd40e got Rgraph working Connor Turland 2012-12-16 15:00:43 -05:00
• 66a6e22854 removed public assets again Connor Turland 2012-12-16 01:23:43 -05:00
• 12b8ed0aa0 added precompiled public assets Connor Turland 2012-12-16 01:17:19 -05:00
• 04819ca342 got filtering/finding system working, and node creation happening in place. Connor Turland 2012-12-16 01:12:41 -05:00
• d822d87b5a Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 Connor Turland 2012-12-15 22:52:27 -05:00
• c0d05942f7 got sidebar find/filters working for -findbyname and -findbymetacode Connor Turland 2012-12-15 22:52:12 -05:00
• e0858f5b39 Merge branch 'devel' Devin Howard 2012-12-15 19:48:25 -05:00
• 4242841d86 totally unweildy and not working implementation of node adding by double clicking. It works all right though Devin Howard 2012-12-15 19:46:39 -05:00
• fe97eb0f4e removed public/assets folder Devin Howard 2012-12-15 17:23:07 -05:00
• 87d1efd0de Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 Connor Turland 2012-12-15 16:59:02 -05:00
• ca6c811870 pop up node creation on double click implemented. The x and y of the click are available to the function but are as yet unused Devin Howard 2012-12-15 14:47:04 -05:00
• d6803007c3 pulled the on click handler event code out into a function at the bottom of graphsettings.js. I also created a function in preparation for handling double click on the canvas Devin Howard 2012-12-15 14:24:21 -05:00
• dfdc1bfd94 removed config/database.yml Devin Howard 2012-12-15 14:08:00 -05:00
• ac02995bac updated .gitignore Devin Howard 2012-12-15 13:49:12 -05:00
• 758c7e47b0 added precompiled assets for production Connor Turland 2012-12-15 04:44:08 -05:00
• ea8f37da27 adjusted so that cards show up where the icon is, rather than in one static place. Connor Turland 2012-12-15 04:27:55 -05:00
• 7c65634ade Merge branch 'ACI' Connor Turland 2012-12-15 02:39:52 -05:00
• 6296ca480f restructured a lot of code to be more readable and have less duplication of code Connor Turland 2012-12-15 02:39:14 -05:00
• 55d8a197de removed public assets Connor Turland 2012-12-14 13:31:39 -05:00
• 3989b7d3b6 precompiled assets Connor Turland 2012-12-14 10:38:49 -05:00
• 9f4522e1e7 swapped in db config file for production Connor Turland 2012-12-14 03:20:33 -05:00
• 5fb5868378 precompiled assets Connor Turland 2012-12-14 03:10:57 -05:00
• a5fd4cb835 caching changes Connor Turland 2012-12-14 02:59:37 -05:00
• 7606c07fd4 removed tmp folder Connor Turland 2012-12-14 02:55:27 -05:00
• 7e4fed4020 more caching mods Connor Turland 2012-12-14 02:52:54 -05:00
• 2c9a7a8946 changed caching again Connor Turland 2012-12-14 02:41:59 -05:00
• 7c2169a2de changed the caching settings Connor Turland 2012-12-14 02:38:59 -05:00
• 4a12f251e4 no changes Connor Turland 2012-12-14 02:22:41 -05:00
• 5e1ec6ea26 added topic searching in the upper bar Connor Turland 2012-12-14 02:16:17 -05:00
• fcf6c87d2f Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 Devin Howard 2012-12-09 19:47:28 -05:00
• f338265e1b Merge branch 'devel' Devin Howard 2012-12-09 19:46:51 -05:00
• e0c5ea3cf6 after fooling around with reverting my dumb changes, actually committed the removal of 20121203225613_add_arranged_to_map.rb Devin Howard 2012-12-09 19:45:48 -05:00
• 3de67ace71 Merge branch 'devel' Devin Howard 2012-12-09 19:45:09 -05:00
• dd8e421cd4 Revert "Revert "fixed bug that wasn't letting you save the layout of a map if you had added new synapses to it."" Devin Howard 2012-12-09 19:44:50 -05:00
• 7e1610147a Revert "removed 20121203225613_add_arranged_to_map.rb" Devin Howard 2012-12-09 19:44:18 -05:00
• 31ab10b338 Revert "fixed bug that wasn't letting you save the layout of a map if you had added new synapses to it." Devin Howard 2012-12-09 19:43:53 -05:00
• 2e0c1a4320 Revert "fixed bug that wasn't letting you save the layout of a map if you had added new synapses to it." Devin Howard 2012-12-09 19:42:45 -05:00
• baaa746a47 removed 20121203225613_add_arranged_to_map.rb Devin Howard 2012-12-09 19:42:09 -05:00
• efb442fe5d swapped back in local/staging database file Connor Turland 2012-12-09 19:34:47 -05:00
• 0cbfe90703 swapped in production db config file Connor Turland 2012-12-09 19:09:07 -05:00
• 698690effd fixed bug that wasn't letting you save the layout of a map if you had added new synapses to it. Connor Turland 2012-12-09 19:06:36 -05:00
• 4ab7fe76ca fixed synapse created on arranged maps Connor Turland 2012-12-07 15:06:00 -05:00
• 696d094118 fixed filters on arranged map pages Connor Turland 2012-12-05 16:04:55 -05:00
• 38ef59b951 swapped database config file for local/staging back in Connor Turland 2012-12-03 19:42:06 -05:00
• 8d54c1272e test for caching oddity Connor Turland 2012-12-03 19:21:06 -05:00
• e2acdb727a swapped in database config file for production Connor Turland 2012-12-03 19:06:33 -05:00
• ae2cdf20be removed cached files Connor Turland 2012-12-03 18:50:38 -05:00
• 30b5b94037 fixed delete map bug. made it so that if the user hasn't saved a layout to a map, it continues to render as forcedirected Connor Turland 2012-12-03 18:40:14 -05:00
• cfe7966958 darkened concentric circles on Rgraph view Connor Turland 2012-12-01 18:06:29 -05:00
• e8404de01a added ability to save layout of maps. Connor Turland 2012-12-01 18:05:17 -05:00
• 555e822d8c swapped database config files for production Connor Turland 2012-11-24 18:05:05 -08:00
• e493bbe2c9 fixed issue where left show card was hiding behind top. Rearranged filters and added show/hide all. fixed directionality->working consistently Connor Turland 2012-11-24 17:48:26 -08:00
• b34962b4f5 added hideAll showAll filters! Connor Turland 2012-11-23 11:00:00 -08:00
• 53ec317cd0 nice clean version of JIT2.0.0 working with extra code cleaned out Connor Turland 2012-11-23 08:56:22 -08:00
• 13fc7d829f fixed directionality and set circle radius to corrent length Connor Turland 2012-11-18 14:40:06 -05:00
• f725b607d3 temporarily hid the connection descriptions Connor Turland 2012-11-05 14:54:30 -05:00
• 5839ca191c corrected directionality to point right way Connor Turland 2012-11-03 20:43:05 -04:00
• 08c7c3b517 temporarily showing userid and synapse id on synapses, so that I can try editing them on the staging server Connor Turland 2012-11-03 20:35:37 -04:00
• 3a96fdeac3 added directionality to graphs on Force Directed types Connor Turland 2012-11-03 20:21:33 -04:00
• 1d32749848 got directionality working on the RGraph type Connor Turland 2012-11-03 20:14:21 -04:00
• c523c17111 changed our syntax so that the find :first commands actually work :) Devin Howard 2012-11-03 13:57:42 -04:00
• 77420bcb09 made feedback and metamaps manual display conditional instead of hard coded so there's not errors on a blank database Devin Howard 2012-11-03 13:45:08 -04:00
• 4787ca23c5 removed dependence on having a sample map by adding empty text ("shucks") Devin Howard 2012-11-03 13:34:38 -04:00
• c9d0ea889c if feedback map doesn't exist don't put up feedback button Devin Howard 2012-11-03 13:30:20 -04:00
• 1ec7990472 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 Devin Howard 2012-11-03 13:07:53 -04:00
• bce78bc147 removed test rake config Devin Howard 2012-11-03 13:07:14 -04:00
• 9842347344 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 Connor Turland 2012-11-03 13:00:30 -04:00
• 6c520cdd2f Merge branch 'master' of heroku.com:metamaps-staging Devin Howard 2012-11-03 12:06:21 -04:00