Commit graph

1562 commits

Author SHA1 Message Date
Connor Turland
31da5c3011 fix right click styling 2017-02-26 16:07:47 +00:00
Devin Howard
80ccc55131 more modular attachments component 2017-02-25 15:38:28 -08:00
Devin Howard
dd8229512c rubocop 2017-02-25 14:50:43 -08:00
Devin Howard
568a5cd0ed tweak links bar spacing in topic card 2017-02-25 14:42:16 -08:00
Devin Howard
356b885e21 move mapCount and synapseCount hover/click logic to react 2017-02-25 14:37:02 -08:00
Devin Howard
d59b8685d0 fix edit icon on title in topic card 2017-02-25 14:37:02 -08:00
Devin Howard
ea3ca086d4 fix topic card title character counter 2017-02-25 14:37:02 -08:00
Devin Howard
cf7a8addd4 fix up right click menu's metacode editing 2017-02-25 14:37:02 -08:00
Devin Howard
d15ee27e2d multiline title editable textarea 2017-02-25 14:37:02 -08:00
Devin Howard
75f1c43889 fix syntax 2017-02-25 14:37:02 -08:00
Connor Turland
e82e17aebe readd the above link input border 2017-02-25 14:37:02 -08:00
Connor Turland
2d4ecf7cc1 finishing metacode select 2017-02-25 14:37:02 -08:00
Connor Turland
34c9598b63 sort wasn't working 2017-02-25 14:37:02 -08:00
Connor Turland
02ee1905d6 fix metacode styling 2017-02-25 14:37:02 -08:00
Devin Howard
bda92e03f2 convert metacode sets to a json object for react 2017-02-25 14:37:02 -08:00
Devin Howard
f14970a77d fix positioning on metacode selector 2017-02-25 14:37:02 -08:00
Devin Howard
dbd69d11be slightly wider metacodeTitle 2017-02-25 14:37:02 -08:00
Devin Howard
a81c5a71e3 textarea min height for desc 2017-02-25 14:37:02 -08:00
Devin Howard
3a8b13c42f styling is much better now 2017-02-25 14:37:02 -08:00
Devin Howard
6338d78a28 create working Desc editor 2017-02-25 14:37:02 -08:00
Devin Howard
afcd145fad riek editing for name field on topic card 2017-02-25 14:37:02 -08:00
Devin Howard
35f5a7a7c2 metacode image working a bit better 2017-02-25 14:37:02 -08:00
Devin Howard
fa283ea484 scssify a bunch 2017-02-25 14:37:02 -08:00
Connor Turland
aa84ce812f its coming along 2017-02-25 14:37:02 -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
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
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
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
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
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
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