github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-15 04:43:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
23,462 Commits 214 Branches 500 Tags 960 MiB
117d5f1b6a
Commit Graph

23462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joffrey JAFFEUX
64336a8c75 Emoji 5.0 support 2017-06-05 14:06:23 +02:00
Joffrey JAFFEUX
f781fab972 Merge remote-tracking branch 'discourse/master' into emoji-5.0 2017-06-05 11:42:14 +02:00
Guo Xiang Tan
30f2758404 FIX: Ensure that we cancel any timeout jobs when terminating a track. 2017-06-05 16:23:25 +09:00
Guo Xiang Tan
3621647fb5 FIX: Bot should only respond to regular posts. 2017-06-05 15:21:19 +09:00
Guo Xiang Tan
0c203e61cd Raise ActiveRecord::IrreversibleMigration instead of StandardError. 2017-06-05 11:02:24 +09:00
Guo Xiang Tan
1c05ca91ea Remove columns that are no longer being used. 2017-06-05 10:59:05 +09:00
Barry van Oudtshoorn
6841ad9c83 Clarify category tag settings text 
https://meta.discourse.org/t/change-to-category-tag-settings-text/63926

This change eliminates the ambiguity in the previous copy, which suggested that the setting prevented the tags from being used in other categories, rather than the actual behaviour of constraining what can be used in the edited category.
 2017-06-05 09:43:22 +08:00
Guo Xiang Tan
18e598a3b0 Merge pull request #4897 from tgxworld/fix_invalid_group_allow_membership_requests 
FIX: Groups that do not have any owners should not allow membership re…
 2017-06-05 10:07:55 +09:00
Guo Xiang Tan
ac6c1acbed FIX: Groups that do not have any owners should not allow membership requests. 2017-06-05 10:02:37 +09:00
Arpit Jalan
a10c939775 FIX: do not show website name on TL0 profile 2017-06-04 18:30:28 +05:30
Régis Hanol
b93a4e369d add support for importing content by id in JIVE API importer 2017-06-03 21:49:30 +02:00
Arpit Jalan
2518c6156d UX: add more glyphs on /about page 2017-06-03 08:03:25 +05:30
Guo Xiang Tan
cd2869c767 Revert "Skip validations when Discobot creates new posts." 
This reverts commit ca7e906774.

Post validations are already skipped for admin users. Skipping
validations cause polls to not work.
 2017-06-03 07:18:23 +09:00
Guo Xiang Tan
418cb09713 Ensure that we skip validations when creating a post on behalf of a user. 2017-06-03 07:15:08 +09:00
Robin Ward
3acabf3e2f FIX: Improved Amazon oneboxing for some URLs 2017-06-02 16:53:40 -04:00
Arpit Jalan
8e6445fc88 Merge pull request #4899 from discourse/revert-4898-search-tweaks 
Revert "FEATURE: new setting to prioritize open topics in search"
 2017-06-03 01:54:46 +05:30
Arpit Jalan
a1ebd67237 Revert "FEATURE: new setting to prioritize open topics in search" 2017-06-03 01:54:35 +05:30
Arpit Jalan
44cf0bdf9e UX: add admin/moderator icon on /about page 2017-06-03 01:05:26 +05:30
Sam
1494cacbaa Merge pull request #4898 from techAPJ/search-tweaks 
FEATURE: new setting to prioritize open topics in search
 2017-06-02 15:32:26 -04:00
Arpit Jalan
b8a87a0996 FEATURE: new setting to prioritize open topics in search 2017-06-03 00:33:53 +05:30
Sam
b4060778d9 FIX: you should always be allowed to see actions you created 2017-06-02 14:24:06 -04:00
Robin Ward
007873af3c FIX: Don't run in testing mode 2017-06-02 12:42:00 -04:00
Robin Ward
62e6108756 FIX: Improper error message 2017-06-02 12:37:03 -04:00
Sam
096177d0d5 confirm we notify on the destination, not source 2017-06-02 11:20:40 -04:00
Neil Lalonde
ceedec894d fix narrative bot for subfolder in translation files 2017-06-02 10:07:16 -04:00
Jakub Macina
eaec35d230 Fix tag related advanced search tests into one context. Fix dynamic locale and select clause in search by all tags. Fix separator for all tags to plus sign. 2017-06-02 12:39:07 +02:00
Guo Xiang Tan
af3dc4e537 FIX: Publish group's categories to user when adding user to group. 
https://meta.discourse.org/t/joining-a-group-doesnt-take-effect-unless-the-browser-is-hard-refreshed/57357/11?u=tgxworld
 2017-06-02 17:38:14 +09:00
