codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-23 23:58:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
18124 commits 7 branches 179 tags 87 MiB
Commit graph

4055 commits

Author SHA1 Message Date
Régis Hanol
49d1f88f6e FIX: support incoming emails with no subject 2016-02-01 12:16:15 +01:00
Jeff Atwood
161170aabe Merge pull request #3928 from jamielinux/nginx204 
Return 204 instead of 404 for favicon.ico requests
 2016-01-30 01:48:22 -08:00
Jeff Atwood
9cf57e3ca4 more email rejection copy edits 2016-01-28 15:42:05 -08:00
Jeff Atwood
223e324eb9 some copyedits on mail rejection text 2016-01-28 12:20:59 -08:00
Gerhard Schlager
f4f87921c2 Replace uncategorized_description setting with translation 2016-01-28 00:26:25 +01:00
Jeff Atwood
6a7bdfecc8 better shorter copy for group inbox 2016-01-27 10:25:54 -08:00
Sam Saffron
8aea75edec improve copy 2016-01-27 21:51:12 +11:00
Sam Saffron
a764cc3a42 FEATURE: by default users track a group (as opposed to watch) 
FEATURE: a rollup counting number of messages in the group inbox to tracking users
 2016-01-27 21:38:33 +11:00
Arpit Jalan
74f22f95da FEATURE: log admin/moderator grant/revoke action 2016-01-27 15:39:04 +05:30
Jeff Atwood
f71ae355ae minor copyedit 2016-01-26 15:14:02 -08:00
Gerhard Schlager
1368e2182a UX: Distinguish between noun and verb for "Archive" 2016-01-26 22:41:49 +01:00
Arpit Jalan
915afa703d Update Translations 2016-01-26 23:41:00 +05:30
Khoa, Le Ngoc
06e637fc4a Merge remote-tracking branch 'upstream/master' into update-locale-vietnamese 
* upstream/master: (185 commits)
  SECURITY: Upgrade rails.
  FIX: new user summary page was broken
  Version bump to v1.5.0.beta9
  Remove addressable from Discourse.
  UX: change glyph when inviting existing user to a topic
  FIX: Allow for large free disk space
  Revert "FIX: disk_space should be a BigDecimal to handle large disk (closes #3923)"
  UX: improve styling of messages and mobile view of messages
  FIX: correct counts on user summary
  FIX: link to filtered down list of badges from summary FEATURE: pick featured badges in summary page
  FIX: do not allow new email to be duplicate FIX: return proper error message when email already exists
  retain unactivated accounts a bit longer default
  FEATURE: blocked users can send and reply to private messages from staff
  Remove Arel patch that has been merged upstream.
  correct path
  little typo
  FIX: Missing tag in CSS.
  PERF: remove 10-20ms of work from every page view
  FIX: remove green background for wiki (this can be re-added via a customization if needed)
  Hotfix for unsubscribe via email
  ...

# Conflicts:
#	.tx/config
 2016-01-26 12:44:29 +07:00
Jeff Atwood
734450dcc3 retain unactivated accounts a bit longer default 2016-01-22 13:13:07 -08:00
Khoa, Le Ngoc
003399bf96 Update translation code 2016-01-22 14:54:48 +07:00
David García-Navas López de Cuéllar
954e3be7cf little typo 2016-01-21 15:05:03 +01:00
Arpit Jalan
1cee914565 FEATURE: make top criteria formula multipliers controlled by site 
setting
 2016-01-21 10:30:06 +05:30
Régis Hanol
fc3bedaaed Merge pull request #3921 from gschlager/locale-sk 
Add Slovak locale
 2016-01-20 15:38:48 +01:00
