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
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
