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

• d2ac26cbaf Update paq.html.erb poietic 2014-02-20 11:38:56 -08:00
• 144069f82a Merge pull request #303 from Connoropolous/Robs-1st-edits Connoropolous 2014-02-20 11:08:09 -08:00
• f721441f11 Update main_controller.rb Robert Best 2014-02-18 23:33:09 -05:00
• 7cff0fb6fe Update main_controller.rb Robert Best 2014-02-18 22:44:10 -05:00
• 2fdcb5dcc5 Update main_controller.rb Connoropolous 2014-02-18 16:45:11 -08:00
• f7dc8cff60 Update _lightboxes.html.erb poietic 2014-02-17 16:30:40 -08:00
• 841879798b Update paq.html.erb poietic 2014-02-16 23:39:39 -08:00
• 1c0f2eb303 Update paq.html.erb poietic 2014-02-16 23:34:01 -08:00
• f9166119f3 Update topics_controller.rb Connoropolous 2014-02-15 09:52:56 -08:00
• 350df8a410 Update main_controller.rb Robert Best 2014-02-13 22:46:13 -05:00
• 2050e137bf Update topics_controller.rb Robert Best 2014-02-13 22:32:51 -05:00
• 7c28e20b00 Update main_controller.rb Robert Best 2014-02-13 22:22:01 -05:00
• 6817379cb5 Updated date on copyright Connoropolous 2014-02-12 14:59:41 -08:00
• f26d13fb5f fixed best_in_place issue, fixed toolbar functionality Connor Turland 2014-02-10 19:32:05 -05:00
• 13780defff Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 Connor Turland 2014-02-10 03:06:57 -05:00
• f3db0984ef added assets for production Connor Turland 2014-02-10 03:02:17 -05:00
• 5fbbedc885 Update Gemfile Connoropolous 2014-02-10 02:11:48 -05:00
• 7b3311cb05 changed realtime folder Connor Turland 2014-02-10 02:03:06 -05:00
• ec9fe66bfe styled notifications Connor Turland 2014-02-10 01:47:48 -05:00
• 4e8fc6fe06 added tips to cards Connor Turland 2014-02-10 01:29:02 -05:00
• fb4da722ab removed extra migrate files Connor Turland 2014-02-09 23:48:05 -05:00
• 5181c91aa7 restyled PAQ and Request pages. Connor Turland 2014-02-09 23:36:23 -05:00
• ac12c2a9ae added ability to change metacode. updated bottom left menu with icon, upper right menu with hover states Connor Turland 2014-02-09 18:54:45 -05:00
• bfdf706f15 cheatsheet and menu and upper right menu Connor Turland 2014-02-09 10:05:32 -05:00
• 1c49a805bd removed more old files, styled request invite page Connor Turland 2014-02-07 18:13:51 -05:00
• 2045220622 styled lightboxes further, changed FAQ to PAQ Connor Turland 2014-02-07 17:25:02 -05:00
• 17fe5fa241 styled faq page Connor Turland 2014-02-07 12:55:11 -05:00
• ab40ddfdf4 a lot of little coloring things Connor Turland 2014-02-06 15:16:51 -05:00
• 86b60048c3 styled new map forms Connor Turland 2014-02-06 12:40:44 -05:00
• 47710749a8 started styling map forms Connor Turland 2014-02-05 12:38:17 -05:00
• ae46c27bec started styling map forms Connor Turland 2014-02-05 12:37:21 -05:00
• 4350c0df1b added lightboxes Connor Turland 2014-02-05 00:03:44 -05:00
• b5b147de7e fixed error in account menu Connor Turland 2014-02-04 22:08:41 -05:00
• 6a63b1fe47 removed assets Connor Turland 2014-02-04 22:03:24 -05:00
• fdcee3ae40 synapse autocomplete working Connor Turland 2014-02-04 20:28:06 -05:00
• 8749ba8bbe removed a bunch of unnecessary js.coffee files with nothing in them Connor Turland 2014-02-04 14:55:26 -05:00
• 5271c1ea3d configuring url to connect to for realtime Connor Turland 2014-02-04 13:41:27 -05:00
• c3c5b4e5c4 updated assets Connor Turland 2014-02-04 12:50:02 -05:00
• 285c87ade7 configured for redistogo and uncommented realtime messages Connor Turland 2014-02-04 12:08:09 -05:00
• 4b64e4bc06 fixed issue with date edited in map info box Connor Turland 2014-02-04 11:06:10 -05:00
• 9a560ff829 styled carousel autocomplete results. moved tooltips. built out map info box Connor Turland 2014-02-03 20:43:31 -05:00
• 4e3c9fc439 added tooltips on search results, added icon for change metacode set, did further styling of open topic card Connor Turland 2014-02-03 00:35:21 -05:00
• 6538577387 added ability to limit search results to just your own, and to minimize the different sections of search results Connor Turland 2014-02-02 14:56:07 -05:00
• 9c3c7c5e01 enabled filter by metacode. enabled navigation through topic pages using right click. styled topic card Connor Turland 2014-02-01 03:57:19 -05:00
• d3500b0ce9 adjusted user model to not prevent sign ups Connor Turland 2014-01-31 11:58:32 -05:00
• 7412b0a1b1 fixed one spot where it was trying to send realtime message over redis from the maps controller in save layout Connor Turland 2014-01-30 21:39:24 -05:00
• 021fffe11f added right click menu icons, did text wrap on labels Connor Turland 2014-01-30 21:28:10 -05:00
• 9ca9e56536 improved the labels. started the right click menu. added the wand menu. added the create map feature. replaced images with recolored ones. Connor Turland 2014-01-30 19:32:15 -05:00
• efcc449471 fixed issue where settings page was redirecting to nonexistent user profile page Connor Turland 2014-01-28 23:53:13 -05:00
• fbdfff6b83 temporarily commented out lines that send realtime messages via redis Connor Turland 2014-01-28 23:34:50 -05:00
• d6d428df60 perhaps fixed login error Connor Turland 2014-01-28 23:27:32 -05:00
• 2fd468c4f3 added devise secret key Connor Turland 2014-01-28 23:01:03 -05:00
• e69b6e9705 specified jbuilder version Connor Turland 2014-01-28 22:57:12 -05:00
• ac27da08dc removed sass-rails version number Connor Turland 2014-01-28 22:53:10 -05:00
• 414e59e280 this is a lot of changes. too many to say here, oops Connor Turland 2014-01-28 22:46:58 -05:00
• 5c3a0c28d8 added assets Connor Turland 2013-12-01 20:57:07 -05:00
• e44d57a6d9 updated the home page Connor Turland 2013-12-01 20:47:28 -05:00
• 4220d8ffab Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 Connor Turland 2013-11-14 12:52:44 -05:00
• 54b0c76bb8 removed old files Connor Turland 2013-11-14 12:51:43 -05:00
• adcdea5d5e fixed selecting things on the radial view, and the weird synapse autocomplete bug Connor Turland 2013-11-14 12:28:31 -05:00
• 1c065d5620 Create Metamaps AGPL License.txt Connoropolous 2013-10-17 10:38:06 -04:00
• b145e08170 Added license to README Connoropolous 2013-10-17 10:36:17 -04:00
• 6e433683c7 updated user sign up advice on the invite page finally Connor Turland 2013-09-18 20:04:58 -04:00
• f32378398a removed extra files Connor Turland 2013-07-11 11:16:06 -04:00
• b218d898ea added account creation again. fixed realtime bug, border radius on the menu, fixed menu on console Connor Turland 2013-07-11 11:13:27 -04:00
• cca4830fd5 added mailer config for production env Connor Turland 2013-07-10 14:30:34 -04:00
• 41044140b7 added completely new logging in system Connor Turland 2013-07-10 14:02:38 -04:00
• 2545126b0b fixed up some styling. extended rgraph radius. added show/hide labels Connor Turland 2013-07-09 12:32:13 -04:00
• 1e6210a117 fixed the realtime bug where things were moving around unexpectedly Connor Turland 2013-06-27 14:15:28 -04:00
• 211d9220dd added precompiled assets Connor Turland 2013-04-26 00:32:09 -04:00
• f657a61327 added all the code for realtime mapping using websockets. fixed some minor bugs like the label glitches, dragBox to deselect as well as select, shift click for synapses working again, panning won't deselect all your selected nodes and edges, nor hide the showcard, but a single click will hide the open card Connor Turland 2013-04-26 00:07:29 -04:00
• aae89c3c1a Gemfile.lock Connor Turland 2013-03-29 02:51:15 -04:00
• 5139fb849d . Metamaps on Linode 2013-03-29 02:49:10 -04:00
• 7abcaca4aa normal Gemfile Connor Turland 2013-03-29 02:38:46 -04:00
• 1491c20895 shift+click for box selecting topics Connor Turland 2013-03-29 02:38:13 -04:00
• c93c74094c merge esc key handler stuff and fixing dragging topics Devin Howard 2013-03-28 21:10:35 -04:00
• 5f86d879ac allow dragging on topic view Devin Howard 2013-03-28 21:09:07 -04:00
• 1f096cf5a5 esc deselects all nodes/synapses Devin Howard 2013-03-28 18:56:34 -04:00
• 3f0e94297b reset therubyracer for the wonderful Devin Connor Turland 2013-03-22 02:44:22 -04:00
• 24269a10b9 developed an initial attempt at a box to select feature. SO NICE. you just hold down shift and mouse over the ones you want. fixed an important bug that was causing deselecting to go wacky Connor Turland 2013-03-22 02:37:56 -04:00
• 600e5814f0 fix #172, unless the problem applies to topics as well which I haven't investigated further Devin Howard 2013-03-21 22:18:20 -04:00
• 45f856fc05 fix #170 Devin Howard 2013-03-21 21:58:32 -04:00
• 71047ecac4 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 Devin Howard 2013-03-21 21:34:26 -04:00
• 0628c88f80 README updates Devin Howard 2013-03-21 21:33:59 -04:00
• e5095093ec added Keep Selected button to console, map view, topic view Devin Howard 2013-03-21 21:33:42 -04:00
• 6ac05fa2c6 allow Enter to keep all selected nodes in commons Devin Howard 2013-03-21 21:29:09 -04:00
• cdf0a2d5e6 rm'ed gemfile.lock Metamaps on Linode 2013-03-17 10:49:49 -04:00
• 9f82e804bf removed windows-generated Gemfile.lock Metamaps on Linode 2013-03-17 10:48:46 -04:00
• 41333c1991 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 Connor Turland 2013-03-17 05:20:12 -04:00
• c4bc2b3675 reset the gemfile Connor Turland 2013-03-17 05:19:43 -04:00
• 9187112754 fixed labels all up. made it so only one showcard exists Connor Turland 2013-03-17 05:18:30 -04:00
• 1f7588f1ce added ability to use touch to drag nodes, pan, and zoom. fixed label glitch for the most part Connor Turland 2013-03-17 02:29:17 -04:00
• f714212423 implement synapse autocomplete controller function to make the results distinct. fixes #139 Devin Howard 2013-03-16 13:30:54 -04:00
• 6ed19db3ec undo the bug I introduced in the last commit; also change selectNodeOnClickHandler to selectNode to prevent a couple errors in topics/create.js.erb Devin Howard 2013-03-16 12:56:26 -04:00
• 0049ae88d1 hide synapse autocomplete after synapse creation - didn't we fix this already? Devin Howard 2013-03-16 12:51:56 -04:00
• 86895836a0 changed some disposeLabels to hideLabels - fix #156 Devin Howard 2013-03-14 22:55:28 -04:00
• 1c3aa6c973 more onCanvas/inCommons => whiteCircle/greenCircle changes in views. Also changed a thing in main/search.js.erb about the "temp" node being undefined instead of null that may fix an issue or not Devin Howard 2013-03-14 21:01:09 -04:00
• 610286cee7 changed onCanvas to whiteCircle and inCommons to greenCircle in node data. Also a few other minor/helpful tweaks Devin Howard 2013-03-14 20:53:01 -04:00
• e54c4e24ed fixed problems with multiple node selection dragging (#79) Devin Howard 2013-03-11 22:50:17 -04:00
• 88a230dccf Revert "Revert "Drag around all selected nodes, not just one - implements #79"" Devin Howard 2013-03-11 22:25:22 -04:00