zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-24 17:22:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:neocities/neocities

Browse source
This commit is contained in:
Kyle Drake 2017-05-05 14:30:31 -07:00
commit 2e5cc9b243
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
models/site.rb
View file

@ -135,7 +135,7 @@ class Site < Sequel::Model
EMAIL_VALIDATION_CUTOFF_DATE = Time.parse('May 16, 2016') EMAIL_VALIDATION_CUTOFF_DATE = Time.parse('May 16, 2016')
DISPOSABLE_EMAIL_BLACKLIST_PATH = File.join(DIR_ROOT, 'files', 'disposable_email_blacklist.conf') DISPOSABLE_EMAIL_BLACKLIST_PATH = File.join(DIR_ROOT, 'files', 'disposable_email_blacklist.conf')
BLOCK_JERK_THRESHOLD = 3 BLOCK_JERK_THRESHOLD = 2
MAXIMUM_TAGS = 5 MAXIMUM_TAGS = 5

2
views/site/_profile_comments.erb
View file

@ -4,7 +4,7 @@
<input name="csrf_token" type="hidden" value="<%= csrf_token %>"> <input name="csrf_token" type="hidden" value="<%= csrf_token %>">
<input name="message" <input name="message"
type="text" type="text"
placeholder="Post a message..." placeholder="<% if current_site == site %>Post a message...<% else %>Post a message... (be nice!)<% end %>"
autocomplete="off" autocomplete="off"
maxlength="<%= Site::MAX_COMMENT_SIZE %>" maxlength="<%= Site::MAX_COMMENT_SIZE %>"
<% unless current_site.commenting_allowed? %>disabled<% end %> <% unless current_site.commenting_allowed? %>disabled<% end %>