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

• 0a1b5d51d8 Revert "Drag around all selected nodes, not just one - implements #79" Devin Howard 2013-03-11 22:24:17 -04:00
• fa789dff2e Drag around all selected nodes, not just one - implements #79 Devin Howard 2013-03-11 21:54:38 -04:00
• 759edf1608 Merge branch 'master' of https://github.com/Connoropolous/metamaps_gen002 Devin Howard 2013-03-09 18:16:05 -05:00
• d781479803 Gemfile.lock change Devin Howard 2013-03-09 18:15:54 -05:00
• 18da6d6ff2 nothing to commit Naomi Hemsley 2013-03-07 23:41:45 -05:00
• ea70ea1dbe Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 Bortseb 2013-03-07 22:38:49 -05:00
• ad72a77e67 Added Robert and Naomi users to fixtures Bortseb 2013-03-07 22:38:03 -05:00
• 8ad75dadb6 added a few tips to the README that may be unhelpful to everyone who comes across them Devin Howard 2013-03-07 21:48:20 -05:00
• 3c66e4c50f updated Gemfile with two gems needed for Linode. Sorry people who don't like therubyracer! Devin Howard 2013-03-07 21:44:58 -05:00
• b40d63c0c1 added public/assets to gitignore because it seems to make sense Devin Howard 2013-03-07 21:44:25 -05:00
• ddf449502b fix #145 - autocomplete widget fades out on topic creation Devin Howard 2013-03-07 20:09:18 -05:00
• 16d46ffd28 made permission editing card less stupid Devin Howard 2013-02-28 21:49:09 -05:00
• eaa9ba4d88 formatting in synapses_controller Devin Howard 2013-02-28 21:46:08 -05:00
• 8f59fc34d1 added permission to synapse dataset in js in two spots: creating new edge, grabbing edge from commons Devin Howard 2013-02-28 21:45:42 -05:00
• 02cff2e138 ok added edge permissions editing back in. still todo: make it look better, make it work for synapses brought in from the commons Devin Howard 2013-02-28 21:36:02 -05:00
• 49d761c81c comments Devin Howard 2013-02-28 21:00:09 -05:00
• e0e505de1d ok you can now create mappings only if logged in and it's wonderful and you can double click things and closing the seek... tab destroys your search results Devin Howard 2013-02-28 20:56:57 -05:00
• 0280b5bb21 don't fruitlessly create a million mappings when you double click nodes already in the canvas Devin Howard 2013-02-28 20:43:07 -05:00
• 2cff8ce37e ajax post that creates a mapping when you double click on a in commons node in the map Devin Howard 2013-02-28 20:42:09 -05:00
• 564d18df4d finished mappings#create except it doesn't authenticate... Devin Howard 2013-02-28 20:41:30 -05:00
• 4e5fb95c7e fixed a few problems with mappings_controller.rb Devin Howard 2013-02-28 20:16:04 -05:00
• a55fc2242c added blank views files for mappings Devin Howard 2013-02-28 20:15:25 -05:00
• d325cb0088 renamed mapping_controller to mappings_controller Devin Howard 2013-02-28 20:08:55 -05:00
• 6bcb575578 added supporting files to mapping controller - could be reverted with no problems probably Devin Howard 2013-02-28 19:57:04 -05:00
• 101f49b9e6 added mapping_controller and routes, but only implemented create Devin Howard 2013-02-28 19:56:27 -05:00
• 0bd468b28f added newline to readme Devin Howard 2013-02-28 19:39:42 -05:00
• 8a9b84c7f3 fixed save to map to filter by metacode too Devin Howard 2013-02-22 18:48:01 -05:00
• b336af1d53 added selectNode and deselectNode functions Devin Howard 2013-02-22 18:33:18 -05:00
• 88522be80c now if you double click 'inCanvas' nodes they will be added to the map. TODO they don't have a mapping yet Devin Howard 2013-02-22 18:27:11 -05:00
• d283797deb made the metamaps model cooler Devin Howard 2013-02-22 18:08:03 -05:00
• 195889e6fe added clear canvas button back to topics view, including javascript code to back it up Devin Howard 2013-02-22 18:01:15 -05:00
• e2c28da81e changed checkbox logic in find.js Devin Howard 2013-02-21 21:37:00 -05:00
• fcc1a6968c lowercase in commons searching for topic names Devin Howard 2013-02-21 21:36:33 -05:00
• a248a866c1 changed some variable names and removed commented code in find.js Devin Howard 2013-02-21 21:10:11 -05:00
• 28170035b0 fixed more indentation in find.js Devin Howard 2013-02-21 20:52:46 -05:00
• e670861f3e added data-nil to showard links Devin Howard 2013-02-21 20:32:43 -05:00
• 3e4368c0f4 This commit did three things: 1) Make Seek case insensitive for topic name search 2) Changed indentation in find.js 3) Removed some commented code in onCanvasSearch - if you want to recover it, it's in this commit Devin Howard 2013-02-21 19:59:59 -05:00
• e594660804 Merge branch 'devel' Devin Howard 2013-02-21 18:35:49 -05:00
• ad8e70a95f plateau => platform Devin Howard 2013-02-21 18:35:26 -05:00
• 5fd9af3dfd fixed menu sizing bug and permissions sizing bug Connor Turland 2013-02-20 17:52:25 -05:00
• 50bc2b53a9 added url for embedding maps Connor Turland 2013-02-19 09:44:43 -05:00
• 1b29eb1eb3 hid clearcanvas and seek tabs on topic pages as they had broken functionality Connor Turland 2013-02-16 19:23:36 -05:00
• 667d86083c fixed autocomplete bugginess further Connor Turland 2013-02-16 19:08:19 -05:00
• 210c73e81b Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 Connor Turland 2013-02-16 19:03:48 -05:00
• c7f44d34a7 fixed console issue Connor Turland 2013-02-16 19:03:21 -05:00
• d289d77b5a added seek/analyse/organize tabs to topic view. Was that a good idea? Who knows. Devin Howard 2013-02-16 17:52:38 -05:00
• f1a7e040fb fixed & error on synapse desc display Devin Howard 2013-02-16 17:32:50 -05:00
• a1c5a82ac4 fixed autocomplete bugginess, fixed synapse half opacity bug Connor Turland 2013-02-15 20:00:05 -05:00
• 759e6aa0bd Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 Connor Turland 2013-02-15 08:51:11 -05:00
• 1ea2317ab4 nicer formatting on savelayout in maps_controller.rb Devin Howard 2013-02-14 22:36:08 -05:00
• 5e051ebff2 allow showcards to disappear when you click on the canvas. also fixed a couple other bugs related to showcards that make code a little more logical Devin Howard 2013-02-14 22:23:14 -05:00
• e762be0be3 implemented clear canvas too... sort of Devin Howard 2013-02-14 21:58:55 -05:00
• 35dd8c1816 partway to save to map functionality on topic view Devin Howard 2013-02-14 21:29:45 -05:00
• dee531e3ef hide synapse editing card on topic view too Devin Howard 2013-02-14 21:08:58 -05:00
• 0bad3ec1de production config file Connor Turland 2013-02-10 21:04:11 -05:00
• cd3f02d676 fixed save layout bug issue #90 Devin Howard 2013-02-10 20:22:18 -05:00
• 87d74fd3c2 ok you can edit nodes with whitespace now Devin Howard 2013-02-07 18:55:10 -05:00
• e1f454c4f4 set up data nil. still need to make sure nodes with only whitespace in their description field are editable Devin Howard 2013-02-07 18:51:41 -05:00
• 9160ae305e finished devins piece editing synapse directionality Connor Turland 2013-02-03 21:12:15 -05:00
• 8167708383 added link to Click Me topic in logged out menu, and made it the place you go when you log in Connor Turland 2013-02-03 20:20:29 -05:00
• c29c1b9e5d switched settings back to compress js and css for optimization Connor Turland 2013-02-03 20:10:21 -05:00
• a97caa5c7a updated gem file to use older version of jquery rails that is working locally Connor Turland 2013-02-03 20:06:19 -05:00
• 31dc1ed126 removed assets Connor Turland 2013-02-03 19:52:39 -05:00
• f402ddc243 changed code for production env so that I can debug Connor Turland 2013-02-03 19:52:14 -05:00
• 24dcd4c13a added code to application.rb that should fix Connor Turland 2013-02-03 19:25:08 -05:00
• 4bbb838cd4 reformatted home page, fixed text-overflow, added request invite page and a link to the blog Connor Turland 2013-02-03 19:13:21 -05:00
• 5abe7ef173 fixed graphsettings file Connor Turland 2013-02-03 13:04:01 -05:00
• dfa2b2eb83 merged in changes from github and merged with synapse editng code Devin Howard 2013-01-30 19:51:55 -05:00
• da1ce2bc87 removed public/assets Devin Howard 2013-01-30 19:49:47 -05:00
• 9e8fdd5138 committing edit edge form without permission capabilities so it can go up now Devin Howard 2013-01-30 19:01:28 -05:00
• 2a785b350a added synapse editing css to base.css Devin Howard 2013-01-30 18:58:51 -05:00
• 12d5e17e6c hide synapse editing dialog on click in graphsettings.js Devin Howard 2013-01-30 18:58:27 -05:00
• a080fa2ec4 now the permissions is broken and it looks bad, but the directionality editing works Devin Howard 2013-01-27 17:58:43 -05:00
• 25fa45356f javascript, etc to allow editing of directionality and edge titles. This commit results in effective, but really horrid UI-wise, editing of such things. Devin Howard 2013-01-27 17:21:19 -05:00
• b358f3dc5b fixed login bug Connor Turland 2013-01-26 00:46:03 -05:00
• 68d08af9d3 db file for production Connor Turland 2013-01-25 22:50:23 -05:00
• 81094a5d62 testing metacode things with staging Connor Turland 2013-01-25 22:31:35 -05:00
• f3de1944d1 testing metacode things with staging Connor Turland 2013-01-25 22:28:45 -05:00
• 7f6eb94e7a assets for staging Connor Turland 2013-01-25 22:07:02 -05:00
• a0f638c10c added ability to switch what metacodes you are mapping with Connor Turland 2013-01-25 20:49:40 -05:00
• 633e882aaa added assets for stagin Connor Turland 2013-01-25 00:56:31 -05:00
• 9853f91a59 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 Connor Turland 2013-01-25 00:48:09 -05:00
• 9bc07b04fa improved so many things Connor Turland 2013-01-25 00:47:32 -05:00
• 0ad2392af5 Merge branch 'master' into devel Devin Howard 2013-01-24 19:53:07 -05:00
• 87b2526373 removed 2 spaces from sessions_controller Devin Howard 2013-01-24 19:52:13 -05:00
• c9614e33e3 removed buggy line from users_controller preventing people from joining (?) Or just Ishan's friends? Devin Howard 2013-01-24 19:51:51 -05:00
• 3433e1f05c lowered synapse alpha Connor Turland 2013-01-23 23:40:06 -05:00
• 57219f0d1e assets for stagin Connor Turland 2013-01-23 22:56:52 -05:00
• 397eddca84 removed assets for github Connor Turland 2013-01-23 22:48:03 -05:00
• 2a50e58820 added assets for staging Connor Turland 2013-01-23 22:12:17 -05:00
• 43e1e12503 changed topic exploration to move into fluid space. Connor Turland 2013-01-23 22:05:24 -05:00
• 1727d95c4c re-enabled my work so far on realtime for Fabio Connor Turland 2013-01-23 13:55:50 -05:00
• 02ac167444 good start on more persistent permissions throughout the platform Connor Turland 2013-01-23 13:43:01 -05:00
• aa911d4bdf Merge branch 'master' of https://github.com/Connoropolous/metamaps_gen002 Devin Howard 2013-01-20 21:22:33 -05:00
• 1645e8a772 added brief readme Devin Howard 2013-01-20 21:09:38 -05:00
• 7227e29aef added db config default file Connor Turland 2013-01-20 18:00:27 -05:00
• a85e8fac71 added db config default file Connor Turland 2013-01-20 18:00:10 -05:00
• 1633b61637 permissions not fully fully functional yet, don't push to staging. editing of maps as cards in place. raw data available as json at maps/:id/json, or topics/:id/json, or synapses/:id/json Connor Turland 2013-01-18 17:08:06 -05:00
• e6029e59c8 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 Connor Turland 2013-01-15 19:34:40 -05:00
• 3deebc6c09 merged comment in home.html.erb with Twitter contact info Devin Howard 2013-01-15 19:32:23 -05:00