Devin Howard
98081097b4
Revert "update rails dependencies"
...
Original commit broke the build, since some dependencies have breaking
changes.
This reverts commit f753392d49
.
2018-11-09 07:42:26 -08:00
Devin Howard
f753392d49
update rails dependencies
2018-10-17 19:51:51 -07:00
Connor Turland
38a209a970
small bug fix ( #1174 )
...
if someone besides one of "us" tried to change their password, and their settings, it wouldn't work
in the typical case it would work fine
2018-03-11 21:57:23 -07:00
Devin Howard
bd7bf20810
factory_girl => factory_bot ( #1172 )
2018-03-10 08:10:09 -08:00
Devin Howard
955ebdd747
Change log level of Metamaps.Debug ( #1170 )
...
debug log level is invisible in Chrome by default, which is confusing
2018-02-05 21:35:53 -08:00
Devin Howard
fdcd8a93f1
tag 3.6.1
2018-01-24 20:02:28 -08:00
Devin Howard
b5c52adf5e
update to paperclip 5.2.0
2018-01-24 19:52:33 -08:00
Devin Howard
b7761a3627
manual rubocop fixes ( #1163 )
2018-01-21 14:21:00 -08:00
Devin Howard
e0d72fce14
update nokogiri ( #1169 )
2018-01-21 14:20:21 -08:00
Devin Howard
139fdf8e2b
update rubocop to 0.48.1. We still want to match Code Climate though ( #1168 )
2018-01-20 14:10:26 -08:00
Devin Howard
4313f6eff8
TopicCard/Desc.spec.js ( #1167 )
...
TopicCard/Desc.spec.js
2018-01-20 13:31:36 -08:00
Devin Howard
91c004ebfd
TopicCard/Permission.spec.js ( #1166 )
2017-12-04 21:06:09 -08:00
Devin Howard
96056f43ef
TopicCard/Title.spec.js ( #1165 )
2017-12-02 12:45:05 -08:00
Devin Howard
32e58fa8af
tests for TopicCard/index.js ( #1164 )
2017-11-26 16:13:17 -08:00
Devin Howard
5ebbd87afc
automatic rubocop fixes ( #1162 )
2017-11-25 11:23:47 -08:00
Devin Howard
006920b686
fix broken experience if forgot password email isn't found
2017-11-13 07:16:25 -08:00
Devin Howard
97448b389f
null check in synapse policy
2017-11-13 07:11:48 -08:00
Connor Turland
f1ecc9eb0b
Merge pull request #1160 from metamaps/bug/map.info.box.closing
...
event listener was getting lost cuz react
2017-10-26 19:17:42 -04:00
Connor Turland
ca2684fcf3
event listener was getting lost cuz react
2017-10-26 19:09:28 -04:00
Connor Turland
d9c53514fe
Update pull-changes.md
2017-10-25 06:44:20 -04:00
Connor Turland
e195b89bbd
Merge pull request #1155 from metamaps/bug/fix.emails
...
fix map activity emails
2017-10-17 12:26:20 -04:00
Connor Turland
e66498a861
add logging for delayedJob
2017-10-17 12:20:51 -04:00
Connor Turland
901eb4a513
Update daily_summary.html.erb
2017-10-17 12:06:37 -04:00
Devin Howard
cbf44e3dfe
add one view test
2017-10-17 08:28:00 -07:00
Connor Turland
8b492d6dc8
made the mistake of not checking all cases
2017-10-17 01:28:07 -04:00
Connor Turland
b83f366284
Merge pull request #1151 from metamaps/feature/admin.pages
...
move admin header to react
2017-10-15 16:05:18 -04:00
Connor Turland
1ac06d973c
Merge pull request #1153 from metamaps/feature/follow.created
...
follow created maps as default setting
2017-10-15 14:08:04 -04:00
Connor Turland
9af3754bc8
follow created maps as default setting
...
if you are the map creator, we'd like to set you up to be following it by default
2017-10-15 14:07:11 -04:00
Connor Turland
8169f24072
Merge pull request #1150 from metamaps/rake-assets-precompile
...
run perms:fix on assets:precompile
2017-10-15 11:02:59 -04:00
Connor Turland
b9fb4a2829
move admin header to react
2017-10-15 10:56:51 -04:00
Connor Turland
9b52d0e081
fix tests
2017-10-15 10:56:04 -04:00
Devin Howard
14dc3687cd
run perms:fix on assets:precompile
2017-10-14 12:02:41 -07:00
Metamaps on Linode
0a6e7918ef
fix docs building by reverting raml2html
2017-10-14 14:55:42 -04:00
Metamaps on Linode
4a7595e76d
fixup imports
2017-10-14 14:55:42 -04:00
Connor Turland
e899179314
Update first-deploy.md
2017-10-14 14:44:10 -04:00
Connor Turland
44fec58985
Merge pull request #1149 from metamaps/feature/reorg.react
...
reorg code to distinguish between route components and normal ones
2017-10-14 12:38:57 -04:00
Connor Turland
29a25c28a8
distinguish between route components and reusable components
2017-10-14 12:37:48 -04:00
Connor Turland
76c727cd61
Merge pull request #1148 from metamaps/feature/refactor.nav.bar
...
rename exploreMapsBar into reusable navBar
2017-10-14 12:30:29 -04:00
Connor Turland
693e6f5e10
bug fixes and make active class auto
2017-10-14 12:03:05 -04:00
Connor Turland
a1d4c99ff6
abstract exploreMapsBar into reusable navBar
2017-10-13 13:58:21 -04:00
Connor Turland
55f2425501
Merge pull request #1142 from metamaps/feature/notifs.box
...
Notifications Dropdown
2017-10-13 12:29:21 -04:00
Connor Turland
f9c139c19e
ruby codeclimate fixes
2017-10-13 12:22:05 -04:00
Connor Turland
d51a22c5a9
eslint fixes
2017-10-13 12:13:36 -04:00
Connor Turland
567bc9d69d
Merge pull request #1145 from metamaps/feature/lower.case.headings
...
Switch junto headings to have normal casing (not all uppercase)
2017-10-04 11:22:33 -04:00
Connor Turland
15f512efef
improve notificationbox readability
2017-09-29 14:05:39 -04:00
Connor Turland
5e6fb6290c
refactor for clarity
2017-09-29 13:06:33 -04:00
Connor Turland
8695297a0f
wasn't using the proper serializer causing frontend error
2017-09-29 13:06:19 -04:00
Connor Turland
216a19476b
add hover states and empty case
2017-09-28 12:28:33 -04:00
Connor Turland
a0c9530c91
Update index.js
2017-09-25 16:01:25 -04:00
Connor Turland
277644f59d
improve styling, fix index notifs page
2017-09-25 15:21:04 -04:00
Connor Turland
0ffc01b3fb
Merge pull request #1144 from metamaps/feature/hide-learn-markdown
...
hide "learn markdown" unless you're editing the topic card desc
2017-09-25 14:46:44 -04:00
Devin Howard
9471efb6bd
hide "learn markdown" unless you're editing the topic card desc
2017-09-23 13:19:43 -07:00
Connor Turland
fc8ac6eef1
nest inconsistent data under data key
2017-09-23 11:20:02 -04:00
Connor Turland
9cc700c64d
use decorator pattern for notifs api
2017-09-22 18:38:38 -04:00
Connor Turland
64ffc78f45
add the container for the notifications dropdown
2017-09-19 23:48:46 -04:00
Connor Turland
322da431eb
Merge pull request #1139 from metamaps/feature/right.click.react
...
Right click/context menu redone in React
2017-09-19 11:49:30 -04:00
Connor Turland
3c7c8812a4
tempplate strings and new lines
2017-09-19 11:46:19 -04:00
Connor Turland
0d6963ebb0
eslint
2017-09-19 10:16:14 -04:00
Connor Turland
c4d0bf8ce4
clean up jquery ref and strings
2017-09-19 10:02:05 -04:00
Connor Turland
3406f2e04d
make render a callback and use async apply for ease of use
2017-09-19 09:58:59 -04:00
Connor Turland
a4c905df4e
move each li into its own function
2017-09-19 09:04:21 -04:00
Connor Turland
5f1fe4dc3f
reimplement shifting menu according to click position
2017-09-19 08:37:00 -04:00
Connor Turland
2515073393
replace old edgeRightClick code
2017-09-19 00:46:23 -04:00
Connor Turland
a04cd0d395
call the right callbacks and show in the right context
2017-09-19 00:34:37 -04:00
Connor Turland
da9e44afa0
clear the right click menu the right way
2017-09-18 23:49:35 -04:00
Connor Turland
e290244404
beginning to come together
2017-09-18 23:30:33 -04:00
Connor Turland
6e1878413f
wip right click in react
2017-09-18 21:09:35 -04:00
Connor Turland
77846cfcb7
missing period for consistency
2017-09-18 16:59:52 -04:00
Connor Turland
1ffc513617
Merge pull request #1137 from metamaps/feature/improve.desc
...
make desc edit area larger and resizable
2017-09-17 16:25:53 -04:00
Connor Turland
3886e62a7b
make desc edit area larger and resizable
2017-09-17 09:01:44 -04:00
Devin Howard
ad2ba33db6
downgrade redis to 3.3.3
...
This fixes the following error seen on metamaps.cc:
> *A* `Gem::LoadError` *occurred while* `POST </mappings>` *was processed
> by* `mappings#create`: Specified 'redis' for Action Cable pubsub
> adapter, but the gem is not loaded. Add `gem 'redis'` to your Gemfile
> (and ensure its version is at the minimum required by Action Cable).
Backtrace
----------------
```/usr/local/rvm/rubies/ruby-2.3.0/lib/ruby/2.3.0/monitor.rb:214:in
`mon_synchronize'
/home/metamaps/metamaps.cc/app/models/mapping.rb:32:in `after_created'
/home/metamaps/metamaps.cc/app/controllers/mappings_controller.rb:24:in
`create'```
2017-09-16 13:41:50 -07:00
Devin Howard
cf9f54c738
tag v3.5
2017-09-16 12:27:02 -07:00
Connor Turland
f323796030
Merge pull request #1132 from metamaps/feature/mod.follow
...
add active scope to follows model
2017-09-13 22:45:50 -04:00
Connor Turland
a080b82e7f
Merge pull request #1133 from metamaps/feature/topic.follow
...
Topic Card Design changes (to include 'follows')
2017-09-13 10:32:44 -04:00
Connor Turland
1174123b60
use scss vars and font fallbacks
2017-09-13 10:31:48 -04:00
Connor Turland
35f77129ad
email job needs to respect active as well
2017-09-13 10:20:25 -04:00
Connor Turland
a56991aede
add exception notifier for failed jobs
2017-09-13 10:18:00 -04:00
Connor Turland
672b456193
add markdown clarifications
2017-09-12 21:37:49 -04:00
Connor Turland
21518c8696
revert react router update and webpack config
2017-09-12 17:07:57 -04:00
Connor Turland
29bf2a23e8
review changes
2017-09-12 17:01:08 -04:00
Connor Turland
61eac509de
Merge branch 'develop' into feature/topic.follow
2017-09-10 18:16:11 -04:00
Connor Turland
4cc420eb63
eslint fixes
2017-09-10 18:13:25 -04:00
Connor Turland
ec3e09c578
topic card design changes
2017-09-10 17:17:56 -04:00
Devin Howard
3e03e0ebbf
update npm/gem dependencies ( #1131 )
...
* update npm/gem dependencies
* move to react prop-types package and fix jsdom usage
* fix sinon
* fix test support
* eslint?
2017-09-09 09:38:18 -07:00
Connor Turland
9ab7e7e170
topic card re-org
2017-09-08 16:58:17 -04:00
Connor Turland
5af2b8f216
add active scope to follows model
2017-09-08 13:42:56 -04:00
Connor Turland
8af66b1b2c
Merge pull request #1130 from metamaps/feature/release.notifs
...
make notifs and follows work for all users
2017-09-03 18:44:33 -04:00
Connor Turland
9b2193ad8c
show autofollow on client and mute on unfollow
2017-09-03 15:18:57 -04:00
Connor Turland
1a8c7810be
fix eslint issue picked up by codeclimate
2017-09-03 09:13:15 -04:00
Connor Turland
d87bb7c75c
make notifs and follows work for all users
2017-09-03 09:07:29 -04:00
Connor Turland
aceb3ff31e
Merge pull request #1129 from metamaps/feature/map.activity.improved
...
improve email styling for release
2017-09-03 08:33:13 -04:00
Connor Turland
f26c6cf0b7
Merge pull request #1128 from metamaps/feature/prevent.notif.fork
...
dont send notification for each topic of forked map
2017-09-03 08:29:03 -04:00
Connor Turland
42f4ecb37b
added bg color to sections
2017-09-03 08:27:05 -04:00
Connor Turland
64f4249f44
add comment
2017-09-02 14:12:07 -04:00
Connor Turland
958bd8c70c
improve email styling for release
2017-09-02 14:06:23 -04:00
Connor Turland
3830946723
dont send notif for each topic of forked map
2017-09-02 09:59:21 -04:00
Connor Turland
3482e799fd
Merge pull request #1127 from metamaps/update-docs
...
update docs
2017-07-26 09:26:59 -07:00
Connor Turland
e016b923a4
Update WindowsInstallation.md
2017-07-26 09:25:41 -07:00
Connor Turland
bb546779cd
Update VagrantInstallation.md
2017-07-26 09:24:51 -07:00
Connor Turland
3829d32390
Update UbuntuInstallation.md
2017-07-26 09:22:34 -07:00
Connor Turland
9783a5ee1e
Update MacInstallation.md
2017-07-26 09:22:06 -07:00
Connor Turland
12fc0c71f6
Update README.md
2017-07-26 09:21:16 -07:00
Connor Turland
c2cb8949eb
Create VagrantInstallation.md
2017-07-25 17:22:27 -07:00
Connor Turland
4e7bf02749
Update README.md
2017-07-25 17:19:17 -07:00
Connor Turland
3203c2b4d0
de-prioritize vagrant docs, as its no longer our setup of choice
2017-07-25 17:18:07 -07:00
Connor Turland
1ec9dc20e4
Update MacInstallation.md
2017-07-25 17:07:46 -07:00
Connor Turland
1af4728073
Update UbuntuInstallation.md
2017-07-25 17:06:27 -07:00
Connor Turland
785e16eeae
make Vagrantfile realtime server port match default
2017-07-25 16:57:37 -07:00
Connor Turland
d08cb3f95e
Update UbuntuInstallation.md
2017-07-25 16:52:11 -07:00
Connor Turland
271fc7ebd0
Update MacInstallation.md
2017-07-25 16:47:33 -07:00
Connor Turland
9d590295cb
Update WindowsInstallation.md
2017-07-25 16:44:40 -07:00
Connor Turland
dc4d44951e
Update UbuntuInstallation.md
2017-07-25 16:41:47 -07:00
Connor Turland
767414ad9f
Update MacInstallation.md
2017-07-25 16:37:16 -07:00
Connor Turland
1ec897b8c8
Update MacInstallation.md
2017-07-17 20:45:34 -07:00
Connor Turland
00e2aefb4e
Delete ISSUE_TEMPLATE.md
2017-07-16 20:50:14 -07:00
Connor Turland
aec0f104b8
Merge pull request #1121 from JohnGillanders/develop
...
Update README.md
2017-07-09 23:32:41 -07:00
John Gillanders
db6d2e77da
Merge pull request #1 from metamaps/develop
...
Updates from metamaps base 04/07/2017
2017-07-04 12:59:20 +12:00
John Gillanders
9585dce511
Update README.md
...
Added example of cloning repository using https:// protocol instead of SSH protocol - this is simpler to do since no set-up of SSH keys is required.
2017-07-04 12:49:28 +12:00
Devin Howard
78acd7e0b0
fix NoMethodError in mappings after_created when synapse's topic1/topic2 are nil
2017-05-20 10:58:06 -07:00
Devin Howard
328c1a14f3
mark v3.4.1 one commit too late
2017-05-13 19:32:51 -07:00
Devin Howard
10ac64c574
before destroy callback on maps to remove source_id foreign key relations ( #1119 )
2017-05-13 19:26:43 -07:00
Devin Howard
edce66c44d
new react tests with enzyme library ( #1116 )
...
* move ImportDialogBox into a folder
* install enzyme
* start testing InfoAndHelp component
* add star logic to tests
* switch ImportDialogBox to using enzyme but tests are still failing
* make `npm run test` work
* tests pass again
* eslint
* try to fix travis by adding react-addons-test-utils again
* eslintrc for test dir
* remove duplicated code
* fix
* try to suppress 2 warnings
2017-05-13 13:50:52 -04:00
Devin Howard
74df2559a4
try to fix fatal on notifications index when a topic is invalid ( #1115 )
...
* try to fix fatal on notifications index when a topic is invalid
* Update index.html.erb
2017-05-13 13:49:46 -04:00
Robert Best
a6694a3f72
Improvements to Import ( #1109 )
...
* Changed URL Regex to make more links importable, also removed need for special text formatting in order to paste or drop new topic labels. (Didn't break TSV import mode)
* Removed console logs
* add url regex with full documentation
* don't eslint 3rd party lib
* check for TSV only at start of string
* fix a bug with event/e and eslint
* handleTEXT => handleText
2017-04-11 11:51:22 -04:00
Devin Howard
8c7a657499
update vimeo url, use asset path + erb for poster path ( #1106 )
2017-03-26 13:53:59 -07:00
Connor Turland
90f77cd4f7
simplify views/topiccard ( #1102 )
...
* simplify views/topiccard
* Update Links.js
2017-03-22 19:22:38 -04:00
Connor Turland
af4dc869c0
devins right shouldnt push straight to develop
2017-03-22 17:04:18 +00:00
Connor Turland
2cae12e1ab
found a better way to handle junto chat panel
2017-03-22 16:35:28 +00:00
Connor Turland
49102ea474
only toggle if authorized
2017-03-22 16:13:59 +00:00
Connor Turland
f2a7cc1f19
stop using jquery ui for topic card dragging
2017-03-22 16:10:08 +00:00
Devin Howard
a5d5cd6000
fix editing synapse desc ( #1101 )
2017-03-20 19:32:54 -07:00
Devin Howard
391a1d8b24
link feedback directly to a hylo feedback tag ( #1099 )
2017-03-20 12:48:30 -07:00
Connor Turland
cc17c1ed38
add tiny divider between global and map items
2017-03-17 12:54:18 -04:00
Connor Turland
eee1febbf9
clean up unused vars and logs
2017-03-17 10:25:08 -04:00
Connor Turland
c8f6374ac8
remove no longer needed comments
2017-03-17 09:32:52 -04:00
Connor Turland
ed76162b63
added icons to mobile menu fixes #1095
2017-03-17 01:32:01 -04:00
Connor Turland
1eb4187691
broken import
2017-03-17 00:11:57 -04:00
Connor Turland
4a7dd54aca
remove unused vars
2017-03-17 00:48:28 +00:00
Connor Turland
efd6258c7e
mobile.js was already removed but not deleted
2017-03-17 00:29:24 +00:00
Connor Turland
f4d1b8ba35
ensure node is defined before calling function on it
2017-03-17 00:10:32 +00:00
Connor Turland
47a74dd77b
react-router and rebuild app structure in react ( #1091 )
...
* initial restructuring
* stuff
* lock version number
* just keep using current mapinfobox
* fix map upperRightUI layout
* make mapsWidth work and add mobile
* remove filterBoxOpen for now
* redo the mobile menu in react
* get account menu and invite lightbox working
* fixed maps scrolling
* make other routes work
* fix signed out home page
* fix accountbox toggling
* add metacode edit routes
* lots of fixes
* fix map chat layout and tab bug
* improve topic card readability and fix dragging bug
* fixup mapchat stuff
* fix up navigation to use react-router
* jquery no longer handling access requests
* handle case where user hasn't loaded yet
* this shouldn't have been removed
* add frame for topic view
* rewrite map instructions
* fix toast (and sign out bug)
* fix apps pages and missing routes
* made our request invite page look nice
* filter box in react
* forgot to add one proptype
* remove extra comments
* handle page title and mobile title updates
* reenable google analytics
* make filterbox use onclickoutside
* reenable topic view in react
* fix csrf auth token
* fix little homepage styling issue
* try putting preparevizdata in a timeout
* installing render log to count
* little fixes
* fixup filters
* make filter map function names more readable
* eslint helps
* renaming for clarity
* use onclickoutside for account/sign in box
* add some logging to see whether this is source of many renders
* turns out chatview was heavily hogging memory
* tiimeout not needed
2017-03-16 17:58:56 -04:00
Robert Best
33276444c7
[Feature] Expand current selection to include neighbors by pressing CTRL+SHIFT+UP ( #1090 )
...
* Expand current selection to include neighbors by pressing CTRL+SHIFT+UP
* minor fixes as requested
2017-03-10 15:22:30 -08:00
Devin Howard
1124d76475
re-enable codeclimate duplication
2017-03-10 08:30:01 -08:00
Connor Turland
4ffa9460f5
bug fix for people who aren't testers on settings page
2017-03-10 11:29:00 -05:00
Connor Turland
44753dbfe1
Merge branch 'develop'
2017-03-09 14:55:59 -05:00
Connor Turland
77f76b1b5a
variable name fix and make is_tester method global for reuse in views
2017-03-09 14:36:24 -05:00
Devin Howard
e544d6a6db
refactor api and fix bugs ( #1088 )
...
* fix weird double-embed issue
* fix users/current api if not logged in
* turbocharge the api
* fix docs
2017-03-09 14:24:52 -05:00
Devin Howard
780e66632b
fix react embedly ( #1089 )
2017-03-09 14:23:24 -05:00
Connor Turland
de4f51bb5c
fix permissions and don't send if has map open
2017-03-08 15:45:40 -05:00
Connor Turland
5d0da4c5f1
method was preventing certain follows from succeeding
2017-03-08 15:02:22 -05:00
Connor Turland
9079d1bffc
check permissions prior to sending
2017-03-08 15:01:58 -05:00
Connor Turland
962881a35d
Update follow_service.rb
2017-03-08 14:13:47 -05:00
Connor Turland
8483b62603
allow users to select follow settings
2017-03-08 18:50:56 +00:00
Devin Howard
e3b4dac1e1
remove takeScreenshot button in favour of separate buttons in the map card and import/export dialogue ( #1086 )
2017-03-07 12:15:28 -05:00
Connor Turland
8998e3858c
fixes bug where popups are happening
2017-03-07 16:55:15 +00:00
Devin Howard
ce51eeca8c
remove dedupe plugin
2017-03-07 07:54:25 -08:00
Connor Turland
3178f6e650
bump version number
2017-03-07 03:58:29 +00: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
b740fef8fe
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:42:22 -05:00
Connor Turland
55b031ccb7
add topic following for internal testing
2017-03-07 01:47:10 +00:00
Devin Howard
9df389060e
temporarily disable code climate duplication engine
2017-03-06 09:29:36 -08:00
Robert Best
153cc38d1a
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
2017-03-06 11:48:59 -05:00
Devin Howard
4ff9619837
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
2017-03-06 02:29:12 +08:00
Devin Howard
a6c1c0c730
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
2017-03-04 11:51:51 -05:00
Connor Turland
529dec09a3
don't commit activity service
2017-03-02 04:38:33 +00:00
Connor Turland
ddbaac513f
fix drop from two touches to one
2017-03-02 04:35:13 +00:00
Connor Turland
ba943b20f1
hellz yeah ( #1074 )
2017-02-27 17:06:56 -05:00
Connor Turland
4deb3f5ab9
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
2017-02-26 11:42:47 -05:00
Devin Howard
47d0faadf2
prevent double prompt on file drop import
2017-02-25 13:04:00 -08:00
Devin Howard
9800cc27c6
even better import csv regexes
2017-02-25 12:15:45 -08:00
Devin Howard
7840e09e5f
topicsRegex and synapsesRegex should allow commas ( #1073 )
2017-02-25 12:05:56 -08:00
ben, bro
687b957737
Update _cheatsheet.html.erb
...
Clean up text, clarify, and bring in line with current functionality
2017-02-23 22:03:33 -08:00
Connor Turland
9ce989eba5
add unfollow_from_email to the policies
2017-02-16 14:01:22 +00:00
Connor Turland
2c85590d65
fixup templates
2017-02-16 13:55:19 +00:00
Connor Turland
2b34d84715
include ability to unfollow from email
2017-02-16 13:42:35 +00:00
Connor Turland
013e3c7f21
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
2017-02-15 23:01:53 -05:00
Devin Howard
8d771543d8
Merge branch 'fix/rspec' into develop
2017-02-12 15:29:40 -08:00
Devin Howard
50639e8a0a
Merge branch 'develop'
2017-02-12 15:11:19 -08:00
Devin Howard
9d52aa9c74
tag v3.3
2017-02-12 15:09:08 -08:00
Devin Howard
545706e17a
disable cookie based auth on the API - mostly ( #1070 )
2017-02-12 12:54:54 -05:00
Devin Howard
95901e17e8
fix travis ( #1071 )
...
* fix topic spec
* fix synapse/mapping spec
* brakeman csrf warning suppressed :|
2017-02-12 12:53:04 -05:00
Devin Howard
9dbbdf1150
brakeman csrf warning suppressed :|
2017-02-11 20:00:42 -08:00
Devin Howard
4ee4aeaad2
fix synapse/mapping spec
2017-02-11 19:56:07 -08:00
Devin Howard
bfdce21a66
fix topic spec
2017-02-11 19:54:09 -08:00
Devin Howard
53d4beddec
move hr tag in notification emails
2017-02-11 19:35:23 -08:00
Devin Howard
d455ced683
send mail by default is false in message from devs. also fixes a bug where the option didn't do anything
2017-02-11 19:30:58 -08:00
Connor Turland
d8698ef6f2
api stuffs ( #1069 )
...
* Update restful_controller.rb
* Update tokens_controller.rb
* /tokens/new form
* thats all
2017-02-11 19:29:03 -05:00
Connor Turland
1374da35da
Update notification_service.rb
2017-02-11 15:29:31 -05:00
Connor Turland
2d0d0403b1
little fixes for deploy
2017-02-11 19:50:59 +00:00
Connor Turland
2d50f24be6
var misnamed
2017-02-11 14:21:47 +00:00
Connor Turland
876c61a18e
Better experience of notifications. ( #1066 )
...
* all the good changes
* follows
* dont send duplicates
* remove follow_type for now
* dont add all the extra stuff we're not implementing yet
* refactor
* lots of fixes
* notifications improvements
* bad merge
2017-02-11 09:06:01 -05:00
Connor Turland
b0deafc53e
Follows and some new notifications ( #1063 )
...
* all the good changes
* follows
* dont send duplicates
* remove follow_type for now
* dont add all the extra stuff we're not implementing yet
* refactor
* lots of fixes
* Delete activity.html.erb
* Delete activity.text.erb
* Update 20170209215819_create_follows.rb
* Update schema.rb
* Update mapping.rb
* Update mailboxer.rb
2017-02-11 00:20:42 -05:00
Connor Turland
a647d80efa
third try to fix this little bug
2017-02-10 12:02:05 -05:00
Connor Turland
559ad230ce
actually this fixes it
2017-02-10 11:52:58 -05:00
Connor Turland
26dfcbf823
edge case where realtime server is passing empty object
2017-02-10 11:45:05 -05:00
Connor Turland
915defcd1b
little fixes
2017-02-10 00:32:15 +00:00
Connor Turland
dde097ea75
all the good changes ( #1065 )
2017-02-09 16:53:19 -05:00
Devin Howard
3706cd83e7
helper function and notification setup for messages from the devs to be sent to all users ( #1064 )
...
* message from devs notification type
* helper function for messages from devs
* don't use find_by_email
* temporary fix
2017-02-09 10:37:35 -05:00
Connor Turland
575a3ec8bf
Rename user_not_present_on_map.rB to user_not_present_on_map.rb
2017-02-05 22:09:51 -05:00
Connor Turland
b2bf9978aa
Update ISSUE_TEMPLATE.md
2017-02-05 14:34:47 -05:00
Connor Turland
0441850504
Secret.convo ( #1059 )
...
* set up for using secret css/js
* testing
* add stuff
* final tweak for secret convos
* looks like its all working
* realized this change is just good all around
* minor touch ups
* only us for now
* no longer validate presence of xloc/yloc
* fix syntax issue
2017-02-05 14:30:23 -05:00
Connor Turland
3ae4072b5d
add ability to keep metacode focus
2017-02-05 06:28:10 +00:00
Robert Best
00ecb0f6bb
Make DEL key delete selected items (With confirmation still :P ) ( #1058 )
...
* add del key
* made DEL key into delete shortcut
2017-02-03 14:23:04 -05:00
Devin Howard
45a15da896
fix error in loading url titles
2017-02-01 12:37:50 -05:00
Devin Howard
a96c8ae75c
fix bug
2017-01-31 23:44:10 -05:00
Devin Howard
a137c21d2d
searchfields api parameter ( #1054 )
2017-01-28 16:53:54 -05:00
Connor Turland
952cf4e79f
keep permission of topic/synapse in sync with map its deferring to from beginning ( #1053 )
...
* Update topic.rb
* Update synapse.rb
2017-01-28 16:40:41 -05:00
Devin Howard
53bc4ee1c8
fix mapper page ( #1050 )
2017-01-28 15:44:38 -05:00
Connor Turland
c60f7f4525
add Story, which is on metamaps, total is now 48
2017-01-28 01:04:23 -05:00
Connor Turland
8df2cd8732
fix metacode names
2017-01-28 01:01:20 -05:00
Devin Howard
2c6da79df3
redirect /explore to / ( #1051 )
2017-01-27 15:16:31 -05:00
Connor Turland
6e913efbae
track pageloads with google analytics. fixes #1012 ( #1048 )
...
* track pageloads with google analytics. fixes #1012
* Update Router.js
2017-01-25 20:57:34 -08:00
Connor Turland
db81962c91
some c9 files to gitignore
2017-01-26 00:24:31 +00:00
Connor Turland
8330ef9679
treat cable sub/unsub as joined/left map. fixes #1035 ( #1047 )
2017-01-25 15:32:13 -08:00
Devin Howard
696ff396b0
file attachments in db (re: #124 ) ( #1043 )
...
* file attachments in db
* rubocop
* factor out a bunch of file types
* thumb and medium image styles"
* syntax error in concern
* markdown is also plaintext
* rubocop
2017-01-24 15:10:40 -05:00
Devin Howard
b16617286f
revert back to jquery 1 to fix best in place
2017-01-23 19:50:59 -05:00
Devin Howard
fee011bba6
fix readme bullets
2017-01-23 19:37:50 -05:00
Devin Howard
d16709e8e7
fix codeclimate style issues ( #1046 )
...
* bunch of code climate fixes
* more
2017-01-23 19:30:13 -05:00
Devin Howard
0ad10c0f5a
fix style of thumb button on map card ( #1044 )
2017-01-23 14:02:14 -05:00
Devin Howard
d11278b63b
map rdf export ( fixes #1015 ) ( #1036 )
...
* simple rdf export of maps
* register ttl mime type
* owl
* mm
* fix up export service
* implement base url thing whoo
* add more rdf fields
* fix rdf syntax errors
* hide unused fields in rdf
* some code climate fixes
* update ontology a bit more
* syntax fix
* typo
2017-01-22 16:42:04 -05:00
Devin Howard
2652d53e9b
update ruby dependencies too ( #1042 )
...
* update rubygem dependencies
* update backbone
* brakeman fix
* brakeman
* ugh syntax fix
2017-01-22 16:41:51 -05:00
Devin Howard
dc8d274487
whoops, I guess we do need jquery in package.json
2017-01-22 14:07:04 -05:00
Devin Howard
2fd972ddce
ajax queue ( fixes #853 ) ( #1037 )
...
* jquery.ajaxq
* install jquery.ajaxq from npm
* patch ajaxq into Backbone code
* use ajaxq library with more github stars
* eslint
2017-01-22 13:50:34 -05:00
Devin Howard
bba8231e8c
update npm dependencies ( #1038 )
...
* only one github dependency left
* update npm deps
* exact versions of npm deps
2017-01-21 15:37:14 -05:00
Devin Howard
1229e92feb
fix bug in Debug.js
2017-01-21 13:34:39 -05:00
Devin Howard
ba3d5f07dd
try to fix metamaps.debug
2017-01-21 13:09:26 -05:00
Devin Howard
d47d7e50e7
mark v3.2 on develop
2017-01-21 13:04:28 -05:00
Devin Howard
af2c6ebef1
split screenshot function/button into two parts ( #1027 )
...
* split screenshot function into 4 separate helpers
* screenshot download button in import dialog box
* thumbnail button inside map info box
* import blue button styling
* fight with styling to make the button at least appear
* add more text
* fix tooltip display
* automatically start downloading the screenshot
* eslint
* revamp GlobalUI.notifyUser
* fix object destructuring syntax
* fix
2017-01-19 14:50:08 -05:00
Devin Howard
a9f19815e4
fix api embed to use the correct serializers ( fix #998 ) ( #1029 )
...
* use correct serializer for singular embeds in api (almost fixes #998 )
* fix has_many api embeds too!
* unused arg
2017-01-19 14:49:40 -05:00
Devin Howard
460de840b6
redis server
2017-01-18 16:38:34 -05:00
Devin Howard
36ed85312e
fix crontab
2017-01-18 16:29:52 -05:00
Devin Howard
991c4cabdb
move node installation further up
2017-01-18 13:40:48 -05:00
Devin Howard
38004c1f1f
fix npm install isntructions
2017-01-18 13:34:32 -05:00
Devin Howard
cd796f3ade
gist for unicode error on db:setup
2017-01-18 13:25:50 -05:00
Devin Howard
c57015cb15
rvm install needs sudo
2017-01-18 13:16:33 -05:00
Devin Howard
9223295320
add node source
2017-01-18 13:14:39 -05:00
Devin Howard
b4bffbe427
database called metamaps, not metamap002 in example
2017-01-18 13:10:09 -05:00
Devin Howard
6296df1102
need postgres dev headers
2017-01-18 13:09:47 -05:00
Devin Howard
2e0acfc170
update docs
2017-01-18 12:04:40 -05:00
Devin Howard
99b21be27b
tag v3.2
2017-01-16 14:18:49 -05:00
Devin Howard
2c60d7335c
Merge branch 'develop' (v3.2)
2017-01-16 11:21:02 -05:00
Connor Turland
6f6e5bea06
Update README.md
2017-01-15 20:23:18 -05:00
Connor Turland
6f0d391aaa
Update ISSUE_TEMPLATE.md
2017-01-15 20:17:30 -05:00
Connor Turland
b1a64c6e7a
Update ISSUE_TEMPLATE.md
2017-01-15 20:16:53 -05:00
Connor Turland
59b3d254dd
include new info zones
2017-01-14 01:35:48 -05:00
Devin Howard
f3539f54bf
hotfix ugh
2017-01-11 23:36:30 -05:00
Devin Howard
75ccfb0ab3
hotfix map title in meta tags whoops
2017-01-11 23:32:13 -05:00
Devin Howard
7b5bd53c28
I think this will fix the meta tags ( #1030 )
2017-01-11 23:27:05 -05:00
Connor Turland
5302f03196
remove exclamation mark
2017-01-11 23:00:19 -05:00
Devin Howard
536c458981
add code climate to the readme
2017-01-11 22:42:32 -05:00
Devin Howard
f64612f99b
add meta tags to maps ( #1028 )
2017-01-11 22:26:45 -05:00
Connor Turland
cbc38e0c93
emoji-mart styling fix
2017-01-11 14:02:11 -05:00
Devin Howard
42d671c05b
stop replacing shortcodes/emoticon in the live NewMessage textarea ( #1026 )
2017-01-11 13:56:44 -05:00
Devin Howard
08109ee5de
remove instructions from ImportDialogBox ( #1022 )
...
* remove instructions from ImportDialogBox
* link back to docs.metamaps.cc for import instructions
2017-01-11 13:50:37 -05:00
Connor Turland
0952c0f3c9
Bug/name.overflow ( #1025 )
...
* creator name was pushing 'view only' off card
* Update MapCard.js
2017-01-11 13:36:07 -05:00
Devin Howard
25b4d388de
eslint commands and apply some style fixes ( #1021 )
...
* auto eslint and add commands for eslint
* eslint the entire frontend folder
2017-01-11 12:52:34 -05:00
Devin Howard
8b738f3d28
emoticons turned on by default
2017-01-10 22:05:04 -05:00
Devin Howard
da94cd0c8b
systemd job in deploy docs
2017-01-10 18:00:46 -05:00
Devin Howard
e9e6b1dc09
tweak chat emoji ( #1019 )
2017-01-09 14:55:21 -05:00
Connor Turland
e84dfbaa33
fix message styling
2017-01-09 13:27:39 -05:00
Devin Howard
cb95e027c4
Add emoji to chat ( #1013 )
...
* add emoji picker unstyled
* rename junto.css.erb => junto.scss.erb
* junto scss-ified
* add emoji mart css
* emoji are replaced in the text area
* remove unicode emoji from messages before sending to db
* add emoji back into messages on display
* bigger font size on chat messages
* tweak styling
* codeclimate (eslint)
2017-01-09 13:14:20 -05:00
Connor Turland
8e50efb3c1
render messages nicer
2017-01-04 18:12:07 -05:00
Connor Turland
5ab5f6fec2
Update README.md
2017-01-04 17:17:53 -05:00
Devin Howard
cbf1ec3afb
fix missing npm github dep ( #1011 )
2017-01-04 12:34:08 -05:00
Connor Turland
d3315d962d
only render google analytics if a tracking code envvar is set
2017-01-04 12:08:12 -05:00
Connor Turland
ae05fb35d3
more config updates for heroku
2017-01-04 11:14:03 -05:00
Connor Turland
9e6ce90950
update config for heroku and prod
2017-01-04 11:08:32 -05:00
Connor Turland
3868910dde
Stream map related events from rails server via actioncable instead of nodejs ( #1010 )
...
* actioncable needs puma not webrick
* add framework
* remove the old way
* send events from server to client
* get all events working
* clean up receivable
* map is polymorphic on message
* add the moved event
* make todo comments clear
* verify before streaming from map channel
* rubocop fixes
* wasn't set up correctly for nodejs realtime
2017-01-03 16:12:58 -05:00
Connor Turland
5c1261892f
remove the one pixel gap between search input and icon
2016-12-26 21:03:22 -05:00
Connor Turland
9ada1ca935
remove exclamation mark
2016-12-26 17:19:56 -05:00
Connor Turland
df5cc4e1a8
remove exclamation mark
2016-12-26 17:15:42 -05:00
Connor Turland
ce073028c8
remove exclamation mark
2016-12-26 17:13:42 -05:00
Connor Turland
7d869d7b63
remove exclamation mark
2016-12-26 17:10:41 -05:00
Connor Turland
73e8f2d4c8
re-implement chat in react ( #997 )
...
* hidously mangle ChatView to start moving it to React
* fix up Realtime/index.js - should be good now?
* in theory this should compile
* ok the MapChat renders using react...
* move Handlers code into react - woot
* try reintegrating backbone
* fix wrapper styling
* chat box opens and closes properly
* make the unread count work
* organize more sanely
* refactor some of the ChatView functions
* removed management of chatview from room
* css can stop handling logic right about now
* makin things work
* don't need room here anymore
* set raw html in message
* make pending work
* removeParticipant when mapper left was broken
* re-enable scrolling, focus, and blur
2016-12-21 03:56:29 -05:00
Connor Turland
68f0e91259
track forks ( #994 )
...
* track forks
* update api and docs
* fix tests
2016-12-18 16:17:51 -05:00
Devin Howard
b07941834c
v3.1 in initializers
2016-12-16 17:22:48 -05:00
Devin Howard
b914065bb3
Merge branch 'develop'; tag v3.1
2016-12-16 17:17:24 -05:00
Devin Howard
33fc27ffd1
Merge pull request #989 from metamaps/fix/travis
...
fix travis
2016-12-16 17:16:32 -05:00
Devin Howard
7ca7f0862f
fix mapping spec
2016-12-16 17:09:23 -05:00
Devin Howard
c604e69d77
enable postgresql 9.4 in travis
2016-12-16 17:09:23 -05:00
Connor Turland
fb12c7e202
Track everything we need to reconstruct maps ( #984 )
...
* feature/more.events
* keep mapping.user as the creator
* cleanup cruft and include slack notifs
* capture topic and synapse updates, store the old values
* avoid the mapping gets deleted problem
* include an indicator of which values changed
* style cleanup
* remove the hack in favor of a legit way
* updated schema file
2016-12-16 16:51:52 -05:00
Devin Howard
9ab1c9c647
Merge pull request #932 from metamaps/feature/mailboxer
...
mailboxer notification centre
2016-12-16 16:41:37 -05:00
Connor Turland
28d960459e
styling of notifs list
2016-12-16 16:25:14 -05:00
Connor Turland
ef84209de1
make it look better when its taking up the full screen width
2016-12-16 16:25:13 -05:00
Connor Turland
2d920cf66a
add maps links to nav locations
2016-12-16 16:25:13 -05:00
Connor Turland
40a97a5ae9
these are output in the main layout file
2016-12-16 16:25:13 -05:00
Devin Howard
186129807e
fix spec, bugs, style
2016-12-16 16:25:08 -05:00
Connor Turland
87228c27c1
Fix mailboxer + email bugs
2016-12-16 16:24:24 -05:00
Connor Turland
6d8392d2e7
Make mailboxer look good and update email templates
2016-12-16 16:24:01 -05:00
Devin Howard
0960159265
Mailboxer notification pagination
2016-12-16 16:23:49 -05:00
Devin Howard
88e98c7342
polish mailboxer with bug fixes
2016-12-16 16:23:32 -05:00
Devin Howard
3f6f020ce1
grant/deny buttons mark access request notifications as read
2016-12-16 16:23:30 -05:00
Devin Howard
8e958ec9a8
invite to edit notifications marked as read in system once map is visited
2016-12-16 16:23:30 -05:00
Devin Howard
9debcdde39
Integrate rails mailers with mailboxer
2016-12-16 16:23:17 -05:00
Robert Best
b4ad51e69d
reactify notification icon
2016-12-16 16:21:40 -05:00
Devin Howard
9b95e91f1a
more style tweaks + brakeman fix
2016-12-16 16:21:23 -05:00
Connor Turland
c46e85529e
little style tweaks to css and content
2016-12-16 16:21:01 -05:00
Devin Howard
85408a14d3
Initial notification centre using mailboxer
2016-12-16 16:20:53 -05:00
Connor Turland
3b8a5d0c2e
Update message_policy.rb ( #973 )
2016-12-14 13:23:40 -05:00
Robert Best
6f88c2a7eb
Update ISSUE_TEMPLATE.md
2016-12-12 13:49:26 -05:00
Robert Best
f1e62fb6c1
Update ISSUE_TEMPLATE.md
...
changed multiplication symbol so that double-clicking number placeholders works again.
2016-12-12 13:47:00 -05:00
Robert Best
0c52188014
Update ISSUE_TEMPLATE.md
...
reduced whitespace
2016-12-12 13:30:56 -05:00
Robert Best
7c0e0f731f
Update ISSUE_TEMPLATE.md
...
changed multiplication sign from asterisks to x, because markdown treats asterisks as special.
2016-12-12 11:35:59 -05:00
Devin Howard
1ba339b3be
subset of synapse creation changes ( #970 )
...
* esc cancels topic and synapse creation now
* close topic/synapse creation on right click
* backspace and delete don't close synapse creation anymore
* hitting tab saves the synapse you're creating
2016-12-11 17:15:09 -05:00
Devin Howard
6129a27ecf
hit Ctrl+A a second time to select all synapses, too ( #968 )
2016-12-11 16:21:36 -05:00
Devin Howard
d51e3f3b52
update npm deps, EXCEPT socket.io and backbone ( #950 )
...
* update npm dependencies (with some exceptions)
* update autolinker, remove underscore
2016-12-11 16:09:12 -05:00
Robert Best
1317186f63
Update ISSUE_TEMPLATE.md
...
changed all place-holders to underscores, they ae easier to double-click so as to select/replace.
2016-12-09 13:40:58 -05:00
Robert Best
d6527ea80e
Create ISSUE_TEMPLATE.md
2016-12-09 12:20:30 -05:00
Connor Turland
a133702be2
Some topics and synapses were hidden from users erroneously ( #944 )
...
* ensure topics and synapses have their permission match the map they're deferring to
* update permission of topics and synapses as map perm changes, when defer_to_map
* try enabling count threshold on rubocop
* remove unused mk_permission functions
* change *_count methods to use delegate to save lines in map.rb model
* rubocop topic.rb
2016-12-06 16:46:46 -05:00
Devin Howard
d2074ada79
fix policy scope errors in search controller ( #947 )
2016-12-06 13:09:42 -05:00
Devin Howard
00286fcc29
tag v3.0.4
2016-12-06 12:38:06 -05:00
Devin Howard
01cd624bfa
add polyfill so chrome 49 can upload map thumbnail screenshots ( #946 )
2016-12-06 12:36:06 -05:00
Connor Turland
a5f793fe54
fixup topic card template
2016-12-02 21:21:37 +00:00
Devin Howard
d1aa62d382
fix policy scope error ( #941 )
2016-11-30 11:46:09 -05:00
Devin Howard
3f161c1076
make topic titles have width of 25 chars ( #933 )
2016-11-29 11:00:14 -05:00
Devin Howard
4da3a9d55f
hide mobile menu if browser is resized to full size ( #937 )
2016-11-28 13:53:29 -05:00
Devin Howard
90c5bc26fc
Active.Mapper was being initialized twice, causing errors ( #934 )
2016-11-27 21:12:05 -05:00
Devin Howard
5d8ff3efce
realtime shouldn't poll forever if the dev server isn't up ( #931 )
2016-11-24 14:40:14 -05:00
Devin Howard
95b8b52224
fix NoMethodError in topics#autocomplete_topic ( #930 )
2016-11-24 14:16:58 -05:00
Devin Howard
55853c60f4
update user model with fixes, including style and recentMetacodes algorithm ( #922 )
2016-11-13 14:29:07 -08:00
Devin Howard
5b90c38b22
Merge pull request #902 from metamaps/fix/schema
...
fix db schema
2016-11-13 14:24:31 -08:00
Devin Howard
c03d6dd5f6
remove in_trash from schema to match production
2016-11-13 17:21:42 -05:00
Devin Howard
51d5d77629
Merge pull request #929 from metamaps/fix/develop-bugs
...
fix some develop bugs, merge master, and move realtime port to .env
2016-11-09 21:14:48 -05:00
Devin Howard
ce2d462578
fix bugs on develop branch
2016-11-09 20:44:00 -05:00
Devin Howard
4533a0f2fe
merge changes from metamapscc instance branch ( #913 )
...
* homepage video fallback
* public/50x.html
* remove blog from public/ html pages
* remove video file since it's on metamaps.cc server
* eslint
2016-11-09 09:34:10 -05:00
Devin Howard
5851d57eef
Merge branch 'master' into develop
2016-11-09 09:29:30 -05:00
Connor Turland
e1441acde0
synapse wasn't updating calculated_permission
2016-11-08 19:50:08 +00:00
Connor Turland
d1f75c8c24
oops! don't change rt server port
2016-11-08 19:45:51 +00:00
Connor Turland
83b58d43d5
only remove user once they've left all maps
2016-11-08 19:42:48 +00:00
Devin Howard
3759851621
fix access#access route ( #926 )
2016-11-08 09:37:06 -08:00
Devin Howard
a176cdf231
eslint frontend folder ( #923 )
2016-11-07 15:25:08 -05:00
Devin Howard
9df974a037
strip whitespace from search terms ( #919 )
2016-11-07 14:58:53 -05:00
Devin Howard
bd4072f81c
Merge pull request #707 from metamaps/feature/split-out-backbone
...
finish removing global Metamaps references from frontend code
2016-11-07 14:58:20 -05:00
Devin Howard
6a2646c9cd
fix mailer specs ( #921 )
2016-11-07 14:56:35 -05:00
Devin Howard
2f4fe525ce
Fix a bunch of errors and style issues
2016-11-07 14:55:20 -05:00
Devin Howard
518782e1c7
remove Metamaps.Erb
2016-11-07 14:55:20 -05:00
Devin Howard
7c9b6a2205
try to move all rails data into Metamaps.ServerData
...
Metamaps.Erb and currentPage and currentSection are still not in; should they be?
2016-11-07 14:55:20 -05:00
Devin Howard
8026969799
start storing data in ServerData
2016-11-07 14:55:17 -05:00
Devin Howard
4b500a4428
move Metamaps.Loading into node modules
2016-11-07 14:40:43 -05:00
Devin Howard
0778179ba7
eslint
2016-11-07 14:40:43 -05:00
Devin Howard
bfd23c6d32
split Backbone.js into a bunch of different files. Still more work to do to modularize it
2016-11-07 14:40:43 -05:00
Devin Howard
9cb3074245
rename Metamaps.Backbone to Metamaps.DataModel
2016-11-07 14:40:43 -05:00
Devin Howard
e4d193572f
fix mailer specs
2016-11-07 14:40:25 -05:00
Connor Turland
0f85abfda2
add channel to webhooks ( #915 )
2016-11-05 09:34:50 -07:00
Connor Turland
887c3f7570
fixes #903 and #831 ( #911 )
2016-11-04 15:02:56 -07:00
Connor Turland
667f5653a7
topic descriptions from old data can be nil
2016-11-04 21:03:11 +00:00
Connor Turland
48b93b2269
change grant to allow. fixes #909 ( #910 )
2016-11-04 13:22:06 -07:00
Connor Turland
9ad4684825
firefox needs e.pageX not e.x ( #906 )
2016-11-02 19:20:06 -07:00
Devin Howard
f516e1e73d
fix up deploy docs
2016-11-01 16:31:36 +08:00
Devin Howard
2588636837
tag v3.0.1 - bugfixes for 3.0
2016-11-01 16:06:05 +08:00
Devin Howard
644df6fcdc
fix pasting urls ( #901 )
2016-11-01 16:01:34 +08:00
Devin Howard
c10a4f4837
fix exception notification backtrace ( #898 )
2016-11-01 10:05:45 +08:00
Devin Howard
304722b528
fix api docs ( #897 )
...
* fix api docs
* more rake => rails
2016-11-01 09:52:10 +08:00
Devin Howard
a9c67e70d4
move webhook and event serializers back ( #899 )
2016-11-01 09:46:44 +08:00
Connor Turland
ed3e4780d2
bug when topic was in more than 5 maps fixes #891 ( #894 )
2016-10-31 17:10:44 -04:00
Connor Turland
b013499c76
misnamed variable errors out maps search ( #893 )
2016-10-31 16:41:37 -04:00
Devin Howard
5270c5a611
Merge branch 'develop' for v3.0
2016-10-31 19:51:02 +08:00
Devin Howard
5cfa8ffdc7
bump version to 3.0
2016-10-31 19:48:07 +08:00
Devin Howard
814c1acc0f
a few markdown style updates ( #885 )
...
* markdown block padding
* a few more markdown style updates
2016-10-31 15:38:16 +08:00
Devin Howard
62e2acdd52
add about lightbox again ( #884 )
...
* add about lightbox again
* fix about lightbox style
2016-10-31 15:38:09 +08:00
Connor Turland
151e96f803
Metamaps.Realtime.synapseRemoved is not a function ( #880 )
2016-10-29 12:10:13 -04:00
Devin Howard
bc1f212c93
fix tab/shift-tab for metacode selection ( #879 )
2016-10-30 00:08:51 +08:00
Devin Howard
b9190233b1
enable sucker punch for heroku ( #878 )
2016-10-29 23:38:17 +08:00
Devin Howard
5e0e44b436
supercharge the schemas ( #874 )
...
* fix map schema - woot it works
* update other schemas to include embeddable attrs
* update current user schema/examples
2016-10-29 22:58:31 +08:00
Devin Howard
1fbfd56d57
filter maps by user_id in api ( #872 )
...
* filter maps by user_id in api
* test user_id map filter
* update starred maps example to make starred true lol
* add user id to map schema/examples
2016-10-29 22:07:27 +08:00
Devin Howard
a32f98bde2
to_json should be as_json or there's bugs ( #870 )
...
* to_json should be as_json or there's bugs
* revert explore controller, it's better without
* revert search controller and some topic methods
2016-10-29 18:28:29 +08:00
Connor Turland
6cc827d11c
wasn't updating calculated_permission when updating permission ( #869 )
2016-10-28 18:26:40 -04:00
Devin Howard
de16420796
fix logCanvasAttributes error ( #863 )
2016-10-28 15:20:39 +08:00
Devin Howard
e49e5c258a
make synapse permissions depend on topic1 and topic2 ( #839 )
...
* deep change to synapse policy - is this ok?
* make synapse policy resilient to nil topic1/topic2/map
* use a transaction to handle authorization vs invalid record in synapse controller
* more synapse controller tests
* inline documentation
* fix policy(Synapse).create?
2016-10-28 11:03:59 +08:00
Devin Howard
4dc32d7d2e
fix metacodes page scrolling ( #862 )
...
* fix metacodes page scrolling
use scheme from
http://brandonhilkert.com/blog/page-specific-javascript-in-rails/
* switch overflow:hidden to be on explicit controllers
2016-10-28 10:55:04 +08:00
Devin Howard
9d821c920b
reorder API authentication precedence to be: token, oauth, cookie ( #860 )
...
* reorder authentication to be: token, then oauth, then cookie
* all APIs but tokens are accessible anonymously (so add mappings to the list)
* fix mapping order
2016-10-28 10:51:58 +08:00
Devin Howard
6b1220b533
overflow-y: hidden on body to prevent openLightbox from showing a scrollbar ( #859 )
2016-10-27 18:40:42 -04:00
Devin Howard
4f3d12d7a5
fix import promises ( #858 )
2016-10-27 14:03:18 +08:00
Devin Howard
7b4a072fd8
attempt to fix import problems ( #852 )
2016-10-26 20:34:22 +08:00
Devin Howard
175a3ee73e
policy_scope on has_many relationships in serializers ( #840 )
...
* token overrides current user in api
* policy scope has_many relationships
* fix hard coded topics - whoops
* handle policy_scope returning nil in application serializer
2016-10-26 19:56:30 +08:00
Devin Howard
b13587456d
fix coordsToPixels calls even more
2016-10-26 19:11:40 +08:00
Devin Howard
f023a18069
fix pixel stuff for real? ( #851 )
...
* fix getPastelColor function (I think)
* fix pixelsToCoords and coordsToPixels function calls
* update signature of coord/pixel functions in Util.spec.js
2016-10-26 19:04:00 +08:00
Devin Howard
e640048386
fix topic card title word break css ( #844 )
2016-10-26 17:01:05 +08:00
Devin Howard
98725b3ee4
fix getPastelColor function (I think) ( #850 )
...
* fix getPastelColor function (I think)
* fix pixelsToCoords and coordsToPixels function calls
* update signature of coord/pixel functions in Util.spec.js
2016-10-26 14:26:48 +08:00
Devin Howard
8a95262f2c
allow anonymous users to GET api routes ( #842 )
...
* make map methods use ActiveRecord relations so they don't error on pundit
* test for logged out maps GET api
* open up GET routes on maps/topics/synapses and update api docs
2016-10-26 08:37:23 +08:00
Robert Best
ed89f80f49
Update README.md
...
some small tweaks to grammar and word choice
2016-10-25 14:24:10 -04:00
Devin Howard
47bca5907e
add tests for Metamaps.Util ( #825 )
...
* decouple Util from other Metamaps modules
* first few Util tests
* more Util tests
* remove dead code
* eslint
2016-10-25 12:28:51 +08:00
Devin Howard
5163794698
anonymous users are nil, so need to remove the raise
( #841 )
2016-10-25 12:26:22 +08:00
Robert Best
0b6348e13f
This fix closes the topic creation spinner when the map is panned. (Since, sometimes a click turns into a really small pan) ( #828 )
2016-10-24 11:48:34 -04:00
Connor Turland
ce1205f6d7
one more mapper card style fix
2016-10-24 14:35:23 +00:00
Connor Turland
96d25cc91d
mapper profile mobile styling
2016-10-24 14:23:05 +00:00
Connor Turland
a9ef6feebd
mapper page bug fix and styling
2016-10-24 13:42:26 +00:00
Connor Turland
98e2de68da
oooh was using ineffective media queries for desktop
2016-10-23 16:49:16 -04:00
Connor Turland
4c68fd90ca
set useful num for desc truncation on map cards
2016-10-23 16:30:54 -04:00
Connor Turland
cda0c21a0b
make it responsive ( #820 )
2016-10-23 16:12:07 -04:00
Connor Turland
a44edbb17e
better transition from map to explore
2016-10-23 11:44:20 -04:00
Connor Turland
aa96d074af
dont show import on topic page
2016-10-23 11:21:38 -04:00
Connor Turland
4f9b9460ad
don't block all right clicks
2016-10-23 11:12:43 -04:00
Devin Howard
a63cd02bc6
fix develop branch bug
2016-10-23 22:51:16 +08:00
Devin Howard
fb6c8a74a7
scoping on topic json properties ( #813 )
2016-10-23 22:11:38 +08:00
Devin Howard
5db8e27496
make metacode selector reliable after switching metacode sets ( #816 )
2016-10-23 22:11:26 +08:00
Devin Howard
87dc20fa50
stop showing map info box on topic view ( #815 )
2016-10-23 22:07:38 +08:00
Devin Howard
154257d062
fix Ctrl+A ( #814 )
2016-10-23 18:02:59 +08:00
Connor Turland
497c6ae017
spelling mistake fix
2016-10-22 15:16:55 -04:00
Connor Turland
9600983311
remove Connor thinking out loud comment
2016-10-22 11:07:50 -04:00
Connor Turland
cbcdd912c9
Comments were for non-redux scenario
2016-10-22 11:04:14 -04:00
Connor Turland
1d13da4ab5
Update README.md
2016-10-22 10:59:43 -04:00
Connor Turland
d359eb063a
fixed the oauth redirect bug and a bit more ( #796 )
2016-10-22 16:46:39 +08:00
Connor Turland
4187dbd803
fix it up ( #804 )
2016-10-22 03:58:19 -04:00
Connor Turland
d549083cce
prefer variable height lightbox over scrolling visually
2016-10-22 03:10:33 -04:00
Connor Turland
bc8660c83e
remove about lightbox in prep for homepage redo and about page
2016-10-22 03:10:09 -04:00
Robert Best
c0b35280f6
Middle.mouse.click features (Open contained link & copy text to clipboard) ( #792 )
...
* changed the code to be based off of the current dev branch
* Update JIT.js
* Update Util.js
* Update JIT.js
A few logical operators were replaced with their stricter counterpart.
* Update JIT.js
* Update index.js
* Update Util.js
2016-10-22 02:58:13 -04:00
Connor Turland
31078c554e
just make it 'tutorial'
2016-10-22 02:41:36 -04:00
Robert Best
ea20ba45b3
Merge pull request #738 from metamaps/window.resize.fix
...
Makes it so that resizing the browser window doesn't change the user's current location on the map
2016-10-22 02:12:54 -04:00
Robert Best
37b989c38e
Update Listeners.js
2016-10-22 01:52:43 -04:00
Robert Best
759ec7845b
cleaned up the window resize function even further
2016-10-22 05:50:31 +00:00
Robert Best
cfb8f51214
simplified the window resize function by adding a Util function that logs the canvas attributes.
2016-10-22 05:21:32 +00:00
Robert Best
1cd7e22c40
Merge commit '858ca66d69ed9e43f4d3a4ce6be288508cf4efa1' of github.com:metamaps/metamaps into window.resize.fix
2016-10-22 05:00:10 +00:00
Robert Best
ad1889dfc5
Merge branch 'develop' of github.com:metamaps/metamaps into window.resize.fix
2016-10-22 04:54:31 +00:00
Connor Turland
cbc8e6cdd4
the return of the infinite scroll ( #795 )
2016-10-22 00:15:10 -04:00
Connor Turland
f8556c30a5
resize every time it renders
2016-10-21 19:10:28 -04:00
Connor Turland
8af1e69460
undo last commit, don't need for rails5
2016-10-21 18:25:07 -04:00
Connor Turland
d1e8ecbf3b
readd 12factor for debugging on heroku
2016-10-21 18:22:15 -04:00
Connor Turland
8e38469b1f
add border radius to mapper list
2016-10-21 18:10:37 -04:00
Connor Turland
abb997c75c
some quick fixes for realtime server after devins refactor
2016-10-21 18:04:18 -04:00
Connor Turland
be8efa6025
add card features ( #793 )
2016-10-21 17:42:21 -04:00
Robert Best
439527c464
Merge pull request #724 from metamaps/feature/edge.shift
...
Made it so that the map pans when you drag a selection of topics near the edge of the window
2016-10-21 17:03:25 -04:00
Robert Best
f68deea202
changed all logical operators to be more strict
2016-10-21 20:59:16 +00:00
Robert Best
b61cdb04fc
Fixed the glitchyness, and made it suitable to merge with develop
2016-10-21 20:47:14 +00:00
Robert Best
5c67fcbff7
this time I actually addressed the conflicts
2016-10-21 20:38:17 +00:00
Robert Best
2eeb0a671f
Fixed cherry pick conflicts
2016-10-21 20:26:42 +00:00
Connor Turland
fb427a11f0
[WIP] keep client fresh with junto info globally ( #791 )
...
* push state to client
* junto status is live on map cards XD
* little fixes
* eslint stuff
* remove object rest spread
* i think this makes realtime work without needing babel-node
2016-10-21 09:29:04 -04:00
Connor Turland
7a09a1c620
last commit broke stuff
2016-10-20 18:27:14 -04:00
Connor Turland
103ed5cbd7
max at 4, use fewer if not enough maps
2016-10-20 18:10:28 -04:00
Devin Howard
b1a7e548a2
add email/twitter links
2016-10-20 07:01:15 +08:00
Connor Turland
52c340b8f5
center the explore maps div! ( #787 )
...
* ooh baby
* will add displayStyle again later if we actually build it
2016-10-19 14:40:42 -04:00
Connor Turland
9299ca5f2c
dont do translate with arrow keys till we can block conflicts
2016-10-19 17:47:10 +00:00
Devin Howard
261ed49977
replace uservoice with docs.metamaps.cc + Hylo ( #777 )
...
* replace uservoice with docs.metamaps.cc + Hylo
* re-add the feedback tab as link to hylo
2016-10-19 13:39:57 -04:00
Devin Howard
e2d9b6aef2
Merge pull request #786 from metamaps/fix/empty-autocomplete
...
fix topic autocomplete controller action
2016-10-19 22:16:26 +08:00
Devin Howard
1042fb020d
Merge pull request #778 from metamaps/feature/auto-copy-invite-link
...
copy share invite link to clipboard automatically where possible
2016-10-19 22:15:21 +08:00
Devin Howard
7f1c04015e
fix topic autocomplete controller action
2016-10-19 22:10:38 +08:00
Devin Howard
f75d5253b3
Merge pull request #781 from metamaps/fix/registration
...
clean up and fix devise code
2016-10-19 14:36:39 +08:00
Devin Howard
bb6566a45e
clean up and fix devise code
2016-10-19 12:40:52 +08:00
Devin Howard
2529e0d44f
copy share invite link to clipboard automatically where possible
2016-10-19 11:07:20 +08:00
Connor Turland
139837e997
restructure realtime server for clarity ( #780 )
...
* restructure realtime server for clarity
* better indenting on signal.js
* don't need it because socketioconnection is being imported now
2016-10-18 20:29:21 -04:00
Connor Turland
d8cd536a95
too much logging
2016-10-18 14:10:41 -04:00
Connor Turland
29913cd10b
fix for heroku
2016-10-18 14:08:10 -04:00
Connor Turland
d004e98ada
holy insanity realtime refactor ( #779 )
...
* all the refactoring
* make it all work
2016-10-18 12:34:19 -04:00
Connor Turland
d2e097fd05
add webrtc logging
2016-10-17 22:59:28 -04:00
Connor Turland
fe0da255dd
[WIP] display whether a map is live on every map card ( #775 )
...
* tidy up
* checkwhethertosave was no longer correct
2016-10-17 22:27:15 -04:00
Devin Howard
6e75274737
access request tests ( #772 )
...
* access request tests
* map mailer spec update
2016-10-17 10:53:53 -04:00
Devin Howard
6c9d464a9f
Global => All Maps ( #774 )
2016-10-17 10:53:33 -04:00
Connor Turland
517cfcb913
remove static lib files in favor of npm ones ( #773 )
...
* remove static lib files in favor of npm ones
* update howler to work correctly
* patch npm modules to not use window
2016-10-17 10:39:08 -04:00
Devin Howard
0ee1b3284a
fix check-canvas-support require
2016-10-17 13:47:42 +08:00
Devin Howard
b976c13db2
Merge pull request #770 from metamaps/feature/remove-canvas-function
...
remove check-canvas-support.js
2016-10-17 13:40:34 +08:00
Connor Turland
c0955d7c5e
multiple policy issues ( #771 )
...
* multiple policy errors
* make some things more explicit
2016-10-17 01:20:48 -04:00
Connor Turland
332bb2ec08
Map Card changes ( #769 )
...
* map card rewrite underway
* star count
* css fix
2016-10-16 23:46:55 -04:00
Devin Howard
179849b639
remove check-canvas-support.js
2016-10-17 11:42:11 +08:00
Devin Howard
4f6dae304c
Merge pull request #768 from metamaps/feature/default-rails-scripts
...
add scripts from default rails install
2016-10-17 10:51:47 +08:00
Devin Howard
3479fb7ff7
Merge pull request #767 from metamaps/fix/schema
...
schema update
2016-10-17 10:46:57 +08:00
Devin Howard
c113253fc5
add scripts from default rails install
2016-10-17 10:42:14 +08:00
Devin Howard
e46aa54ba3
schema update
2016-10-17 10:39:46 +08:00
Connor Turland
4602ded8a4
access requests ( #762 )
...
* start on access requests
* set up access requests further
* set default values for approved and answered
2016-10-16 20:22:00 -04:00
Devin Howard
14ea18a967
Merge pull request #764 from metamaps/fix/import-dialog-box
...
fix file upload box
2016-10-16 22:11:36 +08:00
Devin Howard
8180a8cc71
fix file upload box
2016-10-14 14:45:17 +08:00
Devin Howard
da5191171a
Merge pull request #760 from metamaps/feature/mailer-tests
...
tests for map_mailer.rb
2016-10-14 11:24:31 +08:00
Devin Howard
26a8cddd14
mailer spec
2016-10-13 18:45:54 +08:00
Devin Howard
407ac1f29c
more simplecov groups
2016-10-13 16:48:54 +08:00
Devin Howard
fc2849824f
fix js syntax error
2016-10-13 16:48:46 +08:00
Devin Howard
6f3c74b7f1
token policy fix
2016-10-13 15:21:27 +08:00
Devin Howard
c3dbd59280
Merge pull request #758 from metamaps/feature/remove-gems
...
don't need coffeescript
2016-10-13 14:55:04 +08:00
Devin Howard
0e7e649f56
don't need coffeescript, tunemygc fails on Windows
2016-10-13 14:52:59 +08:00
Devin Howard
6e03132f1b
fix spec
2016-10-13 14:51:58 +08:00
Devin Howard
b2a4acc99d
make default category explicit in import.js
2016-10-13 14:24:08 +08:00
Devin Howard
7eae8deacb
revamp HTML template a bit for api docs ( #757 )
...
* my_tokens endpoint moved to normal index
* remove secured_by from metacodes/users
* ch ch ch changes
* mess with template
* fix securedBy
* convenience open
* gross authentication notes at the top of every endpoint
* better ordering
* move login tutorials into security tab
* oauth tutorial
* getting closer
* remove unneeded Endpoints header
* ok looks OK
2016-10-12 13:54:43 -04:00
Devin Howard
62c489cba7
suggesting api doc updates ( #756 )
2016-10-12 12:22:38 -04:00
Devin Howard
3051723bcf
[WIP] add markdown getting started page to api docs ( #752 )
...
* add markdown getting started page to api docs. TODO section 3
* Update getting-started.md
2016-10-11 12:08:31 -04:00
Devin Howard
858ca66d69
eslint updates
2016-10-10 17:22:22 +08:00
Devin Howard
a0c0dcbc79
Merge pull request #753 from metamaps/fix/screenshot-no-file
...
fix screenshot no file error
2016-10-10 13:01:50 +08:00
Devin Howard
6e6d33abbe
fix screenshot no file error
2016-10-10 12:12:42 +08:00
Devin Howard
8b1d85c3ca
actually the smart option is dumb
2016-10-09 10:24:13 +08:00
Devin Howard
56d3ef8bea
Merge pull request #751 from metamaps/feature/markdown-xss-safe
...
enable xss filtering and smart quote replacement in markdown
2016-10-09 10:23:00 +08:00
Devin Howard
ba9e26bc05
enable xss filtering and smart quote replacement in markdown
2016-10-09 10:20:17 +08:00
Devin Howard
9ac24f7468
Merge pull request #744 from metamaps/feature/markdown-in-topic-cards
...
markdown in topic card description field
2016-10-08 16:58:32 +08:00
Devin Howard
fe1c57b458
further updates - make Enter update bip fields whaaat
2016-10-08 16:55:46 +08:00
Devin Howard
9d85dab975
Merge pull request #747 from metamaps/fix/unauth-error
...
redirect to root_path if you get a 403
2016-10-08 14:16:13 +08:00
Devin Howard
ab76b77bdd
Merge pull request #748 from metamaps/feature/api-json-404
...
return 404s for all unmatched api routes
2016-10-08 14:16:00 +08:00
Devin Howard
9513087bbd
remove unnecessary api v1 code
2016-10-08 14:12:54 +08:00
Devin Howard
2c64b67abd
return 404s for all unmatched api routes
2016-10-08 13:58:19 +08:00
Devin Howard
be6a2401b6
fix spec. not sure how this should work
2016-10-08 13:42:25 +08:00
Devin Howard
0764133d11
Merge pull request #661 from metamaps/feature/file-upload-component
...
set up a dialog box to help with import/export
2016-10-08 12:34:28 +08:00
Devin Howard
129e3db946
redirect to root_path if you get a 403
2016-10-08 12:26:08 +08:00
Devin Howard
7eacda2ae7
code style
2016-10-08 09:35:05 +08:00
Devin Howard
f775629371
showCard .desc css for ul and a tags
2016-10-08 09:24:17 +08:00
Devin Howard
0085ce71e6
upgrade to best in place 3.0.0 alpha
2016-10-08 09:24:16 +08:00
Devin Howard
fc044294f1
add markdown to topic cards
2016-10-08 09:23:57 +08:00
Devin Howard
20da1ef39f
fiddle with import icon
2016-10-08 00:21:04 +08:00
Devin Howard
42bb2cd86a
look and feel updates
2016-10-08 00:16:37 +08:00
Devin Howard
dc55bae243
Merge pull request #740 from metamaps/feature/ctrl-or-meta
...
make all Ctrl shortcuts also work with Meta (Cmd on OSX)
2016-10-08 00:07:07 +08:00
Robert Best
b6da38e29e
Update Listeners.js
...
Simplified based on Connor's suggestion about usage of variables.
2016-10-07 02:36:41 -04:00
Devin Howard
2b036bfb4e
all Ctrl shortcuts now also work with Meta (Cmd on OSX)
2016-10-07 14:03:48 +08:00
Robert Best
3e4ff59a82
Update Listeners.js
2016-10-06 23:58:57 -04:00
Robert Best
08f89ee630
Update Listeners.js
2016-10-06 23:56:39 -04:00
Connor Turland
86a6e92bc3
dont show private maps in global collection ( #734 )
...
* dont show private maps in global collection
* Update explore_controller.rb
* Update main_controller.rb
2016-10-06 23:45:17 -04:00
Robert Best
b978247785
Put all the code within the if statement
2016-10-07 00:51:52 +00:00
Robert Best
0aeb6caadb
Makes it so that resizing the browser window doesn't change the user's location on the map
2016-10-07 00:33:16 +00:00
Connor Turland
97d2868fad
dont pan while using arrow keys during creation fixes #721 ( #733 )
2016-10-06 10:49:49 -04:00
Connor Turland
658f102a4e
fixes #720 double topic create when pinned ( #732 )
2016-10-06 10:37:01 -04:00
Connor Turland
b52523e7be
one more maps in maps error
2016-10-06 10:32:06 -04:00
Connor Turland
e72ae5df94
another issue from the maps in maps branch
2016-10-06 09:33:10 -04:00
Connor Turland
a56c4eb110
missing comma
2016-10-06 09:27:18 -04:00
Connor Turland
85dcad928f
enable pulling in of references to maps through typeahead ( #636 )
2016-10-06 09:12:01 -04:00
Connor Turland
a79d6a824c
dont do async: false ( #731 )
...
* dont do async: false
* account for case where callback isn't provided
2016-10-06 09:07:46 -04:00
Devin Howard
38c323a18a
global lightbox css changes
2016-10-06 16:22:22 +08:00
Devin Howard
518773d6e1
pop up a lightbox using React to help you export
2016-10-06 16:22:21 +08:00
Devin Howard
33bcfc1505
move Maps into a folder
2016-10-06 16:20:27 +08:00
Devin Howard
d80d33761d
Merge pull request #730 from metamaps/feature/synapse-check-for-topic-by-name
...
allow synapses to be imported by topic name as well as id
2016-10-06 14:09:43 +08:00
Devin Howard
df59c28aa8
Merge pull request #729 from metamaps/fix/chat-message-word-wrap
...
word wrap on chat message text
2016-10-06 14:08:59 +08:00
Devin Howard
b4d1250959
share normalizeKey between TSV, CSV, and JSON
2016-10-06 12:03:23 +08:00
Devin Howard
c0a220abc9
allow synapses to be imported by topic name as well as id
2016-10-06 11:52:05 +08:00
Devin Howard
eb4073c228
word wrap on chat message text. Fixes #726
2016-10-06 11:18:55 +08:00
Connor Turland
98fae4b721
fixes #711 toast button styling
2016-10-05 22:28:37 -04:00
Connor Turland
0cfbe41d95
don't prevent all right clicking
2016-10-05 22:22:38 -04:00
Connor Turland
c256d0891b
dont conflict message sending with topic creation
2016-10-05 22:17:04 -04:00
Connor Turland
6d6a5099e9
Enable access to Most Used and Recently Used metacodes in lists and carousel ( #708 )
...
* used and recent
* enable most used and recent in all metacode select situations
* selected changed to active at some point
* switch recent and most used positions
* remove index doc page
2016-10-05 10:45:39 -04:00
Connor Turland
8d613eab33
improve descriptors
2016-10-05 10:38:38 -04:00
Devin Howard
d193c9a53c
add starred to maps API ( #719 )
...
* add starred to maps API and endpoint to create/delete
* add token to requests without token param
* add minor version number to api version
* metacode/user use uri in schema
* make code climate happier
2016-10-05 10:36:03 -04:00
Devin Howard
40453242fa
Merge pull request #717 from metamaps/feature/eslint-updates
...
eslint updates
2016-10-05 11:55:47 +08:00
Devin Howard
12417d8cd3
update JIT eslint style
2016-10-05 01:46:51 +08:00
Devin Howard
e3db00f229
Merge pull request #718 from metamaps/fix/raml
...
fix api documentation
2016-10-05 00:00:34 +08:00
Devin Howard
e2c0ce7c22
fix api documentation
2016-10-04 23:43:42 +08:00
Devin Howard
113a5a2530
fix a bunch of bug risk eslint warnings
2016-10-04 23:38:32 +08:00
Devin Howard
959260f234
Merge pull request #716 from metamaps/feature/new-endpoints
...
users and metacodes api endpoints
2016-10-04 23:12:04 +08:00
Devin Howard
dbc2ff75df
make eslint work and update yoda config
2016-10-04 23:06:49 +08:00
Devin Howard
df29e48d8c
rubocop + allow unauthed users to see all users
2016-10-04 22:51:21 +08:00
Devin Howard
2eae89a6b7
users and metacodes api endpoints
2016-10-04 22:28:10 +08:00
Devin Howard
c90460802e
enable heroku to serve apidocs
2016-10-04 17:59:13 +08:00
Devin Howard
a9831946d0
ensure public/api directory exists
2016-10-04 16:33:15 +08:00
Devin Howard
bf733b57d2
Merge pull request #715 from metamaps/feature/faster-builds
...
speed up travis builds by excluding raml2html from npm install
2016-10-04 16:24:10 +08:00
Devin Howard
15b8440fbc
move raml2html to optional dependencies so it can be installed globally
2016-10-04 16:21:09 +08:00
Devin Howard
c58a8da1a6
Merge pull request #714 from metamaps/feature/raml-1.0
...
update raml and create a build script for it
2016-10-04 16:10:02 +08:00
Devin Howard
8afef1bc4a
make tokens description field optional
2016-10-04 16:08:07 +08:00
Devin Howard
8ac8aad105
PUT and PATCH parameters are optional
2016-10-04 15:30:06 +08:00
Devin Howard
2466a0912f
raml2html build script
2016-10-04 15:22:24 +08:00
Devin Howard
3d7a2ef5b1
make raml traits work and be accurate/useful
2016-10-04 15:22:24 +08:00
Devin Howard
a2cde20f8f
raml2html with 1.0 syntax working
2016-10-04 15:22:22 +08:00
Connor Turland
da3795a2c2
new map improvements ( #710 )
...
* prehighlight the text for editing when taken to a new map
* style
2016-10-02 22:49:45 -04:00
Devin Howard
6d2efefbbc
Merge pull request #709 from metamaps/bug/backbone
...
backbone router fix
2016-10-03 08:28:36 +08:00
Devin Howard
7d0b56da19
Merge pull request #689 from metamaps/feature/user-in-slack-notification
...
Custom formatter for slack exception notifications
2016-10-03 08:26:13 +08:00
Devin Howard
87228a9631
delete old gems and upgrade aws/paperclip ( #676 )
...
* remove old gems from gemfile, upgrade aws/paperclip
* update paperclip config
* upload screenshots as a blob instead of base64 to maps controller
2016-10-02 18:29:35 -04:00
Connor Turland
0f740e751a
topics wasn't in backbone routes
2016-10-02 17:37:14 -04:00
Devin Howard
afa4422608
Custom formatter for slack exception notifications
2016-10-02 17:07:45 +08:00
Devin Howard
7ec9feff80
Merge pull request #702 from metamaps/feature/quiet-assets
...
quiet assets again
2016-10-02 11:01:17 +08:00
Devin Howard
b3c7e12d9a
assets.debug was why assets were loud
2016-10-02 10:53:35 +08:00
Devin Howard
bc139608c2
Search.focus() is the new Search.open()
2016-10-02 10:09:55 +08:00
Devin Howard
05c1e4c60d
Merge pull request #699 from metamaps/feature/arrow-keys-pan
...
arrow key panning - fixes #239
2016-10-02 00:13:16 +08:00
Devin Howard
ca981898d4
arrow key panning - fixes #239
2016-10-02 00:09:55 +08:00
Devin Howard
77d353464b
Merge pull request #698 from metamaps/feature/random-updates
...
more random js & import updates
2016-10-01 23:26:58 +08:00
Devin Howard
8f230736dc
code climate
2016-10-01 13:47:16 +08:00
Devin Howard
bb013787b6
make AutoLayout skip over coordinates if there is a mapping at that exact position
2016-10-01 13:34:52 +08:00
Devin Howard
20a32afe3b
integrate handleURL into Import
2016-10-01 13:18:50 +08:00
Devin Howard
c5564e02fc
don't needt o open topic card
2016-10-01 12:47:30 +08:00
Devin Howard
4949f0dbd6
eslint and use AutoLayout
2016-10-01 12:43:30 +08:00
Devin Howard
99d07d2d65
Merge pull request #695 from metamaps/fix/topic-bugs
...
fix topic controller bugs
2016-10-01 12:38:56 +08:00
Devin Howard
fdf03ac83a
source maps!
...
(I think)
2016-10-01 12:32:40 +08:00
Devin Howard
1562d8fcfe
topics imported with a link get Reference metacode
2016-10-01 12:14:38 +08:00
Devin Howard
e5e8a3dcbb
Merge pull request #697 from metamaps/feature/random-updates
...
import fixes + random config updates
2016-10-01 11:36:57 +08:00
Devin Howard
e093ca5a30
more liberally import csv
2016-10-01 11:21:42 +08:00
Devin Howard
4328a6205f
enable code duplication checks on code climate
2016-10-01 11:20:31 +08:00
Devin Howard
01872e740e
fix import if there are errors
2016-10-01 11:19:38 +08:00
Devin Howard
6ae391265e
enable source maps
2016-10-01 10:49:34 +08:00
Devin Howard
ea18479822
Merge pull request #696 from metamaps/fix/import
...
fix tsv import
2016-09-30 22:38:36 +08:00
Devin Howard
0e79f2ae4b
fix tsv
2016-09-30 22:33:09 +08:00
Devin Howard
7156fab3e2
fix topic controller bugs
2016-09-30 14:42:07 +08:00
Devin Howard
97c118a20b
Merge pull request #693 from metamaps/feature/re-enable-search
...
re-enable Ctrl+/ search box focus shortcut
2016-09-30 12:02:44 +08:00
Devin Howard
b396b94477
re-enable Ctrl+/ search box focus shortcut
2016-09-30 11:55:43 +08:00
Devin Howard
e916ea32dc
Merge pull request #690 from metamaps/feature/globalui-lint
...
eslint updates for GlobalUI.js
2016-09-30 11:54:40 +08:00
Devin Howard
816d5adf94
remove old code from GlobalUI.Search
2016-09-30 11:52:01 +08:00
Robert Best
8864dbbdcf
Merge pull request #691 from metamaps/feature/better.zoom
...
I changed how zoom by mouse-wheel works so that it zooms based on whe…
2016-09-29 18:26:02 -04:00
Robert Best
44a183ed7b
I changed how zoom by mouse-wheel works so that it zooms based on where your mouse pointer is
2016-09-29 21:32:55 +00:00
Devin Howard
e4e6043ded
split GlobalUI into files
2016-09-30 00:20:16 +08:00
Devin Howard
24caafba74
move GlobalUI into a folder
2016-09-30 00:08:45 +08:00
Devin Howard
3b8199aac6
eslint updates for GlobalUI.js
2016-09-30 00:08:04 +08:00
Devin Howard
2f0b0f39e5
Merge pull request #688 from metamaps/fix/searchsynapses-undefined-topic
...
fix error when searching for synapse with undefined topic1id
2016-09-29 23:56:16 +08:00
Devin Howard
1d4d7f07e2
fix error when searching for synapse with undefined topic1id
2016-09-29 18:38:54 +08:00
Devin Howard
9af3f04f4d
Merge pull request #685 from metamaps/feature/chatview-lint
...
update ChatView.js eslint style
2016-09-29 15:21:15 +08:00
Devin Howard
ec8dbbb4a7
Merge pull request #687 from metamaps/fix/rack-attack
...
disable 5 minute request limit on rack attack
2016-09-29 15:18:48 +08:00
Devin Howard
26977d06a8
disable 5 minute request limit on rack attack
2016-09-29 13:15:14 +08:00
Connor Turland
1bbc72fff0
was destroying and not reinitializing
2016-09-28 22:36:53 -04:00
Devin Howard
bca85337cc
add template strings + outdent to chatview
2016-09-29 09:33:13 +08:00
Devin Howard
e858a2a773
update ChatView.js eslint style
2016-09-29 09:24:17 +08:00
Devin Howard
ee9a49d7c6
Merge pull request #683 from metamaps/fix/routes
...
fix routes.rb
2016-09-29 08:44:15 +08:00
Devin Howard
88297b4eaa
fix routes.rb
2016-09-29 08:40:39 +08:00
Connor Turland
93341719a9
Update main_controller.rb ( #682 )
2016-09-28 20:22:55 -04:00
Devin Howard
db3cf0490f
fix develop branch bugs ( #679 )
...
* bugfix - rename SearchController so it works
* remove unneeded respond_with
* fix to_json calls
2016-09-29 08:02:25 +08:00
Robert Best
9605b24640
Merge pull request #681 from metamaps/better-contextMenu-fix
...
Better default context menu suppression fix
2016-09-28 15:37:46 -04:00
Robert Best
e8746ee7d9
Update Create.js
2016-09-28 15:32:49 -04:00
Robert Best
a37f60060c
Update JIT.js
2016-09-28 15:31:08 -04:00
Robert Best
4e506ad290
Update JIT.js
2016-09-28 15:18:44 -04:00
Robert Best
67c4912c62
Update index.js
2016-09-28 13:37:08 -04:00
Robert Best
10a2782f85
Update JIT.js
2016-09-28 13:03:44 -04:00
Robert Best
2c3b387e42
Update index.js
2016-09-28 13:00:32 -04:00
Devin Howard
d6a239d6b4
Merge pull request #670 from metamaps/feature/explore-controller-simplify
...
[WIP test it] clean up routes and some controllers
2016-09-28 22:34:34 +08:00
Devin Howard
466b1716a5
more changes to routes.rb
2016-09-28 22:29:53 +08:00
Devin Howard
9699b41159
make requestinvite controller method explicit
2016-09-28 22:29:53 +08:00
Devin Howard
c1acaba941
re-order config/routes.rb
2016-09-28 22:29:53 +08:00
Devin Howard
5b9eedc830
pull search routes into their own controller
2016-09-28 22:29:53 +08:00
Devin Howard
5065655436
factor stars into their own controller
2016-09-28 22:27:32 +08:00
Devin Howard
3ee8d41298
maps controller code climate
2016-09-28 22:27:32 +08:00
Devin Howard
f75ad41a82
factor out map_scope function
2016-09-28 22:27:32 +08:00
Devin Howard
bb87c9c2db
simplify explore controller a bit
2016-09-28 22:27:32 +08:00
Devin Howard
a8b698b11c
Merge pull request #677 from metamaps/feature/node1-topic1-migration
...
node{1,2}_id => topic{1,2}_id migration and code changes
2016-09-28 22:26:50 +08:00
Devin Howard
cc412ac491
Merge pull request #675 from metamaps/feature/no-xls-export
...
remove excel export
2016-09-28 22:25:04 +08:00
Robert Best
ac60370d6f
Merge pull request #678 from metamaps/prevent-context-menu
...
Prevent default context menu from opening when topics/synapses are right-clicked
2016-09-28 05:27:03 -04:00
Robert Best
40b7e95b68
Update index.js
...
Prevents the default chrome context menu from appearing overtop the Metamaps context menu
2016-09-28 04:35:41 -04:00
Devin Howard
743c9b3af9
node{1,2}_id => topic{1,2}_id migration and code changes
2016-09-28 10:35:14 +08:00
Devin Howard
a86101dda0
remove excel export
2016-09-27 21:10:14 +08:00
Connor Turland
8f0b350a2d
Fix underscore bug ( #674 )
...
* Update package.json
* Update ChatView.js
2016-09-26 20:39:33 -04:00
Connor Turland
c60e103d97
Update _switchmetacodes.html.erb
2016-09-26 20:28:06 -04:00
Devin Howard
7150b9fcce
Merge pull request #673 from metamaps/fix/eslint-updates
...
Figured out eslint-3 + some small eslint fixes
2016-09-26 18:18:31 +08:00
Devin Howard
bc8ce0fee4
topic view bug fix
2016-09-26 14:04:31 +08:00
Devin Howard
12cb675bb5
switch to using the eslint-standard plugin again
2016-09-26 13:44:23 +08:00
Devin Howard
c9a79468f4
switch to eslint-3
2016-09-26 13:40:02 +08:00
Devin Howard
ebaae084ae
simple eslint fixes
2016-09-26 13:37:42 +08:00
Devin Howard
e646585a7a
Merge pull request #672 from metamaps/feature/eslint-config
...
fix eslint config for code climate
2016-09-26 10:50:30 +08:00
Devin Howard
0e17ec11ec
fix eslint config for code climate
...
this is MOSTLY the same as feross/standard
2016-09-26 10:47:45 +08:00
Devin Howard
5649798e4b
Merge pull request #668 from metamaps/fix/hide-addTopic-message-on-double-click
...
show/hide add a topic instructions more consistently
2016-09-25 23:51:00 +08:00
Devin Howard
c20e503785
show/hide add a topic instructions more consistently
2016-09-25 23:48:14 +08:00
Devin Howard
17870e7a4c
Merge pull request #669 from metamaps/fix/remove-invalid-links
...
show link remover for invalid links too
2016-09-25 23:47:30 +08:00
Devin Howard
b49cb7766a
Merge pull request #652 from metamaps/feature/explore-controller
...
refactor map controller
2016-09-25 23:47:22 +08:00
Devin Howard
fb563c6eed
Merge pull request #648 from metamaps/feature/load-url-title-hack
...
hack to load link titles when pulling a url into a map
2016-09-25 23:47:10 +08:00
Devin Howard
03ba3a89f1
main controller renders by name
2016-09-25 23:37:08 +08:00
Devin Howard
05495b0224
move explore views to their own folder
2016-09-25 23:35:35 +08:00
Devin Howard
18d8929bf1
use .or to fix all sorts of @map.mappings bugs
2016-09-25 23:35:26 +08:00
Devin Howard
50f98aebea
explore controller spec
2016-09-25 23:25:38 +08:00
Devin Howard
dad048eb20
rubocop
2016-09-25 23:25:38 +08:00
Devin Howard
c76de5b1d5
refactor map model a bit and fix bugs
2016-09-25 23:25:38 +08:00
Devin Howard
3f9077b380
clean up
2016-09-25 23:25:38 +08:00
Devin Howard
b722d2d3b0
fix map controller create spec
2016-09-25 23:25:38 +08:00
Devin Howard
5e180ac10e
set up explore controller routes and rename methods
2016-09-25 23:25:38 +08:00
Devin Howard
686d80e274
move more logic into map model
2016-09-25 23:25:37 +08:00
Devin Howard
7275beb163
put CRUD at top of maps controller, and alphabetize other actions below
2016-09-25 23:25:37 +08:00
Devin Howard
40bd9ed95a
refactor maps controller a bit
2016-09-25 23:25:37 +08:00
Devin Howard
1ab8703008
move explore maps methods into their own controller
2016-09-25 23:25:37 +08:00
Devin Howard
eed5ff76ef
add rate limiting headers
2016-09-25 23:23:52 +08:00
Devin Howard
959aa693f3
ok, i guess this is ready
2016-09-25 23:22:20 +08:00
Devin Howard
7f8110b6be
configure rack attack to allow 5r/s for the load_url_title route
2016-09-25 23:22:18 +08:00
Devin Howard
ceb2699760
install rack-attack
2016-09-25 22:54:40 +08:00
Devin Howard
cc2e3b9358
hack to get the <title> tag when importing a url, without CORS issues
2016-09-25 22:50:16 +08:00
Devin Howard
8c16c60554
show link remover for invalid links too
2016-09-25 22:44:07 +08:00
Devin Howard
cc986368be
Merge pull request #667 from metamaps/feature/update-package.json
...
update package.json and save a bit of bundle size
2016-09-25 22:25:31 +08:00
Devin Howard
dd78c0c379
Merge pull request #665 from metamaps/fix/topic-to-map-transition
...
hide circles when transitioning from topic view to map view
2016-09-25 22:25:19 +08:00
Devin Howard
0df17c4aa0
update deps in package.json
2016-09-25 21:53:40 +08:00
Devin Howard
2ade375c20
babel-plugin-lodash to slim down bundle size by 300 KB
2016-09-25 21:53:26 +08:00
Devin Howard
11d13445fb
fix authorizeToEdit call
2016-09-25 20:19:38 +08:00
Devin Howard
7734272737
hide circles when transitioning from topic view to map view
...
fixes #389
2016-09-25 20:10:18 +08:00
Devin Howard
43fafb8e6f
Merge pull request #663 from metamaps/fix/git-versioning
...
fix git versioning
2016-09-25 19:48:48 +08:00
Devin Howard
5819447828
fix git versioning
2016-09-25 19:35:37 +08:00
Devin Howard
997a4b7329
Merge pull request #662 from metamaps/fix/no-add-topic-message-if-logged-out
...
hide double click to add topic message if can't edit map
2016-09-25 18:50:57 +08:00
Devin Howard
35d6dbd0b4
hide double click to add topic message if can't edit map
2016-09-25 15:04:14 +08:00
Devin Howard
1810faacbe
Merge pull request #660 from metamaps/feature/csv
...
enable csv import using csv-parse module
2016-09-25 14:27:48 +08:00
Devin Howard
40f89b1c61
enable csv import using csv-parse module
2016-09-25 12:49:57 +08:00
Devin Howard
82b7c7e5ac
Merge pull request #659 from metamaps/feature/js-fiddling
...
simplify js
2016-09-24 23:35:50 +08:00
Devin Howard
0a0ff2fdab
remove fetch api - we don't want no polyfills, and already have jQuery
2016-09-24 23:28:11 +08:00
Devin Howard
045bd3fd73
Metamaps.Filter bug and use _.omit instead of util function
2016-09-24 23:23:12 +08:00
Devin Howard
79aa7717ed
exact versions in package.json
2016-09-24 23:21:29 +08:00
Devin Howard
0bb7b1523d
Metamaps.ReactComponents isn't needed anymore
2016-09-24 14:40:40 +08:00
Devin Howard
03eacde753
Merge pull request #656 from metamaps/feature/tech-debt
...
rubocop style updates
2016-09-24 13:59:27 +08:00
Devin Howard
a164dccc94
fix errors!!
2016-09-24 13:55:52 +08:00
Devin Howard
20bd959c69
fix models that rubocop broke >:(
2016-09-24 13:02:53 +08:00
Devin Howard
b0fac7648a
Merge pull request #650 from metamaps/fix/map-serialization-bug
...
fix @maps serialization bug
2016-09-24 12:32:38 +08:00
Devin Howard
f8c11f234d
more rubocop updates
2016-09-24 12:27:34 +08:00
Devin Howard
5fab6de48a
fiddle with metacodes controller
2016-09-24 11:00:53 +08:00
Devin Howard
0ace202ace
automatic rubocop updates
2016-09-24 11:00:46 +08:00
Robert Best
0a62eb3299
Merge pull request #655 from metamaps/feature/fix-map-titles
...
Feature/fix map titles
2016-09-23 16:48:44 -04:00
Robert Best
afa0cc96b9
Update index.js
2016-09-23 16:06:28 -04:00
Robert Best
f41ece6f1c
Update index.js
2016-09-23 15:47:37 -04:00
Robert Best
b8ae2c4b6a
Update Router.js
2016-09-23 15:45:11 -04:00
Devin Howard
c76657ecb4
fix restful controller style issuse
2016-09-23 18:54:05 +08:00
Devin Howard
8255653d24
disable duplication checking in code climate for now
2016-09-23 18:51:34 +08:00
Devin Howard
04a3027368
code climate linked to travis
2016-09-23 18:43:54 +08:00
Devin Howard
cbd9395142
Merge pull request #651 from metamaps/feature/update
...
update gems
2016-09-23 18:37:14 +08:00
Devin Howard
bb5ba4861d
[WIP] code climate config file ( #654 )
...
code climate config file
2016-09-23 18:36:47 +08:00
Devin Howard
4afab70414
Merge pull request #653 from metamaps/fix/travis
...
safer git dating
2016-09-23 17:57:02 +08:00
Devin Howard
a7338f8960
safer git dating
2016-09-23 17:49:26 +08:00
Devin Howard
117b7910bf
test
2016-09-23 17:40:30 +08:00
Devin Howard
ce1ad3e24b
update gems
2016-09-23 15:28:31 +08:00
Devin Howard
df84bd9e1d
fix @maps serialization bug
...
if @maps is empty, it returns {"maps":[]}, instead of [] like we expect
on the frontend.
This commit fixes this issue
2016-09-23 14:40:26 +08:00
Devin Howard
eef8a281cb
Merge pull request #649 from metamaps/feature/Metamaps-in-frontend
...
move Metamaps code to webpack
2016-09-23 14:22:46 +08:00
Devin Howard
6f91ce5ff5
fix a few more errors
2016-09-23 14:12:27 +08:00
Devin Howard
e65a5e2d1c
whoops, reenable travis npm test
2016-09-23 12:00:47 +08:00
Devin Howard
bda740491c
moved JIT to npm. tests pass. whoop whoop
2016-09-23 11:59:23 +08:00
Connor Turland
700119cc9e
opts can be undefined and throw error
2016-09-22 23:04:46 -04:00
Devin Howard
07e4ac3865
attempt to get npm testing working; fail
2016-09-23 10:37:59 +08:00
Connor Turland
499593fc82
fixing references
2016-09-22 21:40:49 -04:00
Connor Turland
f59a5775ae
tweaks to import/exports
2016-09-22 20:16:18 -04:00
Devin Howard
73e7c38873
syntax fixes
2016-09-23 08:05:26 +08:00
Devin Howard
30fc943833
clean up backbone file imports
2016-09-23 00:20:05 +08:00
Devin Howard
a996734c79
remove Backbone from window
2016-09-23 00:16:15 +08:00
Devin Howard
30894a313f
move views to their own frontend folder
2016-09-23 00:07:30 +08:00
Devin Howard
fe3012136d
import _
2016-09-22 23:51:33 +08:00
Devin Howard
59b471ac62
break Map into three files
2016-09-22 23:51:28 +08:00
Devin Howard
120c2c0b67
finish most except Backbone
2016-09-22 18:36:22 +08:00
Devin Howard
0065b201c7
make more code modular
2016-09-22 17:36:47 +08:00
Devin Howard
8ed2b3ffc1
remove Constants.js
2016-09-22 17:14:34 +08:00
Devin Howard
9c1543de64
move some variables into JIT
2016-09-22 17:08:53 +08:00
Devin Howard
8f100d99cb
start to do stuff that may/may not work
2016-09-22 17:05:28 +08:00
Devin Howard
0562134157
low hanging fruit
...
Here is my TODO list:
already done
==> Account.js <==
==> Admin.js <==
==> AutoLayout.js <==
==> Listeners.js <==
==> Mapper.js <==
==> Organize.js <==
==> PasteInput.js <==
==> ReactComponents.js <==
==> Util.js <==
TODO (I think) simple to make modular
==> Backbone.js <==
==> Control.js <==
==> Create.js <==
==> Filter.js <==
==> Import.js <==
==> Mobile.js <==
==> Synapse.js <==
==> SynapseCard.js <==
==> Topic.js <==
==> TopicCard.js <==
==> Views.js <==
==> Visualize.js <==
TODO hard to make modular
==> Constants.js <==
==> Debug.js <==
==> GlobalUI.js <==
==> JIT.js <==
==> Map.js <==
==> Realtime.js <==
==> Router.js <==
2016-09-22 17:00:36 +08:00
Devin Howard
0a109895f7
merge realtime/package.json into top level package.json
2016-09-22 17:00:36 +08:00
Devin Howard
c0f63abc59
upgrade testing to es6
2016-09-22 17:00:36 +08:00
Devin Howard
d97b5c2977
make Util modular
2016-09-22 17:00:27 +08:00
Devin Howard
7f83f86460
refactor a bit, make a comment about the Constants file
2016-09-22 15:29:55 +08:00
Devin Howard
03446f548a
start making the code modular. many files still need global scape
2016-09-22 15:23:14 +08:00
Devin Howard
d02c836805
remove Metamaps from filenames
2016-09-22 14:35:14 +08:00
Devin Howard
a4d31241a8
move Metamaps code into webpack
2016-09-22 14:28:20 +08:00
Devin Howard
b13ebc6716
Merge pull request #640 from metamaps/fix/password-reset-error
...
fix password reset error
2016-09-22 09:16:25 +08:00
Devin Howard
1370b63311
Merge pull request #639 from metamaps/feature/paste-url
...
Allow pasting URLs into the map to create a new topic
2016-09-22 09:16:03 +08:00
Connor Turland
2219e0d0dd
Update Metamaps.Topic.js
2016-09-21 14:53:17 -04:00
Devin Howard
8b19c9e340
automatic versioning via git ( #621 )
2016-09-21 13:24:14 -04:00
Devin Howard
3843cab643
rails 5 + api v2 + raml api docs ( #593 )
...
* update Gemfile to rails 5 and ruby 2.3.0
* fiddle with javascripts and add sprockets manifest file
* update config directory for rails 5
* fix some errors with controllers/serializers
* fix travis and rspec
* new serializers renamed to serializers
* module Api::V1
* reusable embedding code
* add index/collections/paging. overriding most of snorlax now |:)
* raml api documentation + rspec tests to verify schemas/examples
* add sorting by ?sort and searching by ?q. Add pagination Link headers
* api v1 => v2
* fill out synapse api
* alphabetize map policy
* fix page thing
* fill out maps api
* formParameters => properties, and fiddle with map api
* more raml 1.0 stuff i'm learning about
* deprecate v1 api
* rails 5 uses ApplicationRecord class for app-wide model config
* Update topic spec for api v2
* workaround for user_preference.rb issue
* get ready for token api docs. also TODO is mapping api docs
* spec out mapping api
* map/mapping/synapse spec, plus other bugs
* awesome, token specs/apis are done
* add sanity checks to the api tests
* more cleanup
* devise fix
* fix starred map error
2016-09-21 13:22:40 -04:00
Devin Howard
1efd78ad7b
initial attempt at focussing input field when entering multiple topics
2016-09-21 14:27:49 +08:00
Devin Howard
49084b98dd
omg import bookmarks 😍
2016-09-21 10:48:47 +08:00
Devin Howard
fac59f346f
fix topic init function
2016-09-21 10:24:57 +08:00
Devin Howard
ec96d69876
refactor import view:
...
-Paste Input wrapper class to abstract away getting input
-Add ability to drop files in PasteInput
-Add ability to drop .webloc files or paste a link to create a new topic with that link in the link and desc fields
2016-09-21 10:11:08 +08:00
Devin Howard
9515152315
move auto layout function into its own file
2016-09-21 10:10:08 +08:00
Connor Turland
aace6796f5
allow topic carousel to be pinned open ( #643 )
...
* so that rapid topic creation can happen in succession
* close when map closes
2016-09-19 20:30:34 -04:00
Connor Turland
61e27a4dcb
height shouldn't stay hard set. fixes 622
2016-09-17 23:45:04 +00:00
Connor Turland
823c0c5990
no room is created if anon user ( #642 )
2016-09-17 15:06:54 -04:00
Connor Turland
698adf69cd
Update README.md
2016-09-17 14:55:23 -04:00
Devin Howard
cd31452c79
update readme ( #575 )
...
* update readme
* remove google plus
2016-09-17 14:54:44 -04:00
Devin Howard
ca74e8c5fc
Merge pull request #641 from metamaps/fix/get-siblings-by-type
...
Get siblings by metacode type returns only topics with that metacode - fix #538
2016-09-17 20:57:48 +08:00
Devin Howard
d1c390636a
Get siblings by metacode type returns only topics with that metacode - fix #538
2016-09-17 17:12:39 +08:00
Devin Howard
4723c62b20
fix password reset error
2016-09-15 07:18:15 +08:00
Devin Howard
4bbb9df5af
can't use ` with uglify
2016-09-14 10:45:42 +08:00
Devin Howard
40cb7606e3
enable metamaps.debug whoops
2016-09-13 15:21:00 +08:00
Devin Howard
0b64b6371f
fix pull changes docs
2016-09-13 15:19:01 +08:00
Devin Howard
eaffc346fd
v2.9.1
2016-09-13 14:30:09 +08:00
Connor Turland
6b2887e8da
namespace the event listeners to turn them off ( #637 )
2016-09-11 18:47:59 -04:00
Connor Turland
4a8b017144
add nvmrc
2016-09-10 20:30:58 -04:00
Connor Turland
9070bfc836
use a subset of the simplest metacodes for new users ( #633 )
...
* use a subset of the simplest ones for new users
* Update user_preference.rb
* Update user_preference.rb
2016-09-09 20:36:49 -04:00
Connor Turland
d3bc3e3d18
dont change home link in the mapper profile case
2016-09-10 00:29:10 +00:00
Connor Turland
75260496be
annoying scroll issue fix ( #634 )
2016-09-09 17:06:05 -04:00
Devin Howard
61465ff148
Merge pull request #630 from metamaps/feature/mapping-policy
...
add mapping policy
2016-09-05 18:58:38 +08:00
Devin Howard
8d372f780d
Merge pull request #626 from metamaps/bug/detached
...
shouldn't reference relatives that are connected in private ways
2016-09-05 11:58:08 +08:00
Devin Howard
3e38fba215
remove relatives1 and relatives2
2016-09-05 11:55:19 +08:00
Devin Howard
e761e1693c
use Topic.relatives scope to get all relatives
2016-09-05 11:52:35 +08:00
Devin Howard
158e2d5383
add mapping policy
2016-09-05 10:47:11 +08:00
Connor Turland
7de89cfa0f
shouldn't reference relatives that are connected in private ways
2016-09-02 12:37:01 -04:00
Connor Turland
4a2f3203bd
Update clean.css.erb
2016-09-01 15:41:20 -04:00
Devin Howard
8a55491dab
forgot last updated
2016-09-01 15:48:47 +08:00
Devin Howard
b36dc03f59
bump version to 2.9.0
2016-09-01 10:14:02 +08:00
Connor Turland
549c086af4
styleee ( #620 )
2016-08-31 18:57:19 -04:00
Connor Turland
19dabe81cc
Enable users to star maps, and to see their starred collection ( #615 )
...
* enable starring
* users should be able to star others maps
* proper star icon
* starred maps display as starred without refreshing
* oops
* make phrasing clearer
2016-08-31 16:58:49 -04:00
Connor Turland
370499e453
avoid prompt
2016-08-30 17:00:14 -04:00
Connor Turland
d7759c8c07
Redo all of explore together in React ( #617 )
...
* unify explore in react
* no more need for manual scroll reseting
* we're not opening/closing the search anymore
2016-08-21 21:02:49 -04:00
Connor Turland
c89a6771ea
Fix mapper page bugs + other things ( #611 )
...
* fix centering of explore headers
* make sure the mobile map title updates
* styling was broken on admin pages
* fixup callbacks when fetching user
* enable loading more
2016-08-17 10:00:37 -04:00
Connor Turland
4cb1dfe401
include link to create new map in mobile menu
2016-08-16 15:45:54 +00:00
Connor Turland
21e2418281
move apps header out of exploreMapsHeader
2016-08-16 15:38:05 +00:00
Connor Turland
b8c8f25c83
fixup applications page
2016-08-16 14:30:10 +00:00
Connor Turland
b58f55353a
switch so that backbone router is opt-in, not opt-out ( #610 )
2016-08-16 10:25:07 -04:00
Devin Howard
03e98e617b
fix login redirect loop - fixes #602 ( #609 )
2016-08-16 08:03:22 -04:00
Connor Turland
57181e208f
layout tweaks ( #607 )
...
* new map creation pops to new window
* hide the search on logged out homepage
* add { }
* just writing the same code better
* remove that old code
2016-08-16 08:03:06 -04:00
Connor Turland
da30078ef4
er, we use a static/modded version of best_in_place ( #608 )
2016-08-15 17:01:24 -04:00
Connor Turland
5b5fc86a3b
enable text overflow for title on mob ( #606 )
2016-08-14 12:50:44 -04:00
Devin Howard
15ca43d49f
Merge pull request #601 from metamaps/fix/nil-mapping-export
...
I think this fixes issue #566 but I'm not sure
2016-08-14 14:14:51 +08:00
Connor Turland
0140d68e87
adjusted media query breakpoints
2016-08-14 00:31:48 +00:00
Connor Turland
d4d992a0da
improve styling for mobile of map list ( #605 )
2016-08-13 20:10:23 -04:00
Connor Turland
34ecf4f70b
enable panning ( #603 )
2016-08-12 11:07:59 -04:00
Devin Howard
c77e3b2da5
Merge pull request #578 from metamaps/paring.down
...
remove all traces of Famous and improve mobile
2016-08-12 13:42:57 +08:00
Devin Howard
6eff5e640e
Metamaps.Mobile.js dependencies comment
2016-08-12 13:32:51 +08:00
Connor Turland
ceb335e728
use border radius on profile image
2016-08-12 05:09:10 +00:00
Connor Turland
dc60c3f3ed
add profile image and fix exploreMaps bar
2016-08-12 05:03:28 +00:00
Devin Howard
796f4d57a1
I think this fixes issue #566 but I'm not sure
2016-08-12 12:39:30 +08:00
Connor Turland
b4c75649ba
all teh mobile things
2016-08-12 04:04:18 +00:00
Devin Howard
f4eb9250ad
npm update
2016-08-12 10:51:14 +08:00
Connor Turland
449c2084bb
make maps go under explore bar
2016-08-11 17:26:11 -04:00
Connor Turland
44bb0020bc
Merge branch 'develop' into paring.down
2016-08-11 15:59:45 -04:00
Devin Howard
fae69133be
try fixing react warnings again
2016-08-11 11:42:35 +08:00
Connor Turland
bdac00bc10
fix typo
2016-08-11 01:44:40 +00:00
Connor Turland
848bb11c08
needed to clear div switching between map view and topic view
2016-08-10 18:37:26 +00:00
Connor Turland
d5cec3844b
make sure toast hides again
2016-08-10 18:08:48 +00:00
Connor Turland
a3f1d51bc6
make the toast work
2016-08-10 18:06:28 +00:00
Connor Turland
da090e60db
remove homepage changes
2016-08-10 17:32:43 +00:00
Connor Turland
c308e276e8
Merge branch 'develop' into paring.down
2016-08-10 17:16:33 +00:00
Devin Howard
63b528c8bf
don't import into textarea elements either - fix #579 ( #598 )
2016-08-10 13:14:33 -04:00
Devin Howard
9db5ce551e
inject NODE_ENV into webpack - probably fixes #595 ( #599 )
2016-08-10 13:13:54 -04:00
Connor Turland
f71d552504
Merge branch 'develop' into paring.down
2016-08-10 17:09:37 +00:00
Devin Howard
beb52bc471
fix topic view keyboard shortcuts ( #597 )
...
* fix topic view selection crash on centerAndReveal
* topic view shortcuts switch to Alt
* change delete behaviour to be smarter
* fetchRelatives recursively handles arrays
* update topic url and Metamaps.Active.Topic when you center
* make heroku work 4 realz
2016-08-09 11:53:50 -04:00
Devin Howard
4478ca43b8
Merge pull request #594 from metamaps/feature/fix-heroku
...
multi-buildpack setup for heroku:
2016-08-09 20:35:06 +08:00
Devin Howard
b9247d2692
multi-buildpack setup for heroku:
...
$ heroku buildpacks:set https://github.com/heroku/heroku-buildpack-multi.git
will set it up
2016-08-09 13:49:38 +08:00
Devin Howard
3b24165fd0
Merge pull request #589 from metamaps/feature/topicview-remove-topics
...
enable removal of topics from topic view - fixes #467
2016-08-08 21:46:15 +08:00
Devin Howard
9cedf69432
fetch siblings & center topic keyboard shortcuts - fixes #466 ( #588 )
...
* fetch siblings & center topic keyboard shortcuts - fixes #466
* add keyboard shortcut labels
* update keyboard shortcuts to Ctrl+E, Ctrl+R, and Ctrl+T, and update docs
* zoom extents back to Ctrl+E and use e.preventDefault
2016-08-08 21:46:05 +08:00
Devin Howard
3050f1413a
Merge pull request #587 from metamaps/feature/topicview-selection-box
...
fix selection box on radial view - fix #463
2016-08-08 21:43:22 +08:00
Devin Howard
5510cb2e99
enable removal of topics from topic view - fixes #467
2016-08-08 21:40:55 +08:00
Devin Howard
3b65ad923b
only show travis build status badge for develop branch
2016-08-07 21:26:53 +08:00
Devin Howard
713063e578
fix npm testing script - it will actually break travis now
2016-08-07 20:00:44 +08:00
Devin Howard
b66b75615a
remove frontend folder reference from travis
2016-08-07 19:45:11 +08:00
Devin Howard
77e8716588
Merge branch 'master' into develop
2016-08-07 17:23:57 +08:00
Devin Howard
fcc1dbdd11
Merge pull request #592 from metamaps/fix/synapse-import
...
fix: synapse import fails if synapses are missing desc
2016-08-07 17:21:21 +08:00
Devin Howard
23543ac7ad
fix: synapse import fails if synapses are missing desc
2016-08-07 17:18:54 +08:00
Devin Howard
d778016571
fix selection box on radial view - fix #463
2016-08-07 13:17:25 +08:00
Devin Howard
00c54b7d66
fix another react bug
2016-08-05 10:54:18 +08:00
Devin Howard
980fca9844
remove spread syntax
2016-08-05 10:54:17 +08:00
Devin Howard
2274155801
split out a separate MapLink component for code reuse
2016-08-04 13:58:59 -04:00
Devin Howard
1774f8c530
object destructure + let/const
2016-08-04 13:58:59 -04:00
Devin Howard
2b2f6e6dc4
add propTypes
2016-08-04 13:58:59 -04:00
Connor Turland
17da8441f4
fixup react setup
2016-08-04 13:58:59 -04:00
Connor Turland
4005b301ac
uncomment commented header lines
2016-08-04 13:58:59 -04:00
Connor Turland
804afc3e1d
remove famous leftovers
2016-08-04 13:58:59 -04:00
Connor Turland
ede1dfb91c
made the header more generic to serve other functions
2016-08-04 13:58:59 -04:00
Connor Turland
30e9a27663
almost rid of famous completely
2016-08-04 13:58:06 -04:00
Connor Turland
aed423214f
started using react instead of famous
2016-08-04 13:57:35 -04:00
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
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
Devin Howard
031e35e50c
Merge branch 'develop'
2016-04-13 10:53:46 +08:00
Devin Howard
d2d67d5d6c
Merge pull request #544 from metamaps/fix/versioncode
...
quick fix to version code code
2016-04-13 10:53:31 +08:00
Devin Howard
e6c4313184
reindent upperelements template + fix input tag
2016-04-13 10:50:51 +08:00
Devin Howard
a2ce20b564
versioncode fix
2016-04-13 10:48:34 +08:00
Devin Howard
bd1e1ffe81
ruby gemset
2016-04-13 10:32:34 +08:00
Devin Howard
3040c004f0
ruby gemset
2016-04-13 10:32:27 +08:00
Devin Howard
0de7333d6a
Merge branch 'develop'
2016-04-13 10:26:01 +08:00
Devin Howard
5ed1fd3156
v2.8.4
2016-04-13 10:19:35 +08:00
Devin Howard
0a9a1c27d8
Merge pull request #543 from metamaps/feature/rename-repo
...
rename repo
2016-04-13 10:17:30 +08:00
Devin Howard
c9bba0cdb2
rename repo
2016-04-13 10:16:54 +08:00
Devin Howard
6659a97f28
Merge pull request #536 from metamaps/feature/metamaps.debug
...
metamaps.debug function, and move VERSION into a rails constant initializer.
2016-04-13 10:14:23 +08:00
Devin Howard
fd9c27c631
Merge pull request #535 from metamaps/feature/cors
...
add rack-cors; fix #531
2016-04-13 10:13:16 +08:00
Devin Howard
e27d64e643
only allow cors on api routes
2016-04-06 20:09:25 +08:00
Devin Howard
2e6f04d0be
metamaps.debug function, and move VERSION into a rails constant initializer.
...
from this commit on, we would need to modify config/initializers/version.rb to increment the version number.
2016-04-06 10:27:31 +08:00
Devin Howard
a8d0d9da09
2.8.3:
...
- add Junto sounds
- fix json import
- fix invite link
2016-04-06 10:06:37 +08:00
Devin Howard
7de642ccb2
add rack-cors; fix #531
2016-04-05 10:12:12 +08:00
Connor Turland
8a6d434fc3
Junto Sounds
...
* awesome news sounnndzzzz
* prevent double sound
* bug fixes and chat sounds on by default
2016-04-04 10:50:02 -04:00
Devin Howard
f21a3d114f
Merge pull request #529 from metamaps/fix/import-fixes
...
fix json import
2016-04-01 13:37:43 +08:00
Devin Howard
7eb8ae37ee
Merge pull request #526 from metamaps/fix/invite-link
...
fix invite link
2016-04-01 13:37:33 +08:00
Devin Howard
7d6acb7014
fix json import
2016-03-31 13:03:14 +08:00
Devin Howard
a83382efe9
Merge branch 'develop'
...
v2.8.2 - fixes import code
2016-03-31 10:11:49 +08:00
Devin Howard
b9b9e57c41
Merge pull request #528 from metamaps/fix/import-fixes
...
import fixes
2016-03-31 10:04:33 +08:00
Devin Howard
ccd07ddd19
import fixes
2016-03-31 09:25:14 +08:00
Devin Howard
a2fe1399e4
fix invite link
2016-03-29 22:34:47 +08:00
Devin Howard
c1aa7c6a92
Merge pull request #523 from metamaps/feature/production-deploy-steps
...
add production deploy/update steps (see issue #518 )
2016-03-29 10:00:00 +08:00
Devin Howard
da25dd0d9c
add production deploy/update steps (see issue #518 )
2016-03-28 10:38:24 +08:00
Raymon Johnstone
b2a4cbf3ec
Merge pull request #522 from Tadasu85/master
...
Merge pull request #1 from metamaps/master
2016-03-27 18:09:16 -04:00
Connor Turland
e1c0509c91
Merge pull request #520 from metamaps/develop
...
fix request invite
2016-03-27 12:12:26 -07:00
Connor Turland
3c03d30c08
Merge pull request #519 from metamaps/bug/requestinvite
...
request invite page was broken
2016-03-27 12:11:21 -07:00
Connor Turland
8fa856451d
request invite page was broken
2016-03-27 12:04:28 -07:00
Connor Turland
fbba487b83
Merge pull request #482 from metamaps/develop
...
merge develop into master (version 2.8!)
2016-03-27 00:43:54 -07:00
Devin Howard
8a6e702c12
fix js error
2016-03-27 15:32:18 +08:00
Devin Howard
dae3106b34
Merge pull request #509 from metamaps/feature/import.export
...
import/export tweaks
2016-03-27 15:22:17 +08:00
Connor Turland
49f4b2030e
gemfile.lock needed to change for travis to be happy
2016-03-27 00:21:32 -07:00
Devin Howard
30d327f07a
solution using backbone events instead of setTimeout
2016-03-27 15:20:09 +08:00
Connor Turland
a82b0048d8
don't need sequenced
2016-03-27 00:14:22 -07:00
Devin Howard
f9e6249615
Fix up import - want more backboney event listening though
2016-03-27 15:09:08 +08:00
Connor Turland
e4145ef9fb
Merge pull request #506 from metamaps/feature/import.export
...
minimal import/export - could go in v2.8 for the keeners
2016-03-26 23:46:28 -07:00
Devin Howard
ae9f4a51a2
fix a few embarassing errors - export is working
2016-03-26 15:53:14 +08:00
Devin Howard
53867caae8
allow JSON or TSV parsing
2016-03-26 15:03:44 +08:00
Devin Howard
92f78aa56a
update tsv code to handle new export code at the very least.
...
next step will be allowing json input too
2016-03-26 12:49:26 +08:00
Devin Howard
d3649f1d26
DRY map exporting with policy_scoping
2016-03-26 12:46:43 +08:00
Devin Howard
14bdc8546b
metacodes#show routes
2016-03-26 10:12:32 +08:00
Devin Howard
579ddcc047
Merge pull request #505 from metamaps/fix/crappy-export
...
add missing synapses_csv function (fixes #504 )
2016-03-25 16:55:05 +08:00
Devin Howard
387c863222
fix a bug with synapses and use cid to link new topics with synapses
...
Synapses are now created client-side, but still rejected server-side
2016-03-25 16:48:14 +08:00
Devin Howard
c77cc32734
import fixes
...
- better abort logic & messaging
- handle \r line delim
- better example format at top
2016-03-25 16:48:14 +08:00
Devin Howard
ea677f8a6b
DRY up csv/xls rendering, put it into model
2016-03-25 16:48:14 +08:00
Devin Howard
8f532708ce
update xls/csv format to better serialize topics and synapses
2016-03-25 16:47:35 +08:00
Devin Howard
61262aaec2
implement csv/xls export
2016-03-25 16:47:35 +08:00
Devin Howard
0c1e12a301
use state machine to implement smarter topic/synapse import
...
also include better auto-layout of new topics if x/y not specified
2016-03-25 16:46:05 +08:00
Devin Howard
b47ed7b5b4
don't ask about adding 0 topics
2016-03-25 16:46:05 +08:00
Devin Howard
6df7fa849a
bare minimum topic import functionality - use by Ctrl+V onto the map canvas itself
2016-03-25 16:46:05 +08:00
Devin Howard
6c055ea3b9
add missing synapses_csv function ( fixes #504 )
2016-03-25 16:36:05 +08:00
Connor Turland
87d6dfe8de
fix the autocomplete
2016-03-24 23:36:57 -07:00
Connor Turland
b36d5df6cb
this may make it work
2016-03-24 23:33:26 -07:00
Connor Turland
c6f1e3cc4a
breaking the mapping_policy
2016-03-24 23:29:08 -07:00
Connor Turland
fc1dc591f3
Merge branch 'copy/version.and.peers' into develop
2016-03-24 21:28:24 -07:00
Connor Turland
415c9b8ac3
final touchups on oauth
2016-03-24 21:26:07 -07:00
Connor Turland
540b35c757
Merge branch 'feature/no-cancancan' into develop
2016-03-24 20:47:35 -07:00
Connor Turland
42eea78bc4
Merge branch 'fix/typo' into develop
2016-03-24 20:47:23 -07:00
Devin Howard
530a16cadb
instantiate_resource
2016-03-25 10:26:32 +08:00
Devin Howard
34d3a80db1
use new pundit-enabled snorlax
2016-03-25 10:07:57 +08:00
Connor Turland
14dfe3c926
styling for doorkeeper and api functional
2016-03-24 17:16:27 -07:00
Raymon Johnstone
e23224aa16
Merge pull request #1 from metamaps/master
...
Syncing
2016-03-23 22:51:42 -04:00
Connor Turland
5317711b57
Merge branch 'develop' into oauth.provider
2016-03-23 18:00:59 -07:00
Connor Turland
b6fac7d49b
Merge pull request #420 from metamaps/feature/realtime.video
...
JUUUUUUUUNTOOOO
2016-03-23 17:46:35 -07:00
Connor Turland
70bc0959b0
update version, date, and peers
2016-03-23 16:52:53 -07:00
Connor Turland
c4890274f2
switch messages to use pundit
2016-03-23 16:29:26 -07:00
Connor Turland
baa5439f0f
auto position videos which haven't been manually positioned
2016-03-23 16:12:23 -07:00
Devin Howard
3bb3fa9e73
Merge pull request #493 from metamaps/feature/icon-tests
...
metacode icon tests
2016-03-22 14:22:05 +08:00
Devin Howard
b305584d5d
Merge pull request #490 from metamaps/feature/call-for-developers
...
call for developers in Inspect Element window
2016-03-22 14:21:52 +08:00
Devin Howard
cb4137c13f
Merge pull request #491 from metamaps/feature/rails-intro
...
add rails intro for newcomers
2016-03-22 14:21:38 +08:00
Connor Turland
617dec72b9
hide sound option. green 'in call' dot. tooltip
2016-03-21 13:08:34 -07:00
Connor Turland
e6ac4b1dcb
make metamaps an oauth provider
2016-03-19 13:28:55 +11:00
Devin Howard
0c3010be90
Small revisions to rails intro
2016-03-16 11:45:12 +08:00
Devin Howard
a0d38c8fb8
check https manual icons
2016-03-16 11:42:51 +08:00
Devin Howard
8b54e53743
metacode icon tests
2016-03-16 11:39:24 +08:00
Devin Howard
5ea61341eb
add rails intro for newcomers
2016-03-15 16:16:19 +08:00
Devin Howard
756fe75664
call for developers in Inspect Element window
2016-03-15 16:06:37 +08:00
Connor Turland
f055f4c7c5
Merge branch 'develop' into feature/realtime.video
2016-03-14 21:45:36 +11:00
Connor Turland
ac9460be77
do still need cancan
2016-03-14 21:44:50 +11:00
Connor Turland
1ee33b843f
Merge branch 'develop' into feature/realtime.video
2016-03-14 21:40:25 +11:00
Connor Turland
3e24a088da
Merge branch 'develop' of github.com:metamaps/metamaps_gen002 into develop
2016-03-14 21:36:57 +11:00
Connor Turland
8bd032472d
topic related things weren't working at all
2016-03-14 21:36:34 +11:00
Connor Turland
f24def8be6
fix up javascript errors
2016-03-14 21:36:16 +11:00
Connor Turland
10a5a099e7
Merge pull request #489 from metamaps/feature/fix-tests
...
fix tests
2016-03-14 18:17:25 +11:00
Devin Howard
5cb5eac9d6
Merge pull request #488 from metamaps/feature/no-cancan
...
no cancan
2016-03-14 14:44:35 +08:00
Devin Howard
a05c7dc5fe
avoid pundit error if no map specified with a mapping
2016-03-14 14:37:01 +08:00
Devin Howard
d11f3923dd
remove unused has_viewable_synapses function
2016-03-14 14:34:36 +08:00
Devin Howard
32326ff4af
update map/topic delete action test
2016-03-14 11:47:01 +08:00
Devin Howard
7716462c8f
fix topics controller test
2016-03-14 11:47:01 +08:00
Devin Howard
ee0ca3ba35
Merge pull request #487 from metamaps/feature/pundit
...
policy specs & remove old permission tests
2016-03-14 11:46:09 +08:00
Devin Howard
f7201e048e
pending mapping policy
2016-03-14 11:15:10 +08:00
Devin Howard
3823c708fd
update mapping policy
2016-03-14 11:09:27 +08:00
Devin Howard
c5009952f3
remove permissions tests
2016-03-14 11:03:30 +08:00
Devin Howard
dbb8052a17
trifecta of policy tests
2016-03-14 11:01:29 +08:00
Devin Howard
88c070cbbd
no cancan
2016-03-14 10:55:26 +08:00
Connor Turland
8664cc0bd9
Merge branch 'develop' into feature/realtime.video
2016-03-14 11:11:11 +11:00
Connor Turland
579c36ec75
ensure the search box opens
2016-03-14 11:10:18 +11:00
Connor Turland
6715ba7e7f
not a function
2016-03-14 11:03:11 +11:00
Connor Turland
604087c592
Merge branch 'develop' into feature/realtime.video
2016-03-14 10:45:16 +11:00
Connor Turland
6f5258cbb7
needed a policy for tokens
2016-03-14 08:19:26 +11:00
Connor Turland
b40fedda1a
Merge pull request #483 from harlantwood/travis
...
Run tests on Travis CI; show build status badge
2016-03-14 07:54:20 +11:00
Connor Turland
e0b2991596
Merge pull request #484 from harlantwood/token-entropy
...
more token entropy
2016-03-14 07:51:37 +11:00
Harlan T Wood
f3eb558971
fix test regex
2016-03-13 13:28:07 -07:00
Harlan T Wood
3fbb3d1dc9
more token entropy
2016-03-13 00:56:10 -08:00
Harlan T Wood
74cf9ba717
Run tests on Travis CI; show build status badge
2016-03-12 19:40:56 -08:00
Connor Turland
4f76d3914d
Merge pull request #418 from metamaps/feature/slack
...
first 2 slack events
2016-03-13 12:00:17 +11:00
Connor Turland
72b2e8f8f2
doesn't look good for now, take it out, add it later
2016-03-13 11:58:09 +11:00
Connor Turland
77d69dd2a3
turns out we do need delayed_job
2016-03-13 11:56:18 +11:00
Connor Turland
fe578ca3b2
add migrations
2016-03-13 11:24:00 +11:00
Connor Turland
d863d1c15b
remove traces of delayed_job
2016-03-13 10:42:55 +11:00
Connor Turland
11e57c1b37
rebase onto develop which now has API and pundit
2016-03-13 10:36:38 +11:00
Connor Turland
5fbf7ac34d
hide metamaps_mobile in gitignore
2016-03-13 03:16:31 +11:00
Connor Turland
b236f4c689
handle not logged in scenarios
2016-03-13 02:41:32 +11:00
Connor Turland
7ff24fb3b6
Merge pull request #481 from metamaps/feature/api
...
quietly release a token based metamaps api just for maps, topics, synapses, and mappings
2016-03-13 02:29:44 +11:00
Connor Turland
3aec00e07c
just don't include mappable for now
2016-03-13 02:28:39 +11:00
Connor Turland
f072e39c4c
pundit: sometimes no user
2016-03-13 02:27:05 +11:00
Connor Turland
ada29c6832
cleanup
2016-03-12 21:35:56 +11:00
Connor Turland
efe13dc7c0
Merge branch 'develop' into feature/api
2016-03-12 21:30:27 +11:00
Connor Turland
f58185fd40
Merge branch 'feature/pundit' into develop
2016-03-12 21:26:06 +11:00
Connor Turland
446619c451
omg not having this was breaking things
2016-03-12 13:20:15 +11:00
Connor Turland
8b8db40c67
Merge branch 'feature/pundit' into feature/api
2016-03-12 12:59:42 +11:00
Connor Turland
a295c61322
json response was broken
2016-03-12 12:58:13 +11:00
Connor Turland
e4ac5b0134
Merge branch 'feature/pundit' into feature/api
2016-03-12 12:40:11 +11:00
Devin Howard
7e7ef173e5
map policy spec
2016-03-12 09:27:31 +08:00
Connor Turland
bf4fbbeb06
fix tokens
2016-03-12 12:26:23 +11:00
Devin Howard
bb03b49d80
update main controller (searching) to use policies
2016-03-12 09:09:41 +08:00
Connor Turland
521aa6b5d0
function no longer exists
2016-03-12 11:58:26 +11:00
Connor Turland
7f86810f62
remove things again not needed
2016-03-12 11:53:12 +11:00
Connor Turland
a78312f90c
Merge branch 'feature/pundit' into feature/api.pundit
2016-03-12 11:49:41 +11:00
Connor Turland
bc505a1361
pundit: now updating maps actually works
2016-03-12 11:47:40 +11:00
Connor Turland
5d179ae5ec
pundit: policy didn't exist
2016-03-12 11:47:32 +11:00
Connor Turland
d0aecc0b31
pundit: make it work
2016-03-12 11:47:24 +11:00
Connor Turland
dc6ccd2022
pundit: fixing up topics and synapses
2016-03-12 11:47:05 +11:00
Connor Turland
1cf3182e75
pundit: exclude topic action
2016-03-12 11:46:52 +11:00
Connor Turland
bd3afff069
pundit: fix queries
2016-03-12 11:46:31 +11:00
Connor Turland
5f3f5212c5
pundit: syntax error
2016-03-12 11:46:18 +11:00
Connor Turland
2d53922f1c
can load maps
2016-03-12 11:46:01 +11:00
Connor Turland
d8c328468e
changess for pundit
2016-03-12 11:45:39 +11:00
Connor Turland
d0fd676aa0
pundit: now updating maps actually works
2016-03-12 11:35:03 +11:00
Connor Turland
fdd9351378
pundit: policy didn't exist
2016-03-12 11:24:49 +11:00
Connor Turland
cb79f2deae
pundit: make it work
2016-03-12 11:16:46 +11:00
Connor Turland
4ed00240eb
api: revert silly js change
2016-03-12 11:15:14 +11:00
Connor Turland
bef21341c6
pundit: fixing up topics and synapses
2016-03-12 11:10:30 +11:00
Connor Turland
09a7b336bf
pundit: exclude topic action
2016-03-12 10:13:22 +11:00
Connor Turland
c7075dab48
pundit: fix queries
2016-03-12 10:10:31 +11:00
Connor Turland
0095a8daf4
pundit: syntax error
2016-03-12 10:06:00 +11:00
Connor Turland
fc1a7fd23d
api: adjust serializers
2016-03-12 10:05:42 +11:00
Connor Turland
623b3c7ad7
can load maps
2016-03-12 09:54:23 +11:00
Connor Turland
77d39d6649
redid so they won't interfere
2016-03-12 09:48:07 +11:00
Connor Turland
450db5eb8d
changes for pundit
2016-03-12 09:37:32 +11:00
Connor Turland
669b337d04
changes for api
2016-03-12 09:37:18 +11:00
Connor Turland
e6017c4129
Merge remote-tracking branch 'origin/feature/pundit' into feature/api.pundit
2016-03-12 07:19:19 +11:00
Devin Howard
eb56755068
implement five policies into their controllers
2016-03-11 22:10:31 +08:00
Devin Howard
7395811ba5
handle unauthorized with baaaaad 403
2016-03-11 21:35:48 +08:00
Devin Howard
73b82801cc
consistent permissions
2016-03-11 21:32:18 +08:00
Devin Howard
615eaf580e
mapping policy
2016-03-11 21:30:54 +08:00
Devin Howard
d8cc588efb
basics of admin_override policy function
2016-03-11 21:25:24 +08:00
Connor Turland
ccfba03fdb
clean up duplicate code
2016-03-11 17:26:54 +11:00
Connor Turland
059591b78b
first pass at important API endpoints, token auth
2016-03-11 17:16:04 +11:00
Connor Turland
ef60aefe88
fix js bug
2016-03-11 07:59:22 +11:00
Connor Turland
616dc9ed0e
messages weren't being displayed in order
2016-03-01 12:55:00 +13:00
Connor Turland
26025d6ee9
store the right number of mappers in conversation
2016-03-01 12:30:49 +13:00
Connor Turland
dd457d8362
remove npm debug
2016-03-01 12:26:09 +13:00
Connor Turland
bd5c88fb0b
display initial state of call to new mapper
2016-03-01 12:25:38 +13:00
Devin Howard
2e6493fd23
Merge pull request #478 from metamaps/feature/cleanup
...
remove unneeded https stuff & more
2016-02-29 16:51:49 +08:00
Connor Turland
4e92d4c2c5
change video border width
2016-02-29 17:05:36 +13:00
Connor Turland
d50923b6bd
fix js bug
2016-02-29 17:05:11 +13:00
Connor Turland
c6fea78054
merge develop
2016-02-29 13:58:47 +13:00
Devin Howard
e64a16f1b8
main#home view simplify for only unauthenticated users
2016-02-28 18:55:48 +08:00
Devin Howard
ef5d85c2bf
before_filter => before_action
2016-02-28 17:48:35 +08:00
Devin Howard
36c5ddab1f
before_filter => before_action
2016-02-28 17:48:18 +08:00
Devin Howard
155eac41d8
@ symbols unneeded
2016-02-28 17:24:00 +08:00
Devin Howard
895b872bda
remove unneeded https stuff
2016-02-28 17:15:09 +08:00
Devin Howard
25774d9f16
remove unneeded https stuff
2016-02-28 16:57:25 +08:00
Devin Howard
cbb6b648be
implement main_policy (headless). also remove all @current references
2016-02-28 16:53:59 +08:00
Devin Howard
3ed6ffbdba
@record/@user in topic/synapse policy
2016-02-28 13:29:33 +08:00
Devin Howard
1e01ff8bc9
map policy
2016-02-28 13:28:28 +08:00
Devin Howard
cec6d3bfcd
handle pundit errors with http 403
2016-02-28 13:24:55 +08:00
Devin Howard
bc7db85c8c
update map index views
2016-02-28 13:14:34 +08:00
Devin Howard
bbc36de628
update maps spec
2016-02-28 12:30:41 +08:00
Devin Howard
8ef847bd6d
factor maps#index into 4 separate functions
2016-02-28 12:30:41 +08:00
Devin Howard
baca4aac83
synapse policy
2016-02-28 12:30:41 +08:00
Devin Howard
52facb9c1d
topic policy
2016-02-28 12:30:41 +08:00
Devin Howard
66f1d2ec0b
install pundit
2016-02-28 12:30:41 +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
Connor Turland
f9b23499dc
styling. add self to participants
2016-02-26 12:43:27 +13: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
Connor Turland
2f4b3b3761
call was ending in wrong situation
2016-02-17 13:49:48 +13:00
Connor Turland
d82288c9f2
fixed up call ending/starting events
2016-02-17 13:27:22 +13: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
Connor Turland
e29b683b38
new junto images
2016-02-09 09:14:33 +13: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
987cd7f5a0
Merge branch 'feature/xls.export' into release/v2.8
2016-02-08 09:58:09 +08:00
Devin Howard
f42b30e8b5
Merge branch 'feature/auto.synapse' into release/v2.8
2016-02-08 09:57:58 +08:00
Devin Howard
0ae8ea0ca5
implement csv/xls export
2016-02-07 13:12:18 +08:00
Devin Howard
83551e317e
create synapse if you click away from the synapse title form
2016-02-06 13:03:47 +08:00
Devin Howard
786eeae72a
Merge branch 'develop' into feature/realtime.video
2016-02-06 12:56:23 +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
Devin Howard
246c344959
add rake perms:fix task for public dir
2016-02-06 09:42:40 +08:00
Devin Howard
ea11ce69e5
update public dir, including 503.html'
2016-02-06 09:42:33 +08:00
Devin Howard
785e7dda4b
create 503.html for server maintenance
2016-02-06 09:34:51 +08:00
Devin Howard
67da49c1be
max height on search results so they scroll
2016-02-05 22:13:23 +08:00
Devin Howard
57a8b654ba
smoother 'added by me' filtering
2016-02-05 21:25:20 +08:00
Devin Howard
3fe93be987
Merge branch 'master' into develop
2016-02-05 20:21:31 +08:00
Devin Howard
ef307f1d46
Merge pull request #459 from metamaps/fix/searchbox
...
searchbox fixes for master
2016-02-05 20:20:13 +08:00
Devin Howard
cd10ee97ee
typo
2016-02-05 20:17:40 +08:00
Devin Howard
48ec4a024e
mark 2.7.1
2016-02-05 20:12:05 +08:00
Devin Howard
6b9aa52224
well, the loading icon mostly works now too
2016-02-05 20:09:00 +08:00
Devin Howard
5f90843da2
gross, but it works. checkboxes in search results work
2016-02-05 20:02:57 +08:00
Devin Howard
c427e7fd7e
mess with typeahead(val) calls. looks like the header is being destroyed during suggestion rendering, need a variable
2016-02-05 19:54:38 +08:00
Devin Howard
353872001f
vertical align no results
2016-02-05 19:21:09 +08:00
Devin Howard
aabdaaf21b
nicer icon positioning
2016-02-05 19:19:16 +08:00
Devin Howard
f1f56f9286
centre topic icons if there are results
2016-02-05 19:11:19 +08:00
Devin Howard
461b62628d
fix minimizing search results
2016-02-05 19:06:57 +08:00
Devin Howard
3405bf5942
fix the problem where it always closes on you
2016-02-05 18:56:16 +08:00
Devin Howard
a05fe70eda
topic headers on resultnoresults
2016-02-05 18:35:45 +08:00
Devin Howard
b3d321c7e9
topic icon <--
2016-02-05 18:27:26 +08:00
Devin Howard
27e5830c4f
move configure.sh into bin folder
2016-02-05 18:12:25 +08:00
Devin Howard
ed88445c6b
update configure.sh
2016-02-05 18:12:00 +08:00
Devin Howard
821966c5db
update schema.rb
2016-02-05 18:11:35 +08:00
Devin Howard
9a68a2d3c1
jenkins ruby versioning smarter
2016-02-05 18:02:30 +08:00
Devin Howard
8202fb38f3
Merge branch 'develop' into feature/realtime.video
2016-02-05 16:27:43 +08:00
Devin Howard
f2cbde50ca
dos2unix on the whole repo
2016-02-05 11:43:15 +08:00
Devin Howard
3e28831595
Merge branch 'develop' into feature/realtime.video
2016-02-05 11:38:19 +08:00
Devin Howard
c80efac7de
tag v2.8
2016-02-05 11:37:33 +08:00
Devin Howard
a1d2ef70b9
Merge pull request #451 from metamaps/feature/contributing.md.updates
...
Update CONTRIBUTING.md
2016-02-05 11:35:42 +08:00
Devin Howard
85290d0e70
Update CONTRIBUTING.md
2016-02-05 11:33:33 +08:00
Devin Howard
b43804bf80
Merge pull request #421 from metamaps/develop
...
Upgrade to Rails 4
2016-02-05 11:31:24 +08:00
Devin Howard
e73ade0442
tag v2.7
2016-02-05 11:29:05 +08:00
Devin Howard
9a548e261b
Merge branch 'master' into develop
2016-02-04 18:10:07 +08:00
poietic
c8d6563f45
changed links from old uservoice url.
...
links to support forum were pointed towards our expired custom domain
from service, renamed them all so that they link up.
2016-01-29 16:00:30 -08:00
Devin Howard
5ec77b44cd
add develop branch build status badge
2016-01-26 18:57:32 +08:00
Devin Howard
38f46bd8c4
add jenkins-test.sh script
2016-01-26 17:04:32 +08:00
Connor Turland
8e07c10ecc
make sure the chat pane is closed for opening the next map
2016-01-26 15:29:32 +13:00
Connor Turland
1fa84e0d29
chat only displays on maps
2016-01-26 14:46:26 +13:00
Connor Turland
b80fabcbcf
was just old copied code not a file in use
2016-01-26 14:14:33 +13:00
Devin Howard
c9ebfee968
default branch to develop in README.md
2016-01-25 17:19:53 +08:00
Devin Howard
8a74118cb1
Merge branch 'develop' into feature/realtime.video
2016-01-25 11:23:32 +08:00
Devin Howard
79431f8515
fix user seeds
2016-01-25 11:23:10 +08:00
Connor Turland
74d372b942
fix the scrolling in the chat messages box
2016-01-22 16:49:50 +13:00
Connor Turland
5d838303a8
broken gemfile.lock and pass recent migrations
2016-01-22 16:14:35 +13:00
Connor Turland
4557b8e305
merge develop
2016-01-22 14:59:09 +13:00
Devin Howard
cbd82b92fe
Merge branch 'develop' of https://github.com/metamaps/metamaps_gen002 into develop
2016-01-20 10:19:03 +08:00
Devin Howard
8a8ac92a8f
data safety
2016-01-20 10:18:44 +08:00
Devin Howard
0e7690f2af
fix metacode asset path update db migration
2016-01-20 10:18:22 +08:00
Devin Howard
31f5d464f1
S3_BUCKET_NAME in .example-env
2016-01-19 22:14:35 +08:00
Devin Howard
3aea952e40
Merge branch 'develop' of https://github.com/metamaps/metamaps_gen002 into develop
2016-01-19 14:27:33 +08:00
Devin Howard
14a292331b
two tweaks to help production deploy
2016-01-19 14:27:25 +08:00
Devin Howard
1e010c69c2
doc formatting
2016-01-17 10:17:02 +08:00
Devin Howard
c2a2fe4997
better readme for realtime server
2016-01-17 10:14:19 +08:00
Connor Turland
11fc7a01f3
fixes the issue where video feeds go black after first call
2016-01-09 16:11:28 +13:00
Connor Turland
fe76f340a0
change to the db name causes local dev issues
...
this should just remain similar to what it used to be
2016-01-09 12:10:33 +13:00
Devin Howard
678ec1bbab
Update windows installer docs
2016-01-08 08:21:28 +08:00
mix irving
f3400d4654
install dotenv to help managed env vars
2016-01-08 08:21:28 +08:00
Devin Howard
0e7b01296a
dotenv.load in application.rb now
2016-01-08 08:19:46 +08:00
Devin Howard
1c0f6f2e2a
don't put RAILS_ENV into the .env file - chicken and egg
...
see https://github.com/bkeepers/dotenv/issues/19 for more info
2016-01-07 18:47:58 +08:00
Devin Howard
da03d59d46
comment out uninitialized variables
2016-01-07 18:36:37 +08:00
Devin Howard
e21096f00a
initializers for .env
2016-01-07 18:34:24 +08:00
Devin Howard
c6b0ccdbdb
database name configurable in .env
2016-01-07 18:29:15 +08:00
Devin Howard
a06a80eb43
Merge pull request #456 from metamaps/feature/rspec-tests
...
rspec tests
2016-01-07 16:09:40 +08:00
Devin Howard
4be263c223
prominence to rspec command
2016-01-07 16:06:35 +08:00
Devin Howard
4842856358
merge develop into rspec-tests
2016-01-07 16:04:23 +08:00
Devin Howard
4a1e4ef333
refactor user factories to handle codes better
2016-01-07 15:47:45 +08:00
Devin Howard
4469b29ec2
in user model
2016-01-07 15:32:19 +08:00
Devin Howard
61d914caba
80 columns on RspecTesting.md
2016-01-07 15:32:11 +08:00
Devin Howard
8550b68290
Merge branch 'feature/rspec-tests' of https://github.com/metamaps/metamaps_gen002 into feature/rspec-tests
2016-01-07 15:23:25 +08:00
Devin Howard
f4b2e34627
Merge pull request #455 from metamaps/feature/dotenv-for-reals
...
dotenv for reals
2016-01-07 12:10:47 +08:00
Devin Howard
7d7003a1bc
get more hard headed about having development values in .example-env
2016-01-06 23:16:34 +08:00
Devin Howard
bf21dcc3e6
merge develop into rspec tests
2016-01-06 23:03:34 +08:00
Devin Howard
3cdab531a6
move more config into .example-env
2016-01-06 22:57:01 +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
Devin Howard
062522bfdc
remove unnecessary step from windows docs
2016-01-06 11:25:55 +08:00
Devin Howard
75d9339010
make mapping polymorphism migration handle mapping problems
2016-01-06 10:23:01 +08:00
Devin Howard
21aba2fe5e
more modular database.yml.default
2015-12-24 16:36:58 +08:00
Devin Howard
844a52fc52
Merge pull request #450 from metamaps/feature/fix-searchbox
...
fix searchbox
2015-12-24 15:44:12 +08:00
Devin Howard
40561c629a
fix handleResultClick on search box
2015-12-24 15:42:51 +08:00
Devin Howard
a45d0f7791
fix search box on authenticated homepage
2015-12-24 15:19:03 +08:00
Connor Turland
6db91ea703
broken funnnnnction
2015-12-23 11:34:52 +08:00
Connor Turland
26bc04262a
broken funnnnnction
2015-12-22 22:28:03 -05:00
Connor Turland
5ad1504494
handle socketio reconnect situation
2015-12-22 18:05:13 -05:00
Connor Turland
64283850e3
add junto spinner for call in progress
2015-12-22 17:46:19 -05:00
Connor Turland
dfc94b4079
fix up styling on chat text input
2015-12-22 16:34:30 -05:00
Connor Turland
49dd2f2e92
merge develop
2015-12-22 13:16:03 -05:00
Connor Turland
8d85f8d308
videos positioning decently. chats loading more smoothly
2015-12-22 12:43:50 -05:00
Devin Howard
8394e0ce86
re-add regular uservoice code
2015-12-22 07:13:26 +08:00
Devin Howard
c58b2c805e
syntax error
2015-12-21 21:38:02 +08:00
Devin Howard
d96e991de3
don't use // for heroku either
2015-12-21 21:29:15 +08:00
Devin Howard
6e10b4c508
make use of realtime.metamaps.cc server
2015-12-21 21:28:18 +08:00
Devin Howard
914ff46bb9
syntax error in development.rb
2015-12-21 11:40:30 +08:00
Devin Howard
7ea91273c8
remove random string spec helper function in favour of factory girl sequences
2015-12-21 10:59:20 +08:00
Devin Howard
61c03e2736
Merge pull request #448 from metamaps/feature/https-preparation
...
https preparation
2015-12-21 10:18:46 +08:00
Devin Howard
603b9dc52e
remove uservoice code
2015-12-21 10:16:51 +08:00
Devin Howard
9a7ef25afc
Merge branch 'develop' into feature/https-preparation
2015-12-20 22:28:43 +08:00
Devin Howard
888edae6f6
finish remove asset_path_icon whoops
2015-12-20 22:28:05 +08:00
Devin Howard
c79a5f0072
Merge branch 'develop' into feature/https-preparation
2015-12-20 22:24:47 +08:00
Devin Howard
96ec672779
Merge branch 'develop' into feature/rspec-tests
2015-12-20 22:24:39 +08:00
Devin Howard
df485002b1
remove redundant asset_path_icon function
2015-12-20 22:22:01 +08:00
Devin Howard
7930f1a216
one test in metacode spec
2015-12-20 22:20:51 +08:00
Devin Howard
fe8794e814
fix topic spec
2015-12-20 22:18:40 +08:00
Devin Howard
f85bf74b2e
synapse desc validation
2015-12-20 21:55:10 +08:00
Devin Howard
d33f4bffb1
typekit https
2015-12-20 20:19:24 +08:00
Devin Howard
f35d4d51a9
s3 over https by default
2015-12-20 20:19:09 +08:00
Devin Howard
e2bf1d5eb1
try to make metamaps more tls friendly
2015-12-20 18:36:57 +08:00
Devin Howard
c7f7fa1d1b
reorganize synapse spec pendingness
2015-12-18 09:35:56 +08:00
Devin Howard
63e4939592
remove TODO
2015-12-18 09:35:40 +08:00
Devin Howard
6bb8ac7e1f
fix dumb errors - only 2 topic specs fail now
2015-12-18 09:33:16 +08:00
Devin Howard
ca282f7879
topic spec owner
2015-12-18 09:28:28 +08:00
Devin Howard
d2680fd9f3
permissions on synapse spec
2015-12-18 09:28:20 +08:00
Devin Howard
acd048bd0d
can't properly use rspec on a boolean field validation
2015-12-18 09:28:08 +08:00
Devin Howard
4b22a856c3
synapse spec
2015-12-18 09:26:15 +08:00
Devin Howard
a4c309a677
finish topic spec
2015-12-18 09:26:07 +08:00
Devin Howard
c4be57e525
topic and synapse validate permission
2015-12-18 09:25:54 +08:00
Devin Howard
cf6411988d
topic spec - need to add permissions and fix 2 failing tests
2015-12-17 23:45:38 +08:00
Devin Howard
9522c30273
finish map spec permissions
2015-12-17 23:20:53 +08:00
Devin Howard
006acac6b5
remove redundant authorize_to_view function
2015-12-17 23:20:19 +08:00
Devin Howard
d5f66487b7
update map spec - add authorize_to_delete. TODO: add other map authorize specs
2015-12-17 09:44:48 +08:00
Devin Howard
9e4a7b821f
cleanup topic model a bit
2015-12-17 09:34:49 +08:00
Devin Howard
86b79c1e55
add brief testing docs
2015-12-17 09:34:34 +08:00
Devin Howard
696bac17e6
map spec
2015-12-17 09:16:02 +08:00
Devin Howard
2525a6fb65
add permission service, refactor map model a bit, add validations
2015-12-17 09:10:52 +08:00
Devin Howard
bfd4e4f228
add permission service, add validations to map.rb
2015-12-17 09:03:51 +08:00
Devin Howard
b3ba6d3a80
add shoulda-matchers gem
2015-12-17 08:53:45 +08:00
Devin Howard
1ff235f547
who needs routing specs bah
2015-12-16 22:36:41 +08:00
Devin Howard
4dbff85443
default value if no request.env in application controller passes the rspec test woot. Only 80 more tests to implement
2015-12-16 22:36:12 +08:00
Devin Howard
a93473f2c9
rubocop spec folder
2015-12-16 22:33:29 +08:00
Devin Howard
846d04dd0d
rubocop style updates
2015-12-16 22:19:58 +08:00
Devin Howard
ae1117338a
set up devise authentication more srsly. Still doesn't pass the test though haha
2015-12-16 22:16:02 +08:00
Devin Howard
be3924aa54
setup bare minimum devise authentication in tests
2015-12-16 21:32:50 +08:00
Devin Howard
6148f55e1c
handle nil unsafe_uri in app conttroller function
2015-12-16 21:05:18 +08:00
Devin Howard
235d4f6c24
remove unneeded NEW tests, fix test.rb environment
2015-12-15 22:33:48 +08:00
Devin Howard
229b7d2cc5
Merge branch 'develop' into feature/rspec-tests
2015-12-15 22:12:30 +08:00
Devin Howard
b2aa2074a7
update generation calcuation code, incl. fix user signup bug
2015-12-15 12:33:22 +08:00
Connor Turland
a905094d4d
inviting, joining, and leaving conversations
2015-12-14 02:28:13 -05:00
Connor Turland
8b090be0b3
convert to something more 'call' style
2015-12-12 19:00:51 -05:00
Connor Turland
be2997d7e4
fix bad tooltip placement
2015-12-12 11:31:54 -05:00
Connor Turland
eec7dcb9c3
make the messages box fill up all available space
2015-12-11 19:18:53 -05:00
Connor Turland
56e3fc753a
use asset_path for link to sound files
2015-12-11 19:15:18 -05:00
Connor Turland
20aa78208e
rename junto to erb file
2015-12-11 18:49:22 -05:00
Connor Turland
6c7ba76937
update to https for sockets
2015-12-11 18:45:51 -05:00
Connor Turland
92ddbbaf4f
remove metacode asset path migration
2015-12-11 18:10:53 -05:00
Connor Turland
5f1ef5f5c8
remove extra code
2015-12-11 18:10:38 -05:00
Connor Turland
3c9d722945
accept or reject video offers
2015-12-11 17:29:17 -05:00
Connor Turland
089528c46d
great progress
2015-12-11 14:23:41 -05:00
Devin Howard
1597665be5
merge develop with rails4 stuff
2015-12-07 13:58:42 +08:00
Devin Howard
b037c84f15
fix small error in user model
...
need to use the parent's generation to calculate generation!
2015-12-07 11:44:08 +08:00
Connor Turland
2929547736
position the chat box, and remove the old junto panel
2015-12-03 17:15:15 -05:00
Connor Turland
b958c6ff89
removed precompiled assets
2015-12-03 17:15:15 -05:00
Connor Turland
75554d58bf
temp
2015-12-03 17:15:15 -05:00
Devin Howard
fa67ec0444
update Gemfile for rails 4
2015-12-03 17:14:04 -05:00
Devin Howard
519342a468
fix filter bug
2015-12-03 16:58:21 -05:00
Devin Howard
31fceab45d
search box css fixes
2015-12-03 16:58:21 -05:00
Devin Howard
47a7e161ee
fix error with mapper search rendering
2015-12-03 16:58:21 -05:00
Devin Howard
7336c262e3
fix up user model json output function
2015-12-03 16:58:21 -05:00
Devin Howard
48ea29b13e
refactor search css into scss for clearer organization, plus do some fixes to the typeahead css
2015-12-03 16:58:20 -05:00
Devin Howard
38662fcda8
split search css out into its own file
2015-12-03 16:58:20 -05:00
Devin Howard
d3814708a9
gc tuning
2015-12-03 16:58:20 -05:00
Devin Howard
9575a62e67
add .ruby-gemset file - you may need to reinstall gems if using rvm
2015-12-03 16:58:20 -05:00
Devin Howard
cde6eaa564
Update windows installer docs
2015-12-03 16:58:20 -05:00
Devin Howard
7db75b8d6d
more fixes
2015-12-03 16:57:30 -05:00
Devin Howard
43624caf88
get autocomplete working again with new typeahead.js, but not the CSS
2015-12-03 16:57:30 -05:00
Devin Howard
4139c2c84a
syntax error
2015-12-03 16:57:30 -05:00
Connor Turland
53d7ccab56
fix cannot set readonly property highlight
2015-12-03 16:57:30 -05:00
Connor Turland
5b0e7ffcde
switching metacode sets was being caught by Metamaps.Router.intercept
2015-12-03 16:57:30 -05:00
Connor Turland
5f14601c74
styling of the vertical tab selectors needed improvement
2015-12-03 16:57:30 -05:00
Connor Turland
1b60927641
had to update because jquery ui version changed
2015-12-03 16:57:30 -05:00
Connor Turland
dcbe24bb7e
getting uploads working
...
followed what it said to do here: http://stackoverflow.com/questions/28374401/nameerror-uninitialized-constant-paperclipstorages3aws
2015-12-03 16:57:30 -05:00
Devin Howard
67d4a2aa34
sandi metz function simplification
2015-12-03 16:57:30 -05:00
Devin Howard
520fe095bd
fix #465 , metacode sort problem
2015-12-03 16:57:29 -05:00
Connor Turland
87389a88ed
current_user can be nil
2015-12-03 16:57:29 -05:00
Devin Howard
f8814c060f
reorganize documentation
2015-12-03 16:57:29 -05:00
Devin Howard
1874c67a66
reorganize metamaps-qa-steps a bit
2015-12-03 16:57:29 -05:00
Devin Howard
75700f06a9
make invite link use REQUEST_URI
2015-12-03 16:57:29 -05:00
Devin Howard
3e03e64845
css fixes for heroku
2015-12-03 16:57:29 -05:00
Devin Howard
f4456d06ef
fix devise integration for rails 4
2015-12-03 16:57:29 -05:00
Devin Howard
dfaadc691e
update WindowsInstallation.md
2015-12-03 16:57:29 -05:00
Devin Howard
20e698f69d
devise locale text
2015-12-03 16:57:29 -05:00
Devin Howard
506f93e144
Gemfile.lock
2015-12-03 16:57:29 -05:00
Devin Howard
6df2f22080
update devise.rb with new changes
2015-12-03 16:57:29 -05:00
Devin Howard
3674aefb04
remove secrets.yml stuff because it doesn't work with heroku
2015-12-03 16:57:29 -05:00
Devin Howard
10b58399a7
ok put ruby back in Gemfile'
2015-12-03 16:57:28 -05:00
Devin Howard
ede4e7a509
fix references to Rails.application.secrets
2015-12-03 16:57:28 -05:00
Devin Howard
570fa931b7
use secrets.yml to allow overriding config variables
2015-12-03 16:57:28 -05:00
Devin Howard
dd02129b0d
remove ruby from Gemfile in favour of .ruby-version
2015-12-03 16:57:28 -05:00
Devin Howard
d99ed6b627
migrate metacodes that started with /assets/icons to use amazonaws urls. Remove last migration I made
2015-12-03 16:57:28 -05:00
Connor Turland
d8da2d93fd
updated files to use amazon assets
2015-12-03 16:57:28 -05:00
Devin Howard
8e427ea8f2
add secrets.yml.default
2015-12-03 16:57:28 -05:00
Devin Howard
2cbf1cad7f
fix
2015-12-03 16:57:28 -05:00
Devin Howard
4b6e33f983
does this fix missing-map.png?
2015-12-03 16:57:28 -05:00
Devin Howard
204544dc22
metacode asset_path calls
2015-12-03 16:57:28 -05:00
Devin Howard
f0c0dc48d8
add highlight to typeahead
2015-12-03 16:57:28 -05:00
Devin Howard
0b96171aa3
bugfix
2015-12-03 16:57:27 -05:00
Devin Howard
4245703084
see if we can make missing-map.png show up
2015-12-03 16:57:27 -05:00
Devin Howard
89424dcd7f
try to fix custom metacode icon path
2015-12-03 16:57:27 -05:00
Devin Howard
f63a242256
whoops again
2015-12-03 16:57:27 -05:00
Devin Howard
47205883a9
whoops
2015-12-03 16:57:27 -05:00
Devin Howard
f4987bffc0
change css files to use asset_data_uri
2015-12-03 16:57:27 -05:00
Devin Howard
684dcd8d33
only run metacode.icon through asset_path if the path doesn't start with http
2015-12-03 16:57:27 -05:00
Devin Howard
bdb5623a02
woot fix metacodes
2015-12-03 16:57:27 -05:00
Devin Howard
60898fadb2
binding_of_caller gem for devel debug
2015-12-03 16:57:27 -05:00
Devin Howard
d8dffad38a
metacodes#index map in asset_path
2015-12-03 16:57:27 -05:00
Devin Howard
a972074306
environment assets config
2015-12-03 16:57:27 -05:00
Devin Howard
bd60f68cfe
try to compile but not compress assets
2015-12-03 16:57:26 -05:00
Devin Howard
96f5e6ac35
add asset_path calls
2015-12-03 16:57:26 -05:00
Devin Howard
d3080906b1
add db migration to remove asset paths from metacodes
2015-12-03 16:57:26 -05:00
Devin Howard
29411cf1e5
asset_path
2015-12-03 16:57:26 -05:00
Devin Howard
c782c4d0bb
remove binding.pry
2015-12-03 16:57:26 -05:00
Devin Howard
52b37e7ac6
asset_path in css erb files
2015-12-03 16:57:26 -05:00
Devin Howard
6a21b84a23
resume ignoring public/assets
2015-12-03 16:57:26 -05:00
Devin Howard
d52caac1d6
add indexes to schema
2015-12-03 16:57:26 -05:00
Devin Howard
4d7f509235
change some css to erb
2015-12-03 16:57:26 -05:00
Devin Howard
b9ac614057
asset_path doesn't work in models
2015-12-03 16:57:26 -05:00
Devin Howard
cef83e1f3d
asset_path
2015-12-03 16:57:26 -05:00
Devin Howard
2505ce36a5
syntax
2015-12-03 16:57:25 -05:00
Devin Howard
235aa7a6b3
convert javascript to asset_path syntax
2015-12-03 16:57:25 -05:00
Devin Howard
6e9b0ac9ef
rename js files to js.erb files
2015-12-03 16:57:25 -05:00
Devin Howard
3f5404b043
add missing indexes for speed
2015-12-03 16:57:25 -05:00
Devin Howard
53d77a0e5b
fix migration for heroku
2015-12-03 16:57:25 -05:00
Devin Howard
5b882b1332
pry byebug
2015-12-03 16:57:25 -05:00
Devin Howard
566a0a3aa6
brute force prevent nil synapse descriptions
2015-12-03 16:57:25 -05:00
Devin Howard
617fe43f71
fix problem with mappings and forking maps
2015-12-03 16:57:25 -05:00
Devin Howard
1453a3c181
function naming
2015-12-03 16:57:25 -05:00
Devin Howard
840484178b
fix mapping problem
2015-12-03 16:57:25 -05:00
Devin Howard
ae16f8f08d
fix a few more mappable/topic/synapse things in JS
2015-12-03 16:57:24 -05:00
Devin Howard
3e8c971155
change from category/topic_id/synapse_id to mappable_type/mappable_id
2015-12-03 16:57:24 -05:00
Devin Howard
5dc53543f7
migrate to polymorphic mappings - DB MIGRATION
2015-12-03 16:57:24 -05:00
Devin Howard
a4f910b66d
bg color on EXisting synapses heading
2015-12-03 16:57:24 -05:00
Devin Howard
379b37b445
fix typo + debug statements to make existingSynapse autocomplete work
2015-12-03 16:57:24 -05:00
Devin Howard
675bcadda0
deal with https://github.com/twitter/typeahead.js/issues/1195
2015-12-03 16:57:24 -05:00
Devin Howard
a7e512e25a
working version of autocomplete that includes the new typeahead.js syntax. So much more complicated than before...
2015-12-03 16:57:24 -05:00
Devin Howard
bd9c275ada
upgrade typeahead to 1.10 and new syntax
2015-12-03 16:57:24 -05:00
Devin Howard
4bc03e3d2a
code tweaks to searchsynapses
2015-12-03 16:57:24 -05:00
Devin Howard
ff48b2456a
Revert "upgrade typeahead to allow new syntax"
...
This reverts commit 347d77df82
.
2015-12-03 16:57:24 -05:00
Devin Howard
8826dfdcf6
upgrade typeahead to allow new syntax
2015-12-03 16:57:24 -05:00
Devin Howard
e5c83a2a0c
dependent destroy models for topics/maps/synapses on mappings
2015-12-03 16:57:23 -05:00
Devin Howard
0a63b5e79a
fiddle with Gemfile
2015-12-03 16:57:23 -05:00
Devin Howard
b743476115
add qa steps file first draft
2015-12-03 16:57:23 -05:00
Devin Howard
b395bd0b50
replace the obvious spots with asset_path
2015-12-03 16:57:23 -05:00
Connor Turland
1a01d3b568
configuration for production environments like heroku
2015-12-03 16:57:23 -05:00
Connor Turland
8b7ec73f48
this enables the vagrant port forwarding
2015-12-03 16:57:23 -05:00
Devin Howard
50d9866939
fix problem with join route
2015-12-03 16:57:23 -05:00
Devin Howard
95e1806500
cancan => cancancan
2015-12-03 16:57:23 -05:00
Devin Howard
2369c9ce5e
select metacodes with one query instead of n queries, move logic to application_helper
2015-12-03 16:57:23 -05:00
Devin Howard
7c28070978
fix other controllers needing create/update changed for rails 4
2015-12-03 16:57:23 -05:00
Devin Howard
919fc0a60f
fiddle with topic and mapping controllers so they work again
2015-12-03 16:57:23 -05:00
Devin Howard
e34b5bd2ad
fix best in place deprecation warnings in map info box
2015-12-03 16:57:22 -05:00
Devin Howard
7877e5bdbc
delete_if threw errors, so convert things to arrays for it
2015-12-03 16:57:22 -05:00
Devin Howard
d4f72bac65
whoo new gems for development. binding.pry is so cool
2015-12-03 16:57:22 -05:00
Devin Howard
7d738b7abf
fix map/mapping associations that I broke
2015-12-03 16:57:22 -05:00
Devin Howard
e9cb8561fa
add required params to all controllers
2015-12-03 16:57:22 -05:00
Devin Howard
32311e3610
fix has_many relationships in map & mapping models for rails 4
2015-12-03 16:57:22 -05:00
Devin Howard
8bf2eb31f3
remove old jquery-ui file
2015-12-03 16:57:22 -05:00
Devin Howard
7b199983d8
add jquery_ui to gemfile
2015-12-03 16:57:22 -05:00
Devin Howard
371851cb89
remove attr_accessible
2015-12-03 16:57:22 -05:00
Devin Howard
13b70be653
secret_token => secret_key_base
2015-12-03 16:57:22 -05:00
Devin Howard
61159dc44c
remove match method from routes.rb
2015-12-03 16:57:22 -05:00
Devin Howard
558ced62a8
asset precompiling simpler in rails 4
2015-12-03 16:57:22 -05:00
Devin Howard
62e96d574c
some config changes for rails 4 found on the Internet
2015-12-03 16:57:21 -05:00
Devin Howard
562dd17b36
update Gemfile for rails 4
2015-12-03 16:57:21 -05:00
Connor Turland
3b89a2a13f
Merge pull request #440 from metamaps/feature/fix.fork.filter.bug
...
fix filter bug
2015-11-30 11:10:57 -05:00
Devin Howard
8425e72101
fix filter bug
2015-11-30 10:01:33 +08:00
Devin Howard
8505d26182
search box css fixes
2015-11-28 23:03:48 +08:00
Devin Howard
6b6ad1b660
fix error with mapper search rendering
2015-11-28 22:07:57 +08:00
Devin Howard
3aaf501b03
fix up user model json output function
2015-11-28 21:51:28 +08:00
Devin Howard
9afc8bc7c4
refactor search css into scss for clearer organization, plus do some fixes to the typeahead css
2015-11-28 21:40:09 +08:00
Devin Howard
98e11c0a7d
split search css out into its own file
2015-11-28 20:17:14 +08:00
Devin Howard
45e09a27bd
gc tuning
2015-11-25 11:59:56 +08:00
Devin Howard
d3d0c97e7e
add .ruby-gemset file - you may need to reinstall gems if using rvm
2015-11-23 18:22:34 +08:00
Devin Howard
94412b21d2
merge documentation changes
2015-11-23 09:54:36 +08:00
Devin Howard
f58412b715
Update windows installer docs
2015-11-20 14:34:05 +08:00
Devin Howard
1f82238362
more fixes
2015-11-08 23:14:53 +08:00
Devin Howard
7136f46ec3
get autocomplete working again with new typeahead.js, but not the CSS
2015-11-08 22:53:34 +08:00
Devin Howard
fe0d38ec67
syntax error
2015-11-07 01:34:08 +08:00
Connor Turland
53de063bfc
fix cannot set readonly property highlight
2015-11-07 01:33:18 +08:00
Connor Turland
03ab04050d
switching metacode sets was being caught by Metamaps.Router.intercept
2015-11-07 01:33:18 +08:00
Connor Turland
3216106660
styling of the vertical tab selectors needed improvement
2015-11-07 01:33:18 +08:00
Connor Turland
e29ab4bca3
had to update because jquery ui version changed
2015-11-07 01:33:18 +08:00
Connor Turland
1bbaa47b80
getting uploads working
...
followed what it said to do here: http://stackoverflow.com/questions/28374401/nameerror-uninitialized-constant-paperclipstorages3aws
2015-11-07 01:33:18 +08:00
Devin Howard
fa017a8559
sandi metz function simplification
2015-11-06 17:08:42 +08:00
Devin Howard
7ec7f9f892
fix #465 , metacode sort problem
2015-11-04 17:22:46 +08:00
Connor Turland
86c467b2f1
current_user can be nil
2015-11-04 00:14:14 -05:00
Devin Howard
3eff850336
reorganize documentation
2015-11-04 11:41:04 +08:00
Devin Howard
6f8c18cd46
reorganize metamaps-qa-steps a bit
2015-11-04 11:40:52 +08:00
Devin Howard
660ee52292
make invite link use REQUEST_URI
2015-11-03 22:22:53 +08:00
Devin Howard
8b456f5a31
css fixes for heroku
2015-11-03 21:10:05 +08:00
Devin Howard
62ae38e70d
fix devise integration for rails 4
2015-11-03 20:56:50 +08:00
Devin Howard
d9133b1e29
update WindowsInstallation.md
2015-11-03 19:10:21 +08:00
Devin Howard
9613145e99
devise locale text
2015-11-02 00:07:52 +08:00
Devin Howard
5b4bd9724b
Gemfile.lock
2015-11-02 00:06:12 +08:00
Devin Howard
c86422dc68
update devise.rb with new changes
2015-11-02 00:05:57 +08:00
Devin Howard
6487202e6f
remove secrets.yml stuff because it doesn't work with heroku
2015-10-30 14:30:24 +08:00
Devin Howard
8e19083035
ok put ruby back in Gemfile'
2015-10-30 14:21:47 +08:00
Devin Howard
e2a8e0331d
fix references to Rails.application.secrets
2015-10-30 14:18:50 +08:00
Devin Howard
8e1ae0a1fc
use secrets.yml to allow overriding config variables
2015-10-29 16:23:41 +08:00
Devin Howard
cda76a4bae
remove ruby from Gemfile in favour of .ruby-version
2015-10-29 16:18:06 +08:00
Devin Howard
ddce6ad95c
migrate metacodes that started with /assets/icons to use amazonaws urls. Remove last migration I made
2015-10-28 14:24:52 +08:00
Connor Turland
6e79b58e16
updated files to use amazon assets
2015-10-27 21:46:07 -07:00
Devin Howard
6f518be51d
rspec tests rails4 Gemfile.lock
2015-10-27 18:23:25 +08:00
Devin Howard
6c4620afa6
more qa
2015-10-27 18:21:46 +08:00
Devin Howard
5c813beafe
merge
2015-10-27 18:20:12 +08:00
Devin Howard
12c6765f8b
add secrets.yml.default
2015-10-27 18:17:04 +08:00
Devin Howard
eea2bf30df
fix
2015-10-27 18:16:35 +08:00
Devin Howard
43c851e6b4
does this fix missing-map.png?
2015-10-26 21:12:18 +08:00
Devin Howard
5ce460e967
metacode asset_path calls
2015-10-26 21:04:07 +08:00
Devin Howard
9916975e2e
add highlight to typeahead
2015-10-26 21:01:13 +08:00
Devin Howard
fb848b29d5
bugfix
2015-10-26 20:41:37 +08:00
Devin Howard
9d6372c7b9
see if we can make missing-map.png show up
2015-10-26 20:16:49 +08:00
Devin Howard
b0327da649
try to fix custom metacode icon path
2015-10-26 18:28:25 +08:00
Devin Howard
20f4497064
whoops again
2015-10-26 12:39:40 +08:00
Devin Howard
06d06f8f55
whoops
2015-10-26 12:27:22 +08:00
Devin Howard
6c27623b80
change css files to use asset_data_uri
2015-10-26 12:22:40 +08:00
Devin Howard
6b8686c4e2
only run metacode.icon through asset_path if the path doesn't start with http
2015-10-26 12:12:07 +08:00
Devin Howard
6d4481979f
woot fix metacodes
2015-10-26 11:53:54 +08:00
Devin Howard
3440826d51
binding_of_caller gem for devel debug
2015-10-26 11:53:50 +08:00
Devin Howard
0dbb37eaa4
metacodes#index map in asset_path
2015-10-25 17:14:56 +08:00
Devin Howard
e40f6ededc
environment assets config
2015-10-25 17:09:57 +08:00
Devin Howard
ac0faae843
try to compile but not compress assets
2015-10-25 16:51:47 +08:00
Devin Howard
fcd866c05e
add asset_path calls
2015-10-25 16:50:07 +08:00
Devin Howard
9de4492f04
add db migration to remove asset paths from metacodes
2015-10-25 16:37:45 +08:00
Devin Howard
da98a53a3e
asset_path
2015-10-23 23:56:29 +08:00
Devin Howard
b00784731b
remove binding.pry
2015-10-23 23:42:21 +08:00
Devin Howard
46dd54a1d7
asset_path in css erb files
2015-10-23 23:34:18 +08:00
Devin Howard
72e67c188a
resume ignoring public/assets
2015-10-23 23:23:23 +08:00
Devin Howard
e572389c49
add indexes to schema
2015-10-23 23:22:54 +08:00
Devin Howard
1670235172
change some css to erb
2015-10-23 23:19:25 +08:00
Devin Howard
837abbe9ee
asset_path doesn't work in models
2015-10-23 23:09:14 +08:00
Devin Howard
d539846c61
asset_path
2015-10-23 23:06:24 +08:00
Devin Howard
2e51c3c118
syntax
2015-10-23 23:01:02 +08:00
Devin Howard
b070bb9e46
convert javascript to asset_path syntax
2015-10-23 22:56:09 +08:00
Devin Howard
ad47275f72
rename js files to js.erb files
2015-10-23 22:51:16 +08:00
Devin Howard
e078b59503
add missing indexes for speed
2015-10-23 22:38:42 +08:00
Devin Howard
582ef63635
fix migration for heroku
2015-10-23 22:32:09 +08:00
Devin Howard
dc66ac10a9
pry byebug
2015-10-23 22:27:33 +08:00
Devin Howard
96871cadab
brute force prevent nil synapse descriptions
2015-10-23 22:17:08 +08:00
Devin Howard
588b62b942
fix problem with mappings and forking maps
2015-10-23 22:07:44 +08:00
Devin Howard
eb7ba35e14
Merge pull request #411 from metamaps/rails4
...
Upgrade to rails 4?
2015-10-23 21:09:49 +08:00
Devin Howard
63db41698e
function naming
2015-10-23 21:04:16 +08:00
Devin Howard
ddfb3aa98f
fix mapping problem
2015-10-23 21:03:49 +08:00
Devin Howard
310222aef9
factories for synapse, topic, user
2015-10-19 15:23:49 +08:00
Devin Howard
e3a4207827
random_string helper function
2015-10-19 15:23:07 +08:00
Devin Howard
d913f50cf9
remove views specs and non-applicable routing specs
2015-10-12 17:19:16 +08:00
Devin Howard
25117cf0e6
add rspec scaffold tests and a test db environment
2015-10-12 11:45:59 +08:00
Devin Howard
16c47d75d4
delete test directory, add spec directory
2015-10-12 11:26:48 +08:00
Devin Howard
0d2ddbd9b6
add rspec to Gemfile
2015-10-12 11:24:30 +08:00
Devin Howard
053f035d31
move fixtures to seeds.rb
2015-10-12 11:22:55 +08:00
Devin Howard
85b3012cd9
fix a few more mappable/topic/synapse things in JS
2015-10-02 18:54:17 +08:00
Devin Howard
6d1e382d5c
change from category/topic_id/synapse_id to mappable_type/mappable_id
2015-10-02 16:32:16 +08:00
Devin Howard
69f4b8c645
migrate to polymorphic mappings - DB MIGRATION
2015-10-02 16:22:16 +08:00
Devin Howard
c80569a449
bg color on EXisting synapses heading
2015-10-02 15:53:06 +08:00
Devin Howard
120edfc278
fix typo + debug statements to make existingSynapse autocomplete work
2015-10-02 15:46:48 +08:00
Devin Howard
80b2b1876a
deal with https://github.com/twitter/typeahead.js/issues/1195
2015-10-02 14:39:17 +08:00
Devin Howard
a51777b0ba
working version of autocomplete that includes the new typeahead.js syntax. So much more complicated than before...
2015-10-02 13:36:51 +08:00
Devin Howard
14eeb0cbe6
upgrade typeahead to 1.10 and new syntax
2015-10-01 14:55:26 +08:00
Devin Howard
d895bca1a4
code tweaks to searchsynapses
2015-10-01 12:33:38 +08:00
Devin Howard
b3b065e623
Revert "upgrade typeahead to allow new syntax"
...
This reverts commit 347d77df82
.
2015-10-01 11:34:19 +08:00
Devin Howard
347d77df82
upgrade typeahead to allow new syntax
2015-10-01 11:14:25 +08:00
Devin Howard
b0efe6aea8
Merge branch 'develop' into rails4
2015-10-01 11:05:27 +08:00
Devin Howard
9e43cc2e96
dependent destroy models for topics/maps/synapses on mappings
2015-10-01 11:02:39 +08:00
Devin Howard
bb29e0e724
fiddle with Gemfile
2015-10-01 11:02:03 +08:00
Devin Howard
a8dc64a6fe
Merge pull request #415 from metamaps/less-autocomplete
...
only autocomplete topic/synapse if the user types more than 2 characters
2015-10-01 00:08:43 +08:00
Devin Howard
a9b034637b
only autocomplete topic/synapse if the user types more than 2 characters
2015-09-30 13:55:23 +08:00
Devin Howard
c0d29e54bd
Merge branch 'rails4' of ssh://github.com/metamaps/metamaps_gen002 into rails4
2015-09-28 14:43:16 +08:00
Devin Howard
b9140e9b8d
add qa steps file first draft
2015-09-28 14:43:09 +08:00
Devin Howard
8f8f40c0e4
replace the obvious spots with asset_path
2015-09-22 22:27:34 +08:00
Devin Howard
741c584651
Merge branch 'develop' into rails4
2015-09-20 13:55:21 +08:00
Devin Howard
7841f6c96b
Merge pull request #412 from devvmh/dotenv_install
...
install dotenv to help managed env vars - author attribution to mix mix :)
2015-09-20 13:48:16 +08:00
Connor Turland
f5dbfd5d72
configuration for production environments like heroku
2015-09-19 14:10:43 -04:00
Connor Turland
869fb816e9
this enables the vagrant port forwarding
2015-09-19 13:16:07 -04:00
Devin Howard
1fbd16ac95
fix problem with join route
2015-09-19 20:46:10 +08:00
Devin Howard
b2e15c6483
cancan => cancancan
2015-09-19 20:25:07 +08:00
Devin Howard
086acb09af
select metacodes with one query instead of n queries, move logic to application_helper
2015-09-19 20:17:56 +08:00
Devin Howard
62035ed015
fix other controllers needing create/update changed for rails 4
2015-09-19 20:05:36 +08:00
Devin Howard
e14001061c
fiddle with topic and mapping controllers so they work again
2015-09-19 20:01:44 +08:00
Devin Howard
31015295f8
fix best in place deprecation warnings in map info box
2015-09-19 17:11:48 +08:00
Devin Howard
6692c28965
delete_if threw errors, so convert things to arrays for it
2015-09-19 17:08:12 +08:00
Devin Howard
1aa4d862a1
whoo new gems for development. binding.pry is so cool
2015-09-19 17:01:27 +08:00
Devin Howard
2f9b09db86
fix map/mapping associations that I broke
2015-09-19 16:48:24 +08:00
Devin Howard
c361349c20
add required params to all controllers
2015-09-19 16:26:34 +08:00
Devin Howard
a31a92b321
Merge branch 'develop' into rails4
2015-09-15 20:37:47 +08:00
Devin Howard
a8cef723a2
fix has_many relationships in map & mapping models for rails 4
2015-09-10 22:48:35 +08:00
Devin Howard
d67d098b2a
remove old jquery-ui file
2015-09-10 22:40:45 +08:00
Devin Howard
8cf8277573
add jquery_ui to gemfile
2015-09-10 22:13:10 +08:00
Devin Howard
dc51d0080e
remove attr_accessible
2015-09-10 22:12:50 +08:00
Devin Howard
f81fdbf8cc
secret_token => secret_key_base
2015-09-10 22:12:39 +08:00
Devin Howard
7a73f3bc07
remove match method from routes.rb
2015-09-10 22:06:58 +08:00
Devin Howard
c250f5d395
asset precompiling simpler in rails 4
2015-09-10 22:03:39 +08:00
Devin Howard
3c0bdff823
some config changes for rails 4 found on the Internet
2015-09-10 17:43:58 +08:00
Devin Howard
5848af7765
update Gemfile for rails 4
2015-09-10 17:43:48 +08:00
Connor Turland
6767771d7d
dont show the embedly share links
2015-08-03 14:12:47 -04:00
Connor Turland
5cd4db66c6
needed to update embedly
2015-08-03 14:02:30 -04:00
Devin Howard
3f5d2bd7f3
add gem install bundler to configure.sh
2015-05-09 23:22:23 -04:00
Connor Turland
499f6349e6
add ability for admin to delete any topics and synapses
2015-04-28 18:43:47 -04:00
mix irving
7a1b68960d
install dotenv to help managed env vars
2015-03-09 08:50:24 +13:00
Connor Turland
9ce81df9f9
Merge pull request #406 from s01us/extract_mail_env
...
extract email settings into ENV ✂️
2015-03-07 15:01:53 -05:00
mix irving
c17cc39880
extract email settings into ENV ✂️ fixes #405
2015-03-04 11:30:23 +13:00
Connor Turland
8816031b20
Merge pull request #404 from s01us/add_ruby_version
...
add .ruby-version for rbenv support
2015-03-03 09:33:59 -05:00
mix irving
4d311cb371
add .reuby-version for rbenv support
2015-03-03 23:15:44 +13:00
Connor Turland
253ceb4b48
added imagemagick to vagrantfile
2015-02-19 19:03:22 -05:00
Connor Turland
fb8c006be1
fixed small alignment bug on tooltips in firefox
2015-02-01 12:29:16 -05:00
Connor Turland
aec2a97704
fixed the alignment of the tutorial video links
2015-02-01 11:56:54 -05:00
Connor Turland
9ed0d412df
.width() returned wrong result in firefox, causing the map to load with off dimensions
2015-02-01 11:50:22 -05:00
Connor Turland
531f09c6d3
active lists are sorting right. explore url breaking doesn't happen. explore maps pages do nicer infinite scrolling, properly loading only 20 at a time
2015-01-31 12:39:48 -05:00
Connor Turland
4d7695a767
this will clear up any remaining issues with urls ending up wrong
2015-01-30 21:08:37 -05:00
Connor Turland
4ca12c70ab
explore maps lists were rendering bajillions too many times causing everything to go slow. timeouts weren't canceling. very wow
2015-01-30 20:49:30 -05:00
Connor Turland
5cf75f3ea2
prevented map from loading before all metacode images were loaded
2015-01-30 00:09:45 -05:00
Connor Turland
84e03d5475
Merge pull request #381 from metamaps/dont.delete
...
mapper who wasn't creator of a topic or synapse should not be able to delete it
2015-01-29 22:25:21 -05:00
Connor Turland
670dd5d874
added user feedback, and moved the edge actually hiding into the if statement where it should be
2015-01-29 22:23:24 -05:00
Connor Turland
cc66a851bd
Merge pull request #382 from gitter-badger/gitter-badge
...
Add a Gitter chat badge to README.md
2015-01-29 17:59:23 -05:00
The Gitter Badger
4857a02e45
Added Gitter badge
2015-01-29 20:35:48 +00:00
Connor Turland
a048c87356
mapper who doesn't own a topic or synapse should not be able to delete it.
2015-01-28 22:35:03 -05:00
Connor Turland
c61de991af
re-added buildpack file for heroku
2015-01-28 21:49:58 -05:00
Connor Turland
463a25f0a4
re-added procfile for heroku
2015-01-28 21:48:18 -05:00
Connor Turland
5a31c91597
Merge branch 'master' of github.com:metamaps/metamaps_gen002 into prevent.scrolling
2015-01-28 21:39:33 -05:00
Connor Turland
5d9305fb11
adding preventDefault will keep the page from doing weird scrolling on mac, or when the map is embedded
2015-01-28 21:38:44 -05:00
Connor Turland
dbfc0e4f4d
Merge pull request #380 from metamaps/bug-labelsDisappearing
...
when a topic was deleted, renderEdgeArrows was trying to call on a topic...
2015-01-28 21:35:20 -05:00
Connor Turland
d2e9d87037
when a topic was deleted, renderEdgeArrows was trying to call on a topic that was no longer existent to draw synapse direction, breaking the graph render
2015-01-28 21:04:00 -05:00
Connor Turland
40cebf572c
Merge pull request #378 from metamaps/embedly
...
updated embedly library, and data-card-chrome was now causing a breaking change
2015-01-28 19:33:54 -05:00
Connor Turland
bb99583622
updated embedly library, and data-card-chrome was now causing a breaking change
2015-01-28 19:19:07 -05:00
Connor Turland
07e0aac7fd
Update README.md
2015-01-22 23:02:11 -05:00
Connor Turland
36e84d61fd
Update UbuntuInstallation.md
2015-01-22 22:59:11 -05:00
Connor Turland
bf7b25f7de
Update README.md
2015-01-22 22:56:36 -05:00
Connor Turland
89e31d14b2
Delete codeguide.txt
2015-01-22 22:43:31 -05:00
Connor Turland
ebfe8257bd
Delete .buildpacks
2015-01-22 22:43:04 -05:00
Connor Turland
f7d537ed64
Delete Procfile
2015-01-22 22:42:52 -05:00
Connor Turland
84e9eb385c
Delete LiveSiteUpdatesNotes.txt
2015-01-22 22:42:29 -05:00
Connor Turland
0f526d1696
Merge pull request #376 from metamaps/bug-removeNodes
...
maps were crashing when topics were removed
2015-01-22 21:52:06 -05:00
Connor Turland
f3569d17aa
more commented code removed from realtime
2015-01-22 21:45:52 -05:00
Connor Turland
1b9dd6dc14
fix z-index for firefox
2015-01-22 21:42:45 -05:00
Connor Turland
595ff893f3
removed console logs
2015-01-22 21:42:21 -05:00
Connor Turland
bf08b562c2
removed all the extra stuff
2015-01-22 21:41:41 -05:00
Connor Turland
b395ecfded
Merge branch 'vagrant'
2015-01-22 19:35:33 -05:00
Connor Turland
65e70d8b6d
added npm, forever, and start and stop scripts
2015-01-22 19:33:57 -05: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
263eef52ce
maps were crashing when topics were removed (if those topics included the 'root node'. this was caused by a setTimeout interfering with synchronicity of events
2015-01-11 13:30:05 -05:00