Connor Turland
6b2386a545
progress onthe home page
2016-08-04 13:56:39 -04:00
Connor Turland
293e68da05
remove old stuff
2016-08-04 13:56:39 -04:00
Devin Howard
a6951920eb
fix module.exports javascript bug
2016-08-04 17:08:10 +08:00
Devin Howard
69bdb0bf01
hotfix master with mappable_policy.try
2016-08-04 17:04:01 +08:00
Devin Howard
194a4dc975
add production schema file
2016-08-04 16:53:09 +08:00
Devin Howard
52cbd57367
Merge pull request #586 from metamaps/merge/master-into-develop
...
merge master into develop
2016-08-04 10:53:00 +08:00
Devin Howard
6df8da16bc
Merge branch 'master' into develop
2016-08-04 10:51:36 +08:00
Devin Howard
dc725c3b9a
Merge pull request #583 from metamaps/fix/purple-metacodes
...
attempt to fix purple metacodes (#527 )
2016-08-04 10:16:04 +08:00
Devin Howard
17a9a2d23a
fix jquery error and move package.json etc to root dir
2016-08-03 22:40:14 +08:00
Devin Howard
6eff2d91c9
fix backbone jquery
2016-08-03 21:25:44 +08:00
Devin Howard
720f67cee7
move metacode loading earlier, and add a query string to work around amazon aws CORS issues
2016-08-03 08:54:10 +08:00
Devin Howard
6997142fd9
finish integrating npm. move underscore/backbone into npm management ( #577 )
...
* finish integrating npm. move underscore/backbone into npm management
* update docs for npm integration
* allow jsx or js extension
* change underscore version
2016-08-01 15:59:53 -04:00
Devin Howard
e6954eb37a
Merge pull request #574 from metamaps/fix/synapse-search-duplicates
...
fix synapse autocomplete duplicates
2016-08-01 08:56:55 +08:00
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
4161f70d2e
remove duplicates from synapse search
...
there were 2 issues. one is synapses with leading/trailing whitespace. I've run a script on production to strip existing leading/trailing whitespace from synapse descs.
The second issue was that this code wasn't actually modifying the @synapses array, and collectedDesc wasn't doing anything. So this new line will be more effective.
2016-07-31 19:31:31 +08: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
f5912d511d
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:31:32 +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
