Connor Turland
e72c437964
Merge f49a674566 into 47d0faadf2
2017-02-25 21:04:43 +00: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
f49a674566
tweaks for developing on this branch
2017-02-06 03:41:28 +00:00
Connor Turland
7951f08e45
Merge branch 'develop' into feature/convo.algo
2017-02-06 03:36:26 +00: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
9c65d2df09
for special conversation url
2017-02-05 07:05:25 +00:00
Connor Turland
a84815aaed
tiny merge with develop
2017-02-05 06:39:55 +00:00
Connor Turland
9b0ead24a3
more merges with develop
2017-02-05 06:37:37 +00:00
Connor Turland
3a4fa90c49
Merge branch 'develop' into feature/convo.algo
2017-02-05 06:28:49 +00:00
Connor Turland
3ae4072b5d
add ability to keep metacode focus
2017-02-05 06:28:10 +00:00
Connor Turland
0a52de714e
make it match develop
2017-02-05 05:41:29 +00:00
Connor Turland
597efb36e1
add this back in
2017-02-05 05:31:37 +00:00
Connor Turland
72fd2717b6
Merge branch 'develop' into feature/convo.algo
2017-02-05 05:26:58 +00:00
Connor Turland
500a74bd5f
don't include the controller yet
2017-02-05 04:15:51 +00:00
Connor Turland
2423608fd3
actually optimize the island layout
2017-02-05 04:08:36 +00:00
Connor Turland
0929380e91
divide up the islands to the north and south
2017-02-05 03:34:59 +00:00
Connor Turland
6e347dc33a
fixup synapse creation
2017-02-05 03:26:18 +00:00
Connor Turland
96f66a2f8c
fix up topic creator
2017-02-04 04:27:08 +00:00
Connor Turland
74dd20f02e
got topic and synapse creation working
2017-02-04 04:13:59 +00:00
