Commit graph

1353 commits

Author SHA1 Message Date
Devin Howard 25774d9f16 remove unneeded https stuff 2016-02-28 16:57:25 +08:00
Devin Howard 8916ff20b6 Merge pull request #477 from metamaps/feature/metacode-icon-on-aws
metacode icons on aws (fixes #445)
2016-02-28 12:19:00 +08:00
Devin Howard ba1427af45 update rspec for metacodes 2016-02-26 14:20:14 +08:00
Devin Howard ac1d4f70b6 show old image on metacode edit form; tweak css of admin area 2016-02-26 14:06:37 +08:00
Devin Howard 40cd1ebb5c modify metacodes to instead have two fields, and validate that only one is present. Manual icons can be entered through rake tasks or on the rails console or in db seed 2016-02-25 14:49:48 +08:00
Devin Howard 941b37b8e2 Merge pull request #476 from metamaps/feature/cleanup
cleanup some TODO items
2016-02-24 10:19:45 +08:00
Devin Howard e1b2ddde7d add another TODO... 2016-02-23 19:04:39 +08:00
Devin Howard 09ceb8ceec move 4 global variables into Metamaps namespace 2016-02-23 19:04:30 +08:00
Devin Howard 59f84cfe20 cleanup TODO lines 2016-02-23 18:59:45 +08:00
Devin Howard 7a74668c8d tweaks to lightboxes view post-SSL 2016-02-23 18:56:50 +08:00
Devin Howard 295534e4ab migrate to using aws/paperclip for metacodes. RUN RAKE TASK ON PRODUCTION 2016-02-23 14:58:20 +08:00
Devin Howard cb43ebce92 Merge pull request #474 from metamaps/feature/fix-synapse-mappings
don't need xloc or yloc for Synapse mappings
2016-02-22 12:33:05 +08:00
Devin Howard b385efafa9 don't need xloc or yloc for Synapse mappings 2016-02-21 17:25:39 +08:00
Devin Howard 40a833b069 Merge pull request #473 from metamaps/feature/fix-invite-link
fix get_invite_link function. fixes #471
2016-02-21 15:22:34 +08:00
Devin Howard bd6a5ee9c4 Merge pull request #472 from metamaps/feature/allow-embedding
allow embedding
2016-02-21 15:19:54 +08:00
Devin Howard e629a9bf71 fix get_invite_link function. fixes #471 2016-02-19 18:09:46 +08:00
Devin Howard 7b9c6459e3 allow embedding 2016-02-19 09:23:39 +08:00
Devin Howard 5dc32186e8 Merge pull request #470 from metamaps/feature/remove-phantomjs
remove phantom js
2016-02-18 15:04:38 +08:00
Devin Howard 00c10c99d8 remove phantom js 2016-02-18 14:25:47 +08:00
Devin Howard affb1672ae bite the bullet and link build icon to the jenkins job 2016-02-18 14:11:39 +08:00
Devin Howard d61b6c1280 smarter db creation. don't use db:reset or db:setup.
This jenkins setup will load and migrate db without seeding.
2016-02-14 15:19:36 +08:00
Devin Howard 9ff6375e62 don't need to create synapse on canvas click 2016-02-14 15:19:36 +08:00
Devin Howard dc1aa1e28e document synapse cancellation in cheatsheet 2016-02-14 15:19:36 +08:00
Devin Howard 9469b08ffa cancel synapse creation with esc, backspace, or delete 2016-02-14 15:19:35 +08:00
Devin Howard 056ef2b5b6 smoother synapse creation with clicks/tabs 2016-02-14 15:19:35 +08:00
Devin Howard 48863ce246 create synapse if you click away from the synapse title form 2016-02-14 15:19:35 +08:00
Devin Howard f9bcd33344 update synapses specs; all specs pass again. all models/controllers tested 2016-02-09 14:25:39 +08:00
Devin Howard 0c81c8d9de topics controller spec 2016-02-09 13:42:24 +08:00
Devin Howard 7f50db1ae9 ok metacode spec done 2016-02-09 13:30:49 +08:00
Devin Howard 6d0dcec1ba mess with metacode tests 2016-02-09 12:43:34 +08:00
Devin Howard f3f8bfbea8 remove map screenshot tests for now. maps controller spec passes 2016-02-09 11:59:19 +08:00
Devin Howard 43bdda61de maps controller spec passes, 3 pending 2016-02-09 11:48:07 +08:00
Devin Howard 374ac701c9 filling out map controller spec 2016-02-09 11:33:43 +08:00
Devin Howard 005250f330 typo 2016-02-09 11:26:42 +08:00
Devin Howard 7956e6d289 check map#contains matches json schema in spec 2016-02-09 11:20:39 +08:00
Devin Howard 0b98e446ca fiddle with maps_controller code style 2016-02-09 11:20:04 +08:00
Devin Howard 451ed81010 remove tests that shouldn't be there 2016-02-08 12:01:59 +08:00
Devin Howard 17ee69b147 start fixing other controller specs 2016-02-08 11:56:46 +08:00
Devin Howard 80a6bcbca2 remove annoying rcov gem 2016-02-08 11:19:40 +08:00
Devin Howard e460899ea3 testing simplecov and rcov stuff 2016-02-08 11:19:39 +08:00
Devin Howard d64fe002dc suppress devise warnings on rspec tests 2016-02-08 11:19:38 +08:00
Devin Howard cc99ed001d fix mapping_controller_spec.rb 2016-02-08 11:19:38 +08:00
Devin Howard 46013bc1b5 start speccing out mappings controller 2016-02-08 11:19:38 +08:00
Devin Howard fa3a725df9 mapping spec 2016-02-08 11:19:37 +08:00
Devin Howard b3f8f6652a simplecov added 2016-02-08 11:19:36 +08:00
Devin Howard caa65c1170 metacode spec 2016-02-08 11:19:36 +08:00
Devin Howard e4d53162a7 Merge branch 'master' into develop 2016-02-06 12:55:02 +08:00
Devin Howard f9128dad7a vendor in gitignore 2016-02-06 12:52:38 +08:00
Devin Howard 9e28fa1ea7 public dir perms 2016-02-06 12:52:25 +08:00
Devin Howard 798035107f Merge branch 'master' into develop 2016-02-06 10:11:55 +08:00