Régis Hanol
c2c01cdb5d FIX: username suggester to account for the more relaxed username rules (closes #3907) 2016-01-20 15:37:34 +01:00
Régis Hanol
ea02b7f54d Merge pull request #3961 from dandv/patch-5 
Include backups among items uploadable to s3
 2016-01-20 14:39:21 +01:00
Régis Hanol
f61537bc16 Merge pull request #3952 from gdpelican/unsubscribe-via-email 
Unsubscribe via email
 2016-01-20 14:38:14 +01:00
James Kiesel
c7283751a3 Unsubscribe via email 2016-01-20 22:25:25 +13:00
Sam Saffron
7303f8f309 FEATURE: first pass at user summary page 2016-01-20 15:14:25 +11:00
Neil Lalonde
9ad226aaa8 FEATURE: add email query param to login, signup, and password-reset URLs to prefill form 2016-01-19 16:53:46 -05:00
Régis Hanol
11ea16a91a FIX: localize S3 region names 2016-01-19 17:14:45 +01:00
Régis Hanol
5018a8033d FIX: add link to user profile for staged users 2016-01-19 16:41:07 +01:00
Régis Hanol
29fbc2d7bc FIX: add missing 'user_replied_pm' translation 2016-01-19 15:47:38 +01:00
Régis Hanol
3083657358 FEATURE: better email in support 
FEATURE: new incoming_email model
FEATURE: infinite scrolling in emails admin
FEATURE: new 'emails:import' rake task
 2016-01-19 00:57:55 +01:00
Jeff Atwood
d0bcea3411 better copy on read only mode 2016-01-18 14:17:38 -08:00
Jeff Atwood
28cbeaf6be add reply formatting info to new user tips 2016-01-18 14:10:14 -08:00
Arpit Jalan
bfa4e6b69c Update Translations 2016-01-19 01:29:19 +05:30
Sam
ca3e2b4da3 FEATURE: you can not drill down and see why you have badges 
Clicking on badges filters down the list to a particular user.
 2016-01-18 17:59:20 +11:00
Dan Dascalescu
a566adc5b2 Include backups among items uploadable to s3 
Enabling S3 backups comes with a warning "requires valid S3 credentials entered in Files settings". This commit amends the description of s3_access_key_id to confirm it's the correct location for backup as well as image uploads to S3.
 2016-01-16 18:08:27 -08:00
Neil Lalonde
b8299a2710 log when staff blocks/unblocks someone 2016-01-14 15:05:11 -05:00
Neil Lalonde
12790d8dcc FEATURE: staff can block users, which prevents them from creating topics and replies 2016-01-14 14:42:06 -05:00
Jeff Atwood
ffb24bf82d omit needless words 2016-01-14 00:31:57 -08:00
Arpit Jalan
69416dde96 FIX: set minimum value for email_token_valid_hours setting 2016-01-14 12:51:34 +05:30
Guo Xiang Tan
365301fb23 FIX: Typo. 2016-01-13 18:52:59 +08:00
Guo Xiang Tan
0d51315ec0 Merge pull request #3930 from tgxworld/ux_better_representation 
UX: Improve copy for toolbar button that triggers emojis modal.
 2016-01-13 18:52:29 +08:00
Guo Xiang Tan
f1b8d2c52b UX: Improve copy for toolbar button that triggers emojis modal. 2016-01-13 18:51:46 +08:00
Régis Hanol
737c606710 FIX: 'cancel_scheduled_job' wasn't working due to sidekiq upgrade 2016-01-13 09:08:26 +01:00
Arpit Jalan
e676974f16 Merge pull request #3953 from techAPJ/wiki 
FEATURE: allow users to wikify their own posts based on trust level
 2016-01-13 09:53:33 +05:30
Régis Hanol
e2744fc19f FIX: adding the 'contains_messages' column back 2016-01-12 12:06:51 +01:00
Régis Hanol
8049dfdfda CLEANUP: remove 'contains_messages' leftover 💩 2016-01-12 11:29:26 +01:00
Sam
06b5798fb9 fix activity pending route, hidden for now 2016-01-12 15:48:44 +11:00
Arpit Jalan
06bac23e5f FEATURE: allow users to wikify their own posts based on trust level 2016-01-12 08:44:25 +05:30
Jeff Atwood
14c1100209 make "Visit the Topic" first text / buttonon email line 2016-01-11 16:49:28 -08:00
Régis Hanol
98c0fac461 FEATURE: add small action post when adding/removing users in messages 2016-01-11 12:42:06 +01:00
Neil Lalonde
d732c0876a Update translations 2016-01-08 15:50:00 -05:00
Guo Xiang Tan
9f05361f14 Allow sites to set HTTP basic authentication through nginx. 2016-01-08 12:49:17 +08:00
Sam
e451d47e84 Revert "PERF: send Content-Length from Rails on all requests" 
This reverts commit ea0e238ae1.

Does not seem needed reverting
 2016-01-08 11:36:32 +11:00
Sam Saffron
ea0e238ae1 PERF: send Content-Length from Rails on all requests 2016-01-07 21:15:55 +11:00
Guo Xiang Tan
16d15a7938 Revert "FIX: Typo in site settings." 
This reverts commit 19cd80f504.
 2016-01-05 17:31:46 +08:00
Guo Xiang Tan
19cd80f504 FIX: Typo in site settings. 2016-01-05 17:15:47 +08:00
Sam
268e0f3b2b remove http 1.1 in case it has side effects 2016-01-05 07:54:12 +11:00
Neil Lalonde
c7df6783a9 FIX: only invalidate password reset links using javascript 2016-01-04 11:48:54 -05:00
Robin Ward
0ba1e8a76f Merge pull request #3937 from tgxworld/implement_#_category 
FEATURE: Autolinking to category using hashtags.
 2016-01-04 11:14:28 -05:00
Guo Xiang Tan
c1dbf5c1c4 FEATURE: Autolinking to category using hashtags. 2016-01-05 00:12:24 +08:00
Arpit Jalan
593c22eda1 Update Translations 2016-01-04 21:01:49 +05:30
Sam
b8471177dc clean up config file 2016-01-04 16:13:44 +11:00
Sam Saffron
0e2ded278d Don't buffer message bus, this allows us to stream 2016-01-04 09:56:30 +11:00
Sam Saffron
ab5cd3ad3b allow http 1.1 via proxy 2016-01-04 09:52:11 +11:00
root
e0ffce1cad Add locale for Vietnamese 2016-01-03 10:05:28 +00:00
Arpit Jalan
e45caa7e2e make wiki help text general 2015-12-30 14:43:35 +05:30
Arpit Jalan
51ced7aeae make site setting for read time word count per minute 2015-12-30 12:15:30 +05:30
Sam
a4587b18f5 FEATURE: allow users to archive messages from message page 2015-12-30 13:26:39 +11:00
Neil Lalonde
cee4da82d8 FIX: remove max value of tl3 requires days visited site setting because tl3 time period is configurable now. Setting tl3 requires days visited higher than tl3 time period will disable tl3 promotions. 2015-12-29 12:59:59 -05:00
Arpit Jalan
90d15ba588 Update Translations 2015-12-29 23:16:17 +05:30
Arpit Jalan
70e0955498 fix desktop notification title for group mentions 2015-12-29 22:22:35 +05:30
Arpit Jalan
6ef1537ee0 FEATURE: better unfurling of Discourse topics on Slack 2015-12-28 19:10:19 +05:30
Arpit Jalan
3a28bafc0f FEATURE: onebox internal audio or video files 2015-12-25 01:52:14 +05:30
Arpit Jalan
47410f1b99 Update Translations 2015-12-23 17:01:43 +05:30
Sam
03ea0bfe22 FEATURE: allow users to archive messages 
Messages are now in 3 buckets

- Inbox for all new messages
- Sent for all sent messages
- Archive for all messages you are done with

You can select messages from your Inbox or Sent and move them to your Archive,
you can move messages out of your Archive similarly

Similar concept applied to group messages, except that archiving and unarchiving
will apply to all group members
 2015-12-23 11:09:30 +11:00
Arpit Jalan
f40249faad FEATURE: make trust level 3 time period admin setting 2015-12-22 23:26:19 +05:30
Arpit Jalan
c87fff670d add category list label and state 2015-12-21 23:07:16 +05:30
Jamie Nguyen
eed86e9afc Do not log favicon.ico requests 2015-12-21 12:14:36 +00:00
Jamie Nguyen
e8919df110 Return 204 instead of 404 for favicon.ico requests 2015-12-21 12:13:56 +00:00
Jeff Atwood
e83f050454 shorter email footer copy 2015-12-20 23:38:08 -08:00
Sam
63076a841e Merge branch 'refactor_user_page' 2015-12-20 16:50:33 +11:00
Sam
a8b5192efd FEATURE: User page refactor 
Re-organise user page so it is easier to find interesting info
split it into tabs

- Introduce notifications and messages tabs
- Stop couting stuff for the user page to speed up rendering
- Suppress more information when viewing your own profile
 2015-12-20 16:45:49 +11:00
Neil Lalonde
fe10f3e0a3 Update translations 2015-12-18 10:48:02 -05:00
Arpit Jalan
4c967d11b4 FEATURE: log site text changes 2015-12-18 19:42:06 +05:30
Neil Lalonde
05b12d108f FIX: broken links to user profile on subfolder install 2015-12-15 14:26:23 -05:00
Sam
2230879a24 Merge pull request #3922 from featheredtoast/username-email-from-field 
username as from in emails
 2015-12-15 21:23:53 +11:00
Jeff Wong
bffdc5907a username as from in emails 
Add a site setting to display name in from header for emails
 2015-12-15 00:34:04 -08:00
Régis Hanol
15c229195f FEATURE: notification_level on a per-group basis 2015-12-14 23:17:09 +01:00
Gerhard Schlager
e56f8fa471 Add Slovak locale 2015-12-14 21:55:36 +01:00
Arpit Jalan
d0bbf5c9a6 Update Translations 2015-12-14 23:04:01 +05:30
Arpit Jalan
e65a7370ef FIX: disable avatar education message when 'allow_uploaded_avatars' is 
disabled
FEATURE: setting to disable avatar education message
 2015-12-14 22:47:35 +05:30
Robin Ward
b2c73e7045 UX: On mobile use a dropdown for topic controls instead of many buttons 2015-12-11 15:09:09 -05:00
Régis Hanol
978a1539fa new pop3_polling_enabled setting validator to ensure credentials are working before enabling it 2015-12-10 22:23:54 +01:00
Sam
8cf4d52cb6 FEATURE: split up group PMS on user page 2015-12-10 11:39:33 +11:00
Régis Hanol
1d70434de5 use light email template for staged users 2015-12-09 19:45:46 +01:00
Régis Hanol
c447900e3b fix build 2015-12-09 12:33:09 +01:00
Régis Hanol
ddda93b9f2 unhide the 'allow_staged_accounts' site setting 2015-12-09 12:14:01 +01:00
Jeff Atwood
ccd8865bf3 make email unsubscribe footer a single line 2015-12-09 00:55:54 -08:00
Sam
77f4461c51 we need to bypass this in dev 2015-12-09 16:41:09 +11:00
Sam
65edbb609c Revert "Revert message bus upgrade" 
This reverts commit 47e718f5b2.
 2015-12-09 11:48:41 +11:00
Sam
47e718f5b2 Revert message bus upgrade 2015-12-09 11:45:11 +11:00
Sam
d8795a5345 FIX: missing site id lookup causing message bus cross talk in multisite 2015-12-09 07:55:43 +11:00
Sam
2cc95af69b Revert "REVERT: message bus changes" 
This reverts commit 4820d5c7b0.
 2015-12-09 07:36:36 +11:00
Robin Ward
4820d5c7b0 REVERT: message bus changes 2015-12-08 15:32:31 -05:00
Arpit Jalan
e52852dd0f FIX: Autoclose message was not correct when immediate 
FEATURE: Warn when setting auto-close for right now
 2015-12-08 18:16:48 +05:30
Régis Hanol
3aa5129f54 FEATURE: allow group members to see all messages on group page 2015-12-07 23:19:33 +01:00
Robin Ward
b781b6aea3 Add header_instructions overridable translation for email headers. 2015-12-07 16:52:33 -05:00
Sam
c866d5b42d Revert "Revert "PERF: move message bus to the front of the middleware stack"" 
This reverts commit cd1dd18f01.
 2015-12-08 07:11:28 +11:00
Robin Ward
cd1dd18f01 Revert "PERF: move message bus to the front of the middleware stack" 
I suspect this commit is preventing Sidekiq from running inprocess.
 2015-12-07 14:57:23 -05:00
Arpit Jalan
b227897c44 Update Translations 2015-12-07 23:29:32 +05:30
Régis Hanol
a37d575d7d FEATURE: new 'My Groups' messages filter in user page 2015-12-07 18:37:03 +01:00
Régis Hanol
578f606a1a add 'incoming_email' to groups 2015-12-07 12:39:28 +01:00
Sam
8d49091572 PERF: stop running VACUUM FULL only run VACUUM 2015-12-07 20:14:26 +11:00
Sam
c04bcf8655 PERF: move message bus to the front of the middleware stack 
Organise all initializers so they are properly ordered and use the same naming scheme
 2015-12-07 14:51:24 +11:00
Sam
7917316f6f FEATURE: display warning on top of composer for group mentions 
If users attempt to mention a group that is "mentionable" display a warning
informing them that people will be notified.
 2015-12-04 13:41:07 +11:00
Jeff Atwood
18c9d966a1 reverse order of unsubscribe link options 
should be in order that we want the user to do it
 2015-12-03 16:14:43 -08:00
Jeff Atwood
89d7c56fb2 email footer copy improvements 2015-12-03 16:00:24 -08:00
Jeff Atwood
d84fa69ade minor copyedit on dismiss unread 2015-12-03 15:31:56 -08:00
Jeff Atwood
daada2b0d1 minor copyedits on flagging 2015-12-03 15:13:29 -08:00
Arpit Jalan
19f1314a3a remove unused locale strings 2015-12-02 13:07:58 +05:30
Sam
d3c9050e0f improve copy 2015-12-02 15:57:50 +11:00
Sam
d1a5d8ea62 FEATURE: show group mentions and topics in groups page 2015-12-01 16:52:43 +11:00
Robin Ward
de88be2fbc Support for "Only show overridden" in site text customization 2015-11-30 15:25:08 -05:00
Arpit Jalan
04593b8fef Update Translations 2015-12-01 01:09:45 +05:30
Sam
ad3dd161e7 FEATURE: first class group mentions built in 
If you allow a group to be mentioned it can be mentioned with the @ symbol.

Keep in mind as a safety mechanism max_users_notified_per_group_mention is set to 100
 2015-11-30 17:08:43 +11:00
Arpit Jalan
5a7831265a add search example for category name with space 2015-11-29 02:07:24 +05:30
Arpit Jalan
86374c90de FIX: if the email template has multiple subjects, link to customize text page 2015-11-28 11:50:02 +05:30
Robin Ward
5e93140f85 FEATURE: Can override any translation via an admin interface 2015-11-27 11:35:19 -05:00
Arpit Jalan
6354324f2f FIX: validate automatic membership email domains 2015-11-27 12:35:33 +05:30
Sam
f74a6457ee FEATURE: allow CJK to be tokenized in non CJK sites. 
Meaning a mixed English/Chinese site can still have a functioning search.
 2015-11-27 16:35:27 +11:00
Régis Hanol
ba0df7e4cd rename 'is_support' to 'contains_messages' 2015-11-26 18:40:54 +01:00
Régis Hanol
9ef8397164 new Category.is_support attribute 2015-11-26 18:31:24 +01:00
Régis Hanol
0d54c18c8b new hidden 'allow_staged_accounts' setting 2015-11-26 18:31:23 +01:00
Neil Lalonde
8a4c91f3ef Update translations 2015-11-25 17:09:48 -05:00
Sam
5ebffc0c94 remove template compiler, handle it in another way 2015-11-25 15:45:36 +11:00
Sam
d6c925600f temporarily add back compiler while figuring out a better system 2015-11-25 15:11:57 +11:00
Sam
d41a8a21cc FIX: show letter avatars even if NGINX is not running in Dev mode 2015-11-25 14:42:46 +11:00
Sam
0844350308 correct production mode due to ember loading changes 2015-11-25 13:57:10 +11:00
Robin Ward
d65ec1af2e Rename ninja_edit_window to editing_grace_period :'( 2015-11-24 14:28:42 -05:00
Arpit Jalan
362c515f33 FEATURE: compose a new pre-filled message via URL 2015-11-24 18:55:45 +05:30
Sam
8e95c6cf5b allow external system avatar url to be shadowed by global 2015-11-24 12:15:28 +11:00
Arpit Jalan
bde05fd334 Update Translations 2015-11-23 19:25:06 +05:30
Arpit Jalan
db2799507b FIX: admin trust level user list URL should be consistent with new naming 2015-11-23 14:28:56 +05:30
Sam
c7243bd6a2 Revert "cache cdn assets and strip cookies" 
This reverts commit 18abf4f0d6.
 2015-11-22 00:59:26 +11:00
Sam
18abf4f0d6 cache cdn assets and strip cookies 2015-11-22 00:33:20 +11:00
Neil Lalonde
523138f1fd FEATURE: add setting pending_users_reminder_delay to configure when to send reminders to moderators about user approvals based on how long new users have been waiting 2015-11-20 16:06:07 -05:00
Arpit Jalan
6ec336e56f Update Translations 2015-11-20 23:26:48 +05:30
Robin Ward
8eeb027c65 Can revert changes to email templates 2015-11-20 12:30:21 -05:00
Arpit Jalan
bb1d0dea8a UX: better flagging options 2015-11-20 22:23:29 +05:30
Robin Ward
f5b34d5f53 FEATURE: Admin interface for editing email templates 2015-11-19 16:39:34 -05:00
Robin Ward
e168c5fde3 PERF: Much more performant, multisite aware I18n overrides 2015-11-19 16:36:59 -05:00
Sam
88f1a8f0b1 Merge pull request #3821 from mpalmer/letter-avatar-proxy 
Proxy letter avatars by default
 2015-11-19 20:02:16 +11:00