Commit graph

23 commits

Author SHA1 Message Date
Connor Turland 9ab7e7e170 topic card re-org 2017-09-08 16:58:17 -04:00
Connor Turland 7ee96bf6c6 Into master: two finger pan/zoom, map and topic follows (for internal testing) on the UI, map activity emails (#1084)
* fix topic spec

* fix synapse/mapping spec

* brakeman csrf warning suppressed :|

* follows for maps in the ui for internal testing only still (#1072)

* follows for maps in the ui for testers

* require user for these actions

* match how map follow works

* include ability to unfollow from email

* fixup templates

* add unfollow_from_email to the policies

* Update _cheatsheet.html.erb

Clean up text, clarify, and bring in line with current functionality

* topicsRegex and synapsesRegex should allow commas (#1073)

* even better import csv regexes

* prevent double prompt on file drop import

* topic card in react (#1031)

* its coming along

* links bar

* scssify a bunch

* metacode image working a bit better

* metacode selector in react topic card

* riek editing for name field on topic card

* riek submit on enter

* factor out Title and Links from Topic Card component, but not the listeners

* create working Desc editor

* styling is much better now

* textarea min height for desc

* disallow images in topic card markdown

* shift enter is linebreak, enter is save

* attachments split out, but it's pretty buggy

* move listeners into Links.js

* slightly wider metacodeTitle

* fix positioning on metacode selector

* fix metacode selection

* move metacode and permissions into subcomponents

* fixes

* prevent editing on desc/title if not authorized to edit

* fix topic card draggability

* fix embedly

* fix md test

* remove the removed link card manually with jquery

* fix test syntax

* eslint

* more eslin

* reuse authorizedToEdit

* convert metacode sets to a json object for react

* add the html in react whoop

* fix metacode styling

* sort wasn't working

* finishing metacode select

* readd the above link input border

* fix syntax

* multiline title editable textarea

* more portable metacode selector component

* factor out #metacodeOptions into one react component with a callback :D:D:D

* render metacodeOptions in right click menu with react

* render metacodeOptions in right click menu with react

* fix up right click menu's metacode editing

* fix topic card title character counter

* ignore metamaps secret bundle in ag

* simplify Attachments props

* factor out embedly card into its own component; it seems to help

* link resetter

* fix edit icon on title in topic card

* move mapCount and synapseCount hover/click logic to react

* fix up the showMore control

* metacode selection tweaks

* tweak links bar spacing in topic card

* rubocop

* remove TODOs

* more badass permissions selector

* close permission selector when you click outside

* fix overeager metacode selector

* more modular attachments component

* fix bug in Desc.js

* fix right click styling

* permission changes are different than edit rights

* bad module ref

* ensure maxLength on topic titles

* hellz yeah (#1074)

* fix drop from two touches to one

* don't commit activity service

* ability to select/unselect all metacodes in custom set with keyboard shortcut (fix #390) (#1078)

* ability to select/unselect all metacodes in custom set with keyboard shortcut

* select all button

* nicer all/none buttons

* set up react testing (#1080)

* install mocha-webpack. also switch hark to npm version instead of github version

* well, mocha-webpack runs

* add jsdom for tests

* upgrade to webpack 2

* fix npm run test errors

* ImportDialogBox component tests

* Fixes bug where pressing delete key while editing text will suggest... (#1083)

* Fixes bug where pressing delete key while editing text will suggest the deletion of selected map entities

* Changed the DEL key to remove entities instead of delete them

* temporarily disable code climate duplication engine

* add topic following for internal testing

* daily map activity emails (#1081)

* data prepared, task setup

* add the basics of the email template

* cover granular permissions

* unfollow this map

* break out permissions tests better

* rename so test runs
2017-03-06 22:49:46 -05:00
Connor Turland db81962c91 some c9 files to gitignore 2017-01-26 00:24:31 +00:00
Devin Howard 2466a0912f raml2html build script 2016-10-04 15:22:24 +08:00
Devin Howard 5fe03641cb move frontend code into a folder, and setup react build tooling with es6 transforms (#576) 2016-07-31 14:51:06 -04:00
Devin Howard 45adda93b1 set up scaffolding for js tests (#553) 2016-04-26 10:22:32 +08:00
Connor Turland 5fbf7ac34d hide metamaps_mobile in gitignore 2016-03-13 03:16:31 +11:00
Devin Howard b3f8f6652a simplecov added 2016-02-08 11:19:36 +08:00
Devin Howard f9128dad7a vendor in gitignore 2016-02-06 12:52:38 +08:00
Devin Howard 70f5a5db11 centralize config in .env file, which includes remaving database.yml.default and overriding that file's local changes in favour of env variables. In future, all instance config can go in .env 2016-01-06 22:36:29 +08:00
Connor Turland 6e79b58e16 updated files to use amazon assets 2015-10-27 21:46:07 -07:00
Devin Howard 12c6765f8b add secrets.yml.default 2015-10-27 18:17:04 +08:00
Devin Howard 72e67c188a resume ignoring public/assets 2015-10-23 23:23:23 +08:00
mix irving 7a1b68960d install dotenv to help managed env vars 2015-03-09 08:50:24 +13:00
Gord Tanner 5592c4710a Created a Vagrantfile
Install instructions:

- clone repo
- (ensure you have VirtualBox and Vagrant)
- run configure.sh

This will create a VM, install all the software. Once vm is provisioned
it will then bundle install and configure your database

To start the service you can then run:

vagrant ssh -c 'cd /vagrant; rails s'
2015-01-22 17:53:18 -05:00
Connor Turland 7dc2f66d96 Update .gitignore 2014-10-18 09:15:08 -04:00
Bashar Jabbour cad8af2c1f updated the cheatsheet 2014-10-02 22:33:28 -04:00
Connor Turland 211d9220dd added precompiled assets 2013-04-26 00:32:09 -04:00
Devin Howard b40d63c0c1 added public/assets to gitignore because it seems to make sense 2013-03-07 21:44:25 -05:00
Devin Howard ac02995bac updated .gitignore 2012-12-15 13:49:12 -05:00
Connor Turland efb442fe5d swapped back in local/staging database file 2012-12-09 19:34:47 -05:00
Connor Turland 392a187b1c test 2012-09-23 16:21:41 -04:00
Connor Turland 8f3164027b added all files 2012-09-22 22:39:12 -04:00