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

3178 commits

Author SHA1 Message Date
Jeff Atwood
f2c67a5010 remove mandrill RIP 2016-02-27 15:21:17 -08:00
Arpit Jalan
8f62a0caa8 FEATURE: log backup operation 2016-02-27 23:33:18 +05:30
Arpit Jalan
09257f6c85 remove duplicate translation file 2016-02-27 12:40:32 +05:30
Sam
0a128852de Merge pull request #4018 from httvncoder/patch-1 
Create client.vi_VN.yml
 2016-02-27 17:01:51 +11:00
Régis Hanol
21b51090bf FIX: don't tell staged users they can visit topics in email notifications 2016-02-26 23:56:56 +01:00
Sam Saffron
820a435af8 FEATURE: add "email in-reply-to user option" 
We no longer include previous replies as "context", instead
we include and excerpt of the post being replied to at the bottom
of notifications, this information was previously missing.

Users may opt in to emailing previous replies if they wish
or opt out of "in-reply-to" which makes sense in some email clients that
are smarter about displaying a tree of replies.
 2016-02-26 00:05:59 +11:00
Ubuntu
5c603bf8ec Added Instagram login method 2016-02-25 12:13:59 +10:00
Régis Hanol
f7432d8ec9 FEATURE: add support for multiple incoming emails for groups & categories 2016-02-24 19:47:58 +01:00
Jeff Atwood
0097dc55b5 more entertaining 404 header copy 2016-02-24 02:00:12 -08:00
Robin Ward
ee1aec6766 Merge branch 'vdom' 2016-02-23 15:30:40 -05:00
Arpit Jalan
9de5c340b0 FIX: invite link should not auto-accept invitation if user is already logged in 2016-02-23 12:10:25 -05:00
Arpit Jalan
72784d23e7 improved already_logged_in copy 2016-02-23 21:56:34 +05:30
Arpit Jalan
1253afdf95 FIX: invite link should not auto-accept invitation if user is already logged in 2016-02-23 19:49:58 +05:30
Sam Saffron
d0a86f8032 Merge branch 'master' into vdom 2016-02-23 15:58:46 +11:00
Jeff Atwood
69461ec1ce slightly better upgrade email text 2016-02-22 15:50:28 -08:00
Robin Ward
026bba1876 Merge branch 'master' into vdom 2016-02-22 15:28:07 -05:00
Neil Lalonde
7e39619bc9 Update translations 2016-02-22 11:10:12 -05:00
Sam
c404da248a Merge branch 'master' into vdom 2016-02-22 12:20:59 +11:00
Sam
5a47199528 Merge pull request #3947 from khoa-le/update-locale-vietnamese 
Add locale for Vietnamese
 2016-02-22 11:41:37 +11:00
Dan Dascalescu
5fdc0ebe8a Typo fix: "your sure" 2016-02-21 14:12:32 -08:00
Dan Dascalescu
9aa3653e2f Fix typo: are your sure 2016-02-21 02:26:28 -08:00
Neil Lalonde
e8d837269b FEATURE: pending flags reminder is sent as a group message to staff instead of sending an email to the contact email site setting. 2016-02-19 15:21:18 -05:00
Jeff Atwood
6c684944c5 add link to mail-tester.com in test email 2016-02-19 09:19:36 -08:00
Sam
29c2423daf Merge branch 'master' into vdom 
# Conflicts:
#	app/assets/javascripts/discourse/views/post.js.es6
 2016-02-19 14:09:31 +11:00
Sam
ab06f86fbe FEATURE: allow users to control how many previous replies they get 
- always means we always send previous replies with every email
- never means we do not
- "unless previously sent" ... is the default, in which we only email you each reply once

The default_email_previous_replies site setting can control this toggle
 2016-02-19 13:57:07 +11:00
Régis Hanol
e204144a58 UsernameValidator error messages weren't matching the code 2016-02-18 23:19:14 +01:00
Hung Thinh
acad93f431 Create client.vi_VN.yml 
Vietnamese file : translate for use
 2016-02-19 02:26:01 +07:00
Sam
e8f76c335a Merge branch 'master' into vdom 2016-02-17 18:10:12 +11:00
Régis Hanol
63b9d1c645 FIX: sends an email notifcation when a user's post is linked 2016-02-16 18:29:23 +01:00
Robin Ward
3ea1f88cdc Merge branch 'master' into vdom 2016-02-16 11:48:42 -05:00
Erick Guan
0c6e5befe4 FIX: topic summary description text was conflicts with reply counter 2016-02-16 12:38:51 +01:00
Dan Dascalescu
c75360f809 Capitalize "ip" in "ip address" 2016-02-15 15:59:31 -08:00
Sam
1dc168a7e6 Merge branch 'master' into vdom 2016-02-15 19:29:59 +11:00
Jeff Atwood
2c0b36cb72 omit needless words 2016-02-13 15:58:52 -08:00
Robin Ward
d1e85bdd8b FEATURE: Use virtual dom framework for faster post rendering 2016-02-11 11:00:40 -05:00
Régis Hanol
cad7fc1062 FIX: don't allow blocked user to send emails in 2016-02-11 10:39:57 +01:00
Jeff Atwood
5120dcfb3d we don't need to show (currently enabled) 2016-02-10 16:36:25 -08:00
Jeff Atwood
081c196b52 minor copyedit 2016-02-10 16:34:37 -08:00
Régis Hanol
91bb38626c FEATURE: new incoming email details modal 2016-02-10 22:00:27 +01:00
Régis Hanol
c2cc9da9a7 remove the wiki color 2016-02-10 11:18:37 +01:00
Régis Hanol
8944d62aa6 add validator for the 'reply_by_email_enabled' site setting 2016-02-09 23:35:40 +01:00
Arpit Jalan
e5aecdf09f Update Translations 2016-02-09 20:24:03 +05:30
Arpit Jalan
82a75c00c0 UX: change 'Visit Topic' to 'Visit Message' for message notification email 2016-02-09 13:39:10 +05:30
Jeff Atwood
1a1dcb59f9 this period bothered me and it had to go 2016-02-08 15:37:49 -08:00
Régis Hanol
460665895c properly name purge emails/email logs site settings 2016-02-08 22:18:52 +01:00
Régis Hanol
ac863bab91 FEATURE: new 'suppress_email_logs_after_days' site setting 2016-02-08 18:47:35 +01:00
Gerhard Schlager
f7eb7f25bd UX: Use i18n for date picker 2016-02-05 21:49:21 +01:00
Neil Lalonde
71a87bea0c Update translations 2016-02-04 13:35:14 -05:00
Régis Hanol
2d170712d7 new 'private_email_time_window_seconds' site setting 2016-02-04 17:22:16 +01:00
Arpit Jalan
eec8436cfe FEATURE: filter admin reports via user group 2016-02-04 11:23:49 +05:30
Sam Saffron
bc75010b20 FEATURE: suggested messages for messages 
FEATURE: clicking envelope takes you to inbox

Suggested messages works somewhat like suggested topics.

- New show up first (in either group inbox or inbox)
- Then unread (in either group inbox or inbox)
- Finally "related" which are messages with same participants as the current pm.
 2016-02-03 18:50:05 +11:00
Arpit Jalan
bcc0ed7c9c Update Translations 2016-02-02 15:24:01 +05:30
Régis Hanol
49d1f88f6e FIX: support incoming emails with no subject 2016-02-01 12:16:15 +01: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
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
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
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
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
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
Arpit Jalan
593c22eda1 Update Translations 2016-01-04 21:01:49 +05:30
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