Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,214 Commits 247 Branches 502 Tags 916 MiB
Commit Graph

25214 Commits

Author SHA1 Message Date
Sam 9b4fd0b26b correct multisite issues with scheduler 2017-10-11 18:46:53 +11:00
Sam 61f32ed431 FIX: we can not namespace eval automatically, it is impossible 2017-10-11 16:41:26 +11:00
Sam 6b4a1af160 FIX: don't attempt to schedule if there is no next run 2017-10-11 14:27:16 +11:00
Sam 233299982f keep time consistent, we always use to_i 2017-10-11 14:26:50 +11:00
Robin Ward faa4c4e5f7 FIX: Sort icons were not showing up 2017-10-10 10:54:43 -04:00
Guo Xiang Tan 2c1ce283e8 Stop running tests for discourse-slack-official. 2017-10-10 16:11:19 +08:00
Guo Xiang Tan 6cb29e3e20 Remove custom symlinks in discourse-narrative-bot. 2017-10-10 13:46:58 +08:00
Robin Ward 14b1736c74 Include `currentPath` in the `below-site-header` plugin outlet 2017-10-09 13:58:43 -04:00
Arpit Jalan a2183c3f1d SECURITY: verify that inviter can invite new user to a topic 2017-10-09 15:59:41 +05:30
Guo Xiang Tan 59aeb0bc56 FIX: Sidekiq hot reloading wasn't working in dev. 
https://meta.discourse.org/t/webhooks-sidekiq-issue-on-dev-instance/71129

* Remove code that is no longer required as well.
 2017-10-09 18:23:25 +08:00
Guo Xiang Tan 606795ecea Update Ruby versions to test against on Travis. 2017-10-09 11:28:06 +08:00
Guo Xiang Tan 1d0fadd48c Merge pull request #5227 from majakomel/delete-tag-confirm 
UX: Improve Delete Tag Confirm Message
 2017-10-09 11:26:12 +08:00
Guo Xiang Tan a6f2533d38 SECURITY: Fix XSS on unsubscribed page. 2017-10-09 09:04:46 +08:00
Guo Xiang Tan 6fe604b93e Revert "SECURITY: Fix XSS on unsubscribed page." 
This reverts commit 190558db9d.
 2017-10-09 09:03:07 +08:00
Guo Xiang Tan 190558db9d SECURITY: Fix XSS on unsubscribed page. 2017-10-09 08:59:03 +08:00
Sam 4ea87b5ab8 Merge branch 's3_refactor' 2017-10-09 10:27:52 +11:00
Sam a8b4255bae Correct rule installation in AWS 2017-10-09 10:26:58 +11:00
Robin Ward 4da4f986ee FIX: Clicking on quote button was tricky 2017-10-06 21:29:16 -04:00
Robin Ward 193244f8c1 Convert quote button to use d-icon 2017-10-06 15:45:43 -04:00
Robin Ward 494ad1e9de Convert quote controls to use `d-icon` 2017-10-06 15:42:24 -04:00
Robin Ward f4decf9193 The `quote-other-topic` class has been removed 2017-10-06 15:16:06 -04:00
Robin Ward 127c13314a We can use `avatar_template` here rather than recreating the logic 2017-10-06 14:02:43 -04:00
Neil Lalonde 7ed522c890 Version bump to v1.9.0.beta12 2017-10-06 11:28:49 -04:00
Régis Hanol 8d14d55fc5 make rubocop happy 2017-10-06 16:48:11 +02:00
Neil Lalonde 3a29ba71a3 Update translations 2017-10-06 10:37:57 -04:00
Régis Hanol 3bdd8f57c1 FIX: invited staged users would sometimes not get notified of replies 2017-10-06 16:37:28 +02:00
Maja Komel 5780596c50 use delete_confirm_no_topics instead of nested no_topics 2017-10-06 16:29:29 +02:00
Maja Komel 3c1e005fea missing semicolon 2017-10-06 15:42:53 +02:00
Maja Komel 13cc0fd665 replace zero key with no_topics 2017-10-06 15:35:15 +02:00
Gerhard Schlager 1477a0e910 Adds a rake task for refreshing posts received via email 
This is useful when the email_reply_trimmer gem was updated and you want to apply those changes to existing posts.
 2017-10-06 14:29:11 +02:00
Maja Komel 789a354570 UX: Delete Tag Warning Improvement 2017-10-06 12:13:37 +02:00
Guo Xiang Tan 19d04dd9eb Merge pull request #5225 from pfaffman/discourse-restore-sort 
UX: discourse restore -- sort by date
 2017-10-06 15:59:09 +08:00
Guo Xiang Tan 4552840e54 REFACTOR: DRY update code that uses duplicated logic. 2017-10-06 14:33:38 +08:00
Sam 70bb2aa426 FEATURE: allow specifying s3 config via globals 
This refactors handling of s3 so it can be specified via GlobalSetting

This means that in a multisite environment you can configure s3 uploads
without actual sites knowing credentials in s3

It is a critical setting for situations where assets are mirrored to s3.
 2017-10-06 16:20:01 +11:00
Guo Xiang Tan 4ba5e678d8 Require dependencies to enable live reload in dev for Sidekiq. 2017-10-06 11:39:00 +08:00
Guo Xiang Tan d67f0b39ae Update annotations. 2017-10-06 11:13:01 +08:00
Guo Xiang Tan 3efde2618d UX: Do not display non-human users on group page. 
https://meta.discourse.org/t/members-of-groups-staff/71437
 2017-10-06 10:35:40 +08:00
Guo Xiang Tan a88f910469 Bump message_bus to 2.0.8. 2017-10-06 08:33:46 +08:00
Guo Xiang Tan 8b71a0e49f UX: Restore missing border at the end of topic list. 2017-10-06 08:27:03 +08:00
Jay Pfaffman e61edfd13a UX: discourse restore -- sort by date 2017-10-05 15:20:14 -07:00
Robin Ward 5822c64bdc FIX: If you can manage a post you can wiki it 2017-10-05 17:47:52 -04:00
Robin Ward 2ae06e6fd0 More customization for menu items 2017-10-05 17:00:23 -04:00
Robin Ward 0c84352386 Add support for transformations 2017-10-05 16:24:58 -04:00
Robin Ward 07d04aba1d Support `{{unless}}` in virtual dom templates 2017-10-05 14:35:07 -04:00
Robin Ward 7df73c94a0 Add a hook to decorate extra buttons 2017-10-05 14:35:06 -04:00
Neil Lalonde beca02c046 FIX: moderators couldn't see flagged topics list 2017-10-05 14:12:07 -04:00
Guo Xiang Tan b2127600fb Remove use of concurrent timer for Redis failover. 
* Uses the same logic for Postgres failover.
 2017-10-05 15:57:08 +08:00
Guo Xiang Tan 5dc4b469be Remove unused code for Redis Sentinel. 2017-10-05 14:53:03 +08:00
Guo Xiang Tan a25851032a Update Sidekiq. 2017-10-05 13:59:21 +08:00
Guo Xiang Tan b0557c6692 UX: Allow users to remove a remind me topic timer. 2017-10-05 11:50:08 +08:00