metamaps--metamaps

glenux-contrib/metamaps--metamaps

Fork 0

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

a164dccc94 fix errors!! Devin Howard 2016-09-24 13:55:52 +0800
20bd959c69 fix models that rubocop broke >:( Devin Howard 2016-09-24 12:59:42 +0800
b0fac7648a Merge pull request #650 from metamaps/fix/map-serialization-bug Devin Howard 2016-09-24 12:32:38 +0800
f8c11f234d more rubocop updates Devin Howard 2016-09-24 12:27:34 +0800
5fab6de48a fiddle with metacodes controller Devin Howard 2016-09-24 11:00:53 +0800
0ace202ace automatic rubocop updates Devin Howard 2016-09-24 11:00:46 +0800
0a62eb3299 Merge pull request #655 from metamaps/feature/fix-map-titles Robert Best 2016-09-23 16:48:44 -0400
afa0cc96b9 Update index.js Robert Best 2016-09-23 16:06:28 -0400
f41ece6f1c Update index.js Robert Best 2016-09-23 15:47:37 -0400
b8ae2c4b6a Update Router.js Robert Best 2016-09-23 15:45:11 -0400
c76657ecb4 fix restful controller style issuse Devin Howard 2016-09-23 18:54:05 +0800
8255653d24 disable duplication checking in code climate for now Devin Howard 2016-09-23 18:51:34 +0800
04a3027368 code climate linked to travis Devin Howard 2016-09-23 18:43:54 +0800
cbd9395142 Merge pull request #651 from metamaps/feature/update Devin Howard 2016-09-23 18:37:14 +0800
bb5ba4861d [WIP] code climate config file (#654) Devin Howard 2016-09-23 18:36:47 +0800
806074dfb8 try babel-eslint parser Devin Howard 2016-09-23 18:33:45 +0800
c2194b8971 remove promise from eslint Devin Howard 2016-09-23 18:11:31 +0800
483ab2a2db module sourceType? Devin Howard 2016-09-23 18:11:12 +0800
4afab70414 Merge pull request #653 from metamaps/fix/travis Devin Howard 2016-09-23 17:57:02 +0800
680f38cfce code climate config Devin Howard 2016-09-23 14:45:18 +0800
a7338f8960 safer git dating Devin Howard 2016-09-23 17:49:26 +0800
117b7910bf test Devin Howard 2016-09-23 17:40:30 +0800
ce1ad3e24b update gems Devin Howard 2016-09-23 15:28:31 +0800
df84bd9e1d fix @maps serialization bug Devin Howard 2016-09-23 14:39:15 +0800
eef8a281cb Merge pull request #649 from metamaps/feature/Metamaps-in-frontend Devin Howard 2016-09-23 14:22:46 +0800
6f91ce5ff5 fix a few more errors Devin Howard 2016-09-23 14:12:27 +0800
e65a5e2d1c whoops, reenable travis npm test Devin Howard 2016-09-23 12:00:47 +0800
bda740491c moved JIT to npm. tests pass. whoop whoop Devin Howard 2016-09-23 11:47:40 +0800
700119cc9e opts can be undefined and throw error Connor Turland 2016-09-22 23:04:46 -0400
07e4ac3865 attempt to get npm testing working; fail Devin Howard 2016-09-23 10:37:59 +0800
499593fc82 fixing references Connor Turland 2016-09-22 21:40:49 -0400
f59a5775ae tweaks to import/exports Connor Turland 2016-09-22 20:16:18 -0400
73e7c38873 syntax fixes Devin Howard 2016-09-23 08:05:26 +0800
30fc943833 clean up backbone file imports Devin Howard 2016-09-23 00:20:05 +0800
a996734c79 remove Backbone from window Devin Howard 2016-09-23 00:16:15 +0800
30894a313f move views to their own frontend folder Devin Howard 2016-09-23 00:07:30 +0800
fe3012136d import _ Devin Howard 2016-09-22 23:51:33 +0800
59b471ac62 break Map into three files Devin Howard 2016-09-22 23:51:13 +0800
120c2c0b67 finish most except Backbone Devin Howard 2016-09-22 18:31:56 +0800
0065b201c7 make more code modular Devin Howard 2016-09-22 17:36:47 +0800
8ed2b3ffc1 remove Constants.js Devin Howard 2016-09-22 17:14:34 +0800
9c1543de64 move some variables into JIT Devin Howard 2016-09-22 17:08:53 +0800
8f100d99cb start to do stuff that may/may not work Devin Howard 2016-09-22 17:05:28 +0800
0562134157 low hanging fruit Devin Howard 2016-09-22 17:00:12 +0800
0a109895f7 merge realtime/package.json into top level package.json Devin Howard 2016-09-22 16:32:10 +0800
c0f63abc59 upgrade testing to es6 Devin Howard 2016-09-22 16:30:20 +0800
d97b5c2977 make Util modular Devin Howard 2016-09-22 15:32:08 +0800
7f83f86460 refactor a bit, make a comment about the Constants file Devin Howard 2016-09-22 15:29:55 +0800
03446f548a start making the code modular. many files still need global scape Devin Howard 2016-09-22 15:21:59 +0800
d02c836805 remove Metamaps from filenames Devin Howard 2016-09-22 14:35:14 +0800
a4d31241a8 move Metamaps code into webpack Devin Howard 2016-09-22 14:25:49 +0800
b13ebc6716 Merge pull request #640 from metamaps/fix/password-reset-error Devin Howard 2016-09-22 09:16:25 +0800
1370b63311 Merge pull request #639 from metamaps/feature/paste-url Devin Howard 2016-09-22 09:16:03 +0800
2219e0d0dd Update Metamaps.Topic.js Connor Turland 2016-09-21 14:53:17 -0400
8b19c9e340 automatic versioning via git (#621) Devin Howard 2016-09-22 01:24:14 +0800
3843cab643 rails 5 + api v2 + raml api docs (#593) Devin Howard 2016-09-22 01:22:40 +0800
1efd78ad7b initial attempt at focussing input field when entering multiple topics Devin Howard 2016-09-21 14:27:49 +0800
49084b98dd omg import bookmarks 😍 Devin Howard 2016-09-21 10:48:47 +0800
fac59f346f fix topic init function Devin Howard 2016-09-21 10:24:57 +0800
ec96d69876 refactor import view: Devin Howard 2016-09-13 21:02:55 +0800
9515152315 move auto layout function into its own file Devin Howard 2016-09-13 21:01:36 +0800
5ba7ba9355 don't commit swp Connor Turland 2016-09-20 12:28:41 -0400
ce7c88c78c add more space between nodes using auto-layout Connor Turland 2016-09-20 12:27:46 -0400
74630c2631 messed up comment Connor Turland 2016-09-20 12:04:42 -0400
966dd79187 Merge branch 'develop' into feature/better.select Connor Turland 2016-09-20 11:55:25 -0400
aace6796f5 allow topic carousel to be pinned open (#643) Connor Turland 2016-09-19 20:30:34 -0400
5d04d16590 create MetacodeSelect component Connor Turland 2016-09-18 15:22:51 +0000
61e27a4dcb height shouldn't stay hard set. fixes 622 Connor Turland 2016-09-17 23:43:33 +0000
992f589e9e close when map closes Connor Turland 2016-09-17 23:23:43 +0000
ec56afcb30 so that rapid topic creation can happen in succession Connor Turland 2016-09-17 23:00:04 +0000
823c0c5990 no room is created if anon user (#642) Connor Turland 2016-09-17 15:06:54 -0400
5d03ce3ef9 no room is created if anon user Connor Turland 2016-09-17 19:05:31 +0000
698adf69cd Update README.md Connor Turland 2016-09-17 14:55:23 -0400
cd31452c79 update readme (#575) Devin Howard 2016-09-18 02:54:44 +0800
ee70a58990 merge with develop Connor Turland 2016-09-17 18:54:06 +0000
ca74e8c5fc Merge pull request #641 from metamaps/fix/get-siblings-by-type Devin Howard 2016-09-17 20:57:48 +0800
d1c390636a Get siblings by metacode type returns only topics with that metacode - fix #538 Devin Howard 2016-09-17 17:12:35 +0800
8ce4f7e649 fix starred map error Devin Howard 2016-09-17 16:11:12 +0800
4723c62b20 fix password reset error Devin Howard 2016-09-15 07:18:15 +0800
1a4690387d devise fix Devin Howard 2016-09-14 22:22:42 +0800
4bbb9df5af can't use ` with uglify Devin Howard 2016-09-14 10:45:42 +0800
09c236e889 more cleanup Devin Howard 2016-09-06 12:43:02 +0800
6e44630a1a add sanity checks to the api tests Devin Howard 2016-09-06 12:05:44 +0800
5385715cd7 awesome, token specs/apis are done Devin Howard 2016-09-06 11:59:44 +0800
eb83363a3d map/mapping/synapse spec, plus other bugs Devin Howard 2016-09-06 09:36:25 +0800
b30c9ec42d spec out mapping api Devin Howard 2016-09-05 19:29:18 +0800
928cbd2942 get ready for token api docs. also TODO is mapping api docs Devin Howard 2016-09-05 11:47:39 +0800
fc9844836a workaround for user_preference.rb issue Devin Howard 2016-09-04 11:43:27 +0800
d4d1a15f50 Update topic spec for api v2 Devin Howard 2016-09-03 16:24:50 +0800
e326eaf631 rails 5 uses ApplicationRecord class for app-wide model config Devin Howard 2016-09-03 16:18:02 +0800
9b2d729c40 deprecate v1 api Devin Howard 2016-09-03 16:10:38 +0800
8054fcacdb more raml 1.0 stuff i'm learning about Devin Howard 2016-09-03 15:56:22 +0800
612e2d9849 formParameters => properties, and fiddle with map api Devin Howard 2016-09-03 15:48:43 +0800
b35ffbdca2 fill out maps api Devin Howard 2016-09-03 15:39:50 +0800
844360cfb0 fix page thing Devin Howard 2016-09-03 15:28:18 +0800
a8c20c633a alphabetize map policy Devin Howard 2016-09-03 15:15:12 +0800
f67aa898cf fill out synapse api Devin Howard 2016-09-03 15:10:56 +0800
3f43a9527c api v1 => v2 Devin Howard 2016-09-03 14:55:59 +0800
7b01e94358 add sorting by ?sort and searching by ?q. Add pagination Link headers Devin Howard 2016-08-21 18:13:18 +0800
7109ce2593 raml api documentation + rspec tests to verify schemas/examples Devin Howard 2016-08-21 16:39:03 +0800