glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
1737 commits 40 branches 27 tags 58 MiB
Commit graph

1737 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Devin Howard 70a4f54399 switch to ruby 2.3.0 (#572) 2016-08-01 08:33:45 +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 7d4da81272 Update code style automatically using rubocop gem (#563) 
* install rubocop

* 1961 automatic rubocop fixes

* update rubocop.yml to ignore half of the remaining cops

* rubocop lint warnings

* random other warnings fixed
 2016-07-26 08:14:23 +08:00
Devin Howard 17bccd809a Merge pull request #568 from metamaps/fix/import-export 
use Wildcard if no metacode
 2016-07-26 08:05:00 +08:00
Devin Howard e5c9af8f95 use Wildcard if no metacode 2016-07-24 13:43:12 +08:00
Devin Howard 27942546b8 fix 2 bugs on develop (#565) 
* fix js bug

* if mappable is nil it causes an error
 2016-07-02 16:32:02 +08:00
Devin Howard 872ae90832 submit new map form on Enter - fixes #555 (#562) 
* submit new map form on Enter - fixes #555

* update divs too
 2016-07-01 16:48:38 +08:00
Devin Howard 6c22ebcc51 have policy_scope always use scope.all or something else to ensure it's an ActiveRecord relation 2016-06-28 14:49:46 +08:00
Devin Howard b72536853f fix activemaps_path url bug (#559) 
* fix activemaps_path url bug

* annoying doc updates

* skip policy scope if redirecting an explore page

* lol that would have been dumb
 2016-06-20 08:32:39 +08:00
Devin Howard 6e1797183e brakeman (#556) 
* update rails to 4.2.5.1

* fix brakeman gem warning

* make brakeman happier and add it to travis

* install brakeman gem for static security analysis

* fix brakeman call in travis
 2016-06-16 15:44:08 +08:00
Devin Howard 97e9f999d9 Merge branch 'master' into develop 2016-06-16 15:43:30 +08:00
Devin Howard 1f9078638e fix truncate bug when map desc is nil (#557) 2016-06-16 15:42:43 +08:00
Devin Howard 5cf3416dc6 Merge pull request #558 from metamaps/fix/truncate-bug 
merge truncate fix + master into develop
 2016-06-16 15:42:36 +08:00
Devin Howard 2989406954 fix truncate bug when map desc is nil 2016-06-15 12:17:32 +08:00
Devin Howard b0860ef670 Merge branch 'develop' 2016-06-08 12:47:26 +08:00
Devin Howard 1d12aed3eb switch to dotenv-rails 2016-06-07 12:55:49 +08:00
Devin Howard 11f921b058 remove secret key from source control - fixme on production. 
This will expire all cookies, but make our install more secure from
hackers who know their way around Github
 2016-06-07 12:54:55 +08:00
Connor Turland c08868a5c1 user presence event (#552) 2016-04-26 08:08:12 -04:00
Devin Howard 45adda93b1 set up scaffolding for js tests (#553) 2016-04-26 10:22:32 +08:00
Connor Turland 2a3fa80540 wording needed updating 2016-04-24 12:15:40 -04:00
Connor Turland 8c51108a0c enable shared private and public maps (#530) 
* enable shared private and public maps

* change the list

* yeehaw add collaborators

* I believe this fixes the error connor brought up

* when topic or synapse is no longer on a map, don't defer

* needs to be before?

* just do it in the controller

* make recommendation they sign in and retry

* better email

* config for mailer previews

* improve wording

* shouldn't have included that

* switch to green

* don't execute if there's no map

* wasn't including the right people in some circumstances

* Finish breaking out JS files (#551)

* metamaps.Realtime refactor

* Metamaps.Util

* Metamaps.Visualize

* Metamaps.SynapseCard

* Metamaps.TopicCard

* Metamaps.Create.js

* Remove erb extension from Metamaps.Map.js

* Metmaps.Account and Metamaps.GlobalUI remove extension

* Metamaps.JIT no more erb extension

* move Backbone.init; standard-format on Metamaps.js.erb

* factor out canvas support check function

* some llittle template bugs

* remove featured from signed in explore maps bar

* don't let it overflow off the page
 2016-04-24 11:50:35 -04:00
Devin Howard 44ae6730a6 fix user search error 2016-04-21 00:30:11 -04:00
Devin Howard 437c73b0fe Merge develop 2016-04-20 11:25:59 +08:00
Devin Howard e569a0376d Merge pull request #548 from metamaps/feature/refactor-javascript 
split out all javascript files
 2016-04-20 11:24:20 +08:00
Devin Howard af4a958f59 Merge pull request #549 from metamaps/fix/map-fork 
fix map forking (fix #540)
 2016-04-20 09:36:52 +08:00
Devin Howard da0da1a117 Merge pull request #546 from metamaps/feature/exception-notification 
slack exception notifications
 2016-04-20 09:06:42 +08:00
Devin Howard 837e4bde1b fix map forking (fix #540) 2016-04-20 09:00:45 +08:00
Devin Howard 5a60135392 Merge branch 'develop' 2016-04-15 11:51:40 +08:00
Devin Howard c1d963d669 remove .erb from files that don't need it 2016-04-15 09:18:17 +08:00
Devin Howard 8bb96d12a6 Metamaps.Control 2016-04-15 09:13:01 +08:00
Devin Howard 6a8921ae6d standard-format Metamaps.JIT.js.erb 2016-04-15 09:13:01 +08:00
Devin Howard 074eaf0bd3 alphabetize dependecies 2016-04-15 09:13:01 +08:00
Devin Howard 324719e531 Metamaps.Filter 2016-04-15 09:13:01 +08:00
Devin Howard b10f0cef0e Metamaps.Listeners.js.erb 2016-04-15 09:13:01 +08:00
Devin Howard a5bd0440a8 Metamaps.Organize 2016-04-15 09:13:01 +08:00
Devin Howard ca5928113d whoops don't forget standard format 2016-04-15 09:13:01 +08:00
Devin Howard de62a08307 Metamaps.Topic 2016-04-15 09:13:01 +08:00
Devin Howard 4833dd8da6 Metamaps.Synapse 2016-04-15 09:13:01 +08:00
Devin Howard 11a87582c7 Metamaps.Map 2016-04-15 09:13:01 +08:00
Devin Howard 13d6ab56e5 factor out two more small view modules 2016-04-15 09:13:01 +08:00
Connor Turland 7bb7f345f1 added an event for conversations starting (#547) 
* added an event for conversations starting

* switch to post
 2016-04-14 14:35:28 -04:00
Devin Howard 317f0c245e Merge pull request #545 from metamaps/feature/refactor-javascript 
JS refactoring part 1 of many!
 2016-04-14 12:35:21 +08:00
Devin Howard fb80f56a7d slack exception notifications 2016-04-13 17:20:01 +08:00
Devin Howard 134d4171f8 alphabetize gemfile 2016-04-13 17:07:23 +08:00
Devin Howard 6653d10edf Debug gets a header. Still need to parse through Metamaps, Metamaps.GlobalUI, and Metamaps.JIT 2016-04-13 16:06:01 +08:00
Devin Howard be99ad8285 factor out Metamaps.Admin 2016-04-13 16:04:15 +08:00
Devin Howard 799f6e4623 Metamaps.Router standard style 2016-04-13 15:58:54 +08:00
Devin Howard df9c0a93bc Metamaps.Views standard style 2016-04-13 15:58:54 +08:00
Devin Howard e8c55df4e8 Metamaps.Backbone standard style 2016-04-13 15:58:54 +08:00
Devin Howard 5a3ab025b7 Metamaps.Import standard style 2016-04-13 15:58:54 +08:00