Guo Xiang Tan
5f441a2614 FIX: Disable request membership button if user does not have sufficient trust level. 2017-06-02 16:06:25 +09:00
Jeff Atwood
5b0e8d3b0b copyedit on download button 2017-06-01 19:51:30 -07:00
Jeff Atwood
9fd35e6d6a minor copyedit on site assets topic 2017-06-01 15:57:44 -07:00
Sam
a7fc93acac FIX: post mover not clearing reply_to_user_id 2017-06-01 18:00:14 -04:00
Régis Hanol
062158a25e FIX: PNG-to-JPEG conversion should only be done to images with at least 1 megapixels 2017-06-01 23:12:37 +02:00
Régis Hanol
832d621b48 FIX: automatic PNG-to-JPEG conversion should use a default white background 2017-06-01 23:10:36 +02:00
Robin Ward
c4b6420455 Update Onebox for better Twitch support 2017-06-01 16:23:47 -04:00
Sam
e050308f36 FIX: don't allow moderators to save category tracking settings 2017-06-01 15:26:05 -04:00
Neil Lalonde
23dfddbfb4 FIX: narrative bot on subfolder installs 2017-06-01 15:15:34 -04:00
Robin Ward
19d5eb903c SECURITY: Vunerability in mail gem 
(see https://github.com/mikel/mail/pull/1097)
 2017-06-01 14:51:30 -04:00
Robin Ward
88ee054e14 FIX: Restrict wizard staff count to human users 2017-06-01 11:20:32 -04:00
Guo Xiang Tan
76510d695f Merge pull request #4895 from tgxworld/fix_delay_bot_welcome_post 
FIX: Delay Discobot welcome post should start counting on user's firs…
 2017-06-01 21:03:15 +09:00
Guo Xiang Tan
edbb876d1b FIX: Discobot welcome post delay should start counting when a user logs in. 2017-06-01 21:02:29 +09:00
Guo Xiang Tan
2ee144c27f FEATURE: Add DiscourseEvent trigger when a user logs in. 
* Also adds a event trigger when user logs in for the first time.
 2017-06-01 17:44:49 +09:00
Guo Xiang Tan
bd486100c0 Remove stubs on DiscourseEvent in tests. 2017-06-01 16:21:00 +09:00
Jeff Atwood
9c40b6c1ec Merge pull request #4894 from jomaxro/patch-1 
Fix typo in transifex instructions
 2017-05-31 23:30:00 -07:00
jomaxro
2711cca9d4 Fix typo in transifex instructions 2017-05-31 23:17:31 -04:00
Guo Xiang Tan
ae5cc217cd Avoid monkey patching which causes weird reloading error in dev. 2017-06-01 12:06:25 +09:00
Guo Xiang Tan
13c6695d65 Revert "Load posts in batches while indexing problem posts." 
This reverts commit ce57ff9fcf.

Limit is ignored with `find_each`.
 2017-06-01 11:15:27 +09:00
Neil Lalonde
82ed51450e Version bump to v1.9.0.beta1 2017-05-31 16:39:57 -04:00
Robin Ward
e66fa82f3a FIX: Don't load JS via SCRIPT tag in QUnit mode 2017-05-31 15:31:24 -04:00
Neil Lalonde
e22d88c91d Add Franch and Slovak translations for narrative bot 2017-05-31 13:56:41 -04:00
Arpit Jalan
304090f759 Update translations 2017-05-31 22:36:20 +05:30