github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-27 22:46:28 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
24,241 Commits 214 Branches 500 Tags 960 MiB
8bd7cfedfd
Commit Graph

14439 Commits

Author SHA1 Message Date
Leo McArdle
a7b7fe335f FIX: allow an admin to click on blank errors (#5027) 
* FIX: allow an admin to click on blank errors

* i18nlize strings

* what would a rails master do?
 2017-08-04 20:04:26 +02:00
Robin Ward
a3ef814245 UX: Show proper HTML for category preview in site settings 2017-08-04 13:56:27 -04:00
Robin Ward
58d452fc41 FIX: Site setting previews were not rendering 2017-08-04 13:48:02 -04:00
Régis Hanol
3c0de22bf0 FIX: wasn't able to remove a user's primary group 2017-08-04 18:13:20 +02:00
Régis Hanol
519b70ea46 FIX: always trigger the ':user_updated' event 
We don't always use the UserUpdated class to update a user's record
 2017-08-04 18:12:10 +02:00
Régis Hanol
c26ba890bd prevent N+1 when loading custom emojis 2017-08-04 17:04:59 +02:00
Leo McArdle
99527af38a FIX: show rejected emails with unrecognized errors (#5026) 
Although 407a23663d will send rejection
messages for unrecognized errors, sometimes processing the email will
raise an error which has a blank message.

This commit:

1. Shows rejected emails which have already been processed and contain
   a blank error in /admin/email/rejected

2. Replaces new blank error messages with the error type
 2017-08-04 16:20:44 +02:00
Guo Xiang Tan
40fc6c429a Merge pull request #5018 from discourse/wekbit-embedded-referer 
FIX: First load of embed comments would always fail on WebKit
 2017-08-04 14:12:26 +09:00
Robin Ward
2589b17cb7 Add wrapper divs with classes to the topic footer button area 2017-08-03 15:59:26 -04:00
Robin Ward
82230a1830 Support forcing badge styles 2017-08-03 14:55:36 -04:00
Arpit Jalan
2d95b9dfbf FIX: prevent Cloudflare from obfuscating emails 
https://support.cloudflare.com/hc/en-us/articles/200170016-What-is-Email-Address-Obfuscation-
 2017-08-03 15:06:13 +05:30
Guo Xiang Tan
a47e297508 Merge pull request #5019 from tgxworld/more_resiliency_to_readonly_redis 
Fix Redis command errors when trying to start app with a readonly Redis.
 2017-08-03 06:34:36 +09:00
Robin Ward
edc7fae0b0 FIX: The ellipsis should be a flat-button 2017-08-02 17:30:40 -04:00
Sam
5942ad83c0 Skip inline onebox for domain only 2017-08-02 17:27:58 -04:00
Rafael dos Santos Silva
57a214e920 FIX: First load of embed comments would always fail on WebKit 2017-08-02 17:43:31 -03:00
Sam
902be91a5a FEATURE: CTRL+/ to trigger search even from composer 2017-08-02 16:26:03 -04:00
Sam
a4e1920604 FIX: inline oneboxer not applying to lists 2017-08-02 16:10:08 -04:00
Erick Guan
468a8fcd20 FEATURE: Site settings defaults per locale 
This change-set allows setting different defaults for different locales. 

It also:

- Adds extensive testing around site setting validation

- raises deprecation error if site setting has the default property based on env

- relocated site settings for dev and tests in the initializer

- deprecated client_setting in the site setting's loading process

- ensure it raises when a enum site setting being set

- default_locale is promoted to `required` category.

- fixes incorrect default setting and validation

- fixes ensure type check for site settings

- creates a benchmark for site setting

- sets reasonable defaults for Chinese
 2017-08-02 12:24:19 -04:00
Neil Lalonde
3de45ce0cd FIX: use case insensitive group name search when applying group rules from SSO 2017-08-02 11:30:37 -04:00
Guo Xiang Tan
33e22cf598 Add back Admin::GroupsController#index route for now. 
* The endpoint is being used by discourse_api.
 2017-08-03 00:24:23 +09:00
Neil Lalonde
be30d4510a FIX: change email success message container was too narrow 2017-08-02 10:50:18 -04:00
Neil Lalonde
47fa536f46 FIX: plugin outlet in user preferences nav needs to be li tag 2017-08-02 10:05:11 -04:00
Guo Xiang Tan
9bc3038728 Fix Redis command errors when trying to start app with a readonly Redis. 2017-08-02 21:33:56 +09:00
Guo Xiang Tan
1c80c233cf FIX: Adding group owners returns 400 error. 2017-08-02 19:18:41 +09:00
Régis Hanol
e43799134c fix the regexp used to valide user's website 2017-08-02 10:19:24 +02:00
Benjamin Elijah Griffin
d471ad08c6 Website RE validator without a 10 char limit on TLD. 2017-08-01 23:37:28 -07:00
Jeff Atwood
3538b63305 FIX: on desktop, anon topic reply btn too far over 2017-08-01 16:47:52 -07:00
Robin Ward
53e78edbef Silence ESLint 2017-08-01 17:26:49 -04:00
Robin Ward
8dd7c0c984 UX: Convert buttons to d-button 2017-08-01 17:24:06 -04:00
Robin Ward
75d10a4098 UX: Add consistent classes to buttons 2017-08-01 17:24:06 -04:00
Robin Ward
513b7bf706 REFACTOR: DRY up New Topic button code 2017-08-01 15:04:07 -04:00
Guo Xiang Tan
bd0efb8525 Fix the build. 2017-08-01 17:57:26 +09:00
Guo Xiang Tan
1197750e7d PERF: Allow plugins to preload custom fields for topics in CategoryList. 2017-08-01 17:27:28 +09:00
Matt Palmer
67882ec37d Hunt-and-kill a few more mis-encoded params 
https://meta.discourse.org/t/tags-does-not-work-with-cyrillic/67217/6?u=mpalmer
 2017-08-01 18:03:44 +10:00
Matt Palmer
7ee861f457 FIX: Return a UTF-8 string in tag notifications 
https://meta.discourse.org/t/tags-does-not-work-with-cyrillic/67217
 2017-08-01 16:27:52 +10:00
Neil Lalonde
fa3c240e8b Merge pull request #4981 from dmacjam/fix_limited_search_results 
FIX: limited search results
 2017-07-31 20:23:57 -04:00
Leo McArdle
836dee1120 FIX: add additional email to tests and clean up resulting mess 2017-07-31 22:27:29 +00:00
Neil Lalonde
ec85b41078 UX: Move watched words to the Logs section of admin 2017-07-31 17:06:50 -04:00
Robin Ward
ce27783da4 UX: Add new plugin outlet before reply count 2017-07-31 16:50:25 -04:00
Neil Lalonde
7c1d7fb423 Merge branch 'master' into fix_limited_search_results 2017-07-31 15:55:31 -04:00
Erick Guan
f1eccd113c Replace rmmseg gem for cppjieba_rb since better dictionary (#5006) 
* Rename locale to ts config in search module to make it clear

* Replace rmmese-cpp for cppjieba_rb
 2017-07-31 15:28:48 -04:00
Arpit Jalan
6c997b65d9 optimize enqueuing activation email code 2017-07-31 22:57:39 +05:30
Arpit Jalan
0b01d0e95d FIX: staff cannot manually activate accounts after 48 hours has elapsed 
https://meta.discourse.org/t/staff-cannot-manually-activate-invited-accounts-after-48-hours-has-elapsed/66292/14?u=techapj
 2017-07-31 22:24:09 +05:30
Neil Lalonde
5d528f0d15 Merge pull request #4958 from dmacjam/search_posts_by_filetype 
FEATURE: Search posts by filetype
 2017-07-31 11:55:34 -04:00
Neil Lalonde
4a5907b116 Merge branch 'master' into search_posts_with_images 2017-07-31 10:44:41 -04:00
Robin Ward
31deebc8e6 FIX: Extra < character after icon refactor 2017-07-31 10:18:56 -04:00
Arpit Jalan
2e2b5e28aa FIX: add slight delay when enqueuing activation email 2017-07-31 16:52:07 +05:30
Jakub Macina
f8edf2636c Fix rspec tests for search pagination. 2017-07-31 12:16:23 +02:00
Guo Xiang Tan
83bb042311 FIX: Group#visibility_level isn't shown in admin group edit page. 2017-07-31 16:34:22 +09:00
jomaxro
65c4e81bb2 Add placeholder text to group member add field 2017-07-30 23:52:46 -04:00
Guo Xiang Tan
24e0e000b9 FIX: Always validate presence of user's primary_email. 2017-07-31 11:47:29 +09:00
Robin Ward
307311fdb1 Add class to admin wrench button 2017-07-28 16:38:10 -04:00
Robin Ward
15fa514791 Add classes to notification dropdown buttons 2017-07-28 16:35:14 -04:00
Robin Ward
67556e6381 REFACTOR: Category / Tag Dropdown headers had extra classes 2017-07-28 16:19:33 -04:00
Robin Ward
e4c2b5e430 REFACTOR: CSS improvements to improve targetting and remove !important 2017-07-28 15:52:57 -04:00
Sam
a13d146251 Correct post deletion spec so it is async 2017-07-28 10:50:18 -04:00
Sam
64d54bc549 FIX: when quoting add a newline 
so **highlight** > quote

Does not end like:

[quote]
test
[quote]~
 2017-07-28 10:49:49 -04:00
Sam
ae68795d82 FIX: deleting own post results in error 2017-07-28 10:14:11 -04:00
Guo Xiang Tan
4620dfe92d FEATURE: Add group settngs to allow users to leave a group freely. 
https://meta.discourse.org/t/split-join-leave-freely-setting-on-groups/65565
 2017-07-28 15:00:25 +09:00
Guo Xiang Tan
5012d46cbd Add rubocop to our build. (#5004) 2017-07-28 10:20:09 +09:00
Robin Ward
ff4e295c4f FIX: Notifications dropdown had incorrect spacing 2017-07-27 19:22:19 -04:00
Sam
4f574e7c93 FEATURE: support inline bbcode blocks eg: [quote]test[/quote] 2017-07-27 17:55:17 -04:00
Robin Ward
c3b7419a08 UX: Remove hidden from the #discourse-modal when the modal is shown 2017-07-27 17:14:41 -04:00
Robin Ward
1b1fd64639 FIX: Badge icons disappeared 2017-07-27 16:57:26 -04:00
Robin Ward
41afd9c818 Bump Plugin API version for icon api 2017-07-27 15:13:03 -04:00
Robin Ward
6dfa3625df REFACTOR: Replace fa-* in SCSS with d-icon-* 2017-07-27 15:09:30 -04:00
Robin Ward
5b590b9637 REFACTOR: Replace some fa-* uses with helpers 2017-07-27 14:55:41 -04:00
Robin Ward
d0c41a578e Rename {{fa-icon}} to {{d-icon}} so it can be more generic 2017-07-27 14:55:41 -04:00
Neil Lalonde
68b3dd43ce fix intermittent failing tests, some watched word refactoring 2017-07-27 12:27:01 -04:00
Robin Ward
5cfc2d8972 Run wizard specs in docker:test 2017-07-27 11:29:18 -04:00
Robin Ward
32c9ad6f7f FIX: Wizard was broken 2017-07-27 10:48:31 -04:00
Guo Xiang Tan
75374c76b3 UX: Display button to message group on group page. 
https://meta.discourse.org/t/make-it-easier-to-send-a-message-to-groups/65065
 2017-07-27 17:51:25 +09:00
Guo Xiang Tan
4d25d61e9c UX: Change group membership requests icons on groups pages. 
https://meta.discourse.org/t/make-it-easier-to-send-a-message-to-groups/65065
 2017-07-27 16:24:15 +09:00
Guo Xiang Tan
2442bba131 UX: Better group creation workflow. 
* Owners and users can now be added to a group during creation.

https://meta.discourse.org/t/you-cannot-allow-membership-requests-without-any-owners/64760/3
 2017-07-27 16:12:42 +09:00
Guo Xiang Tan
fd95c971ec REFACTOR: Better variable name. 2017-07-27 16:10:53 +09:00
Robin Ward
e87125b63c FEATURE: Plugins can overwrite and add support for new icons 2017-07-26 13:21:17 -04:00
Neil Lalonde
24cb950432 FEATURE: Watched Words: when posts contain words, do one of flag, require approval, censor, or block 2017-07-26 11:01:09 -04:00
David Taylor
27539e15e1 Allow whitespace around % scaler in markdown image syntax (#5000) 2017-07-26 10:54:20 -04:00
Neil Lalonde
ea0e90b2b0 Merge branch 'master' into search_posts_with_images 2017-07-26 10:15:55 -04:00
David Taylor
febd7621ea Qunit plugin rake tasks (#4985) 
* Allow running specific plugin tests using ENV variables

* Add a `rake plugin:qunit` task to match the existing `rake plugin:spec` task

* Improve docker.rake to allow running specific plugin qunit tests

* Purge cache before and after qunit tests

* Stop module auto-loader trying to auto-load tests

* Use URL query parameters to pass config into Qunit, avoiding caching issues

* Oops, searchParams doesn’t work in phantomJS. Parse the URL manually.

* Escape ampersands before passing URL to phantomJS, otherwise multiple parameters go wrong
 2017-07-26 09:07:46 -04:00
Guo Xiang Tan
917d186303 REFACTOR: Reduce number of queries sent to the DB. 2017-07-26 17:20:00 +09:00
Guo Xiang Tan
3a46ea8bad Sanitize SQL arguments to prevent injections. 2017-07-26 17:20:00 +09:00
Guo Xiang Tan
f9627f4533 UX: Don't show empty user list for groups without members. 2017-07-26 16:11:06 +09:00
Guo Xiang Tan
b59dfb86f4 UX: Include group name in email when group is invited to a PM. 
https://meta.discourse.org/t/xyz-invited-you-to-a-message-but-really-invited-a-group-im-in/65996
 2017-07-26 15:51:44 +09:00
Guo Xiang Tan
93130b15e3 Fix invalid CSS syntax. 2017-07-26 10:38:34 +09:00
Guo Xiang Tan
e3ac6585bd FIX: Search by topic_id should not be restricted by SiteSetting.min_search_term_length. 2017-07-26 09:52:39 +09:00
cpradio
feb423d07a Update ul padding/margin to match ol. 
https://meta.discourse.org/t/numbers-cut-off-in-long-list/59856/16?u=cpradio
 2017-07-25 18:54:28 -04:00
Sam
ec2506c32b Merge pull request #4996 from ryantm/patch-2 
safely call html_safe on category description
 2017-07-25 15:34:07 -04:00
Sam
17d56a4cb7 FEATURE: use Markdown for image pasted in as opposed to IMG tags 2017-07-25 15:11:38 -04:00
Neil Lalonde
d8c27e3871 Merge branch 'master' into search_posts_by_filetype 2017-07-25 14:41:20 -04:00
Ryan Mulligan
f3f7dd02d1 safely call html_safe on category description 
The `categories.description` column is not modified as "not null", so it is possible for the description to be nil. This changes the code not call html_safe on nil.
 2017-07-25 11:40:02 -07:00
Sam
0d66a41753 Merge pull request #4989 from begrif/html-safe-category-desc 
Stop Rails from escaping the HTML in this description.
 2017-07-25 13:41:30 -04:00
Robin Ward
f2e592c1ab UX: Apply btn-flat class to flat buttons on posts 2017-07-25 12:00:19 -04:00
Robin Ward
3152eabbb0 UX: Use flat button style for bulk selection 2017-07-25 12:00:19 -04:00
Robin Ward
5da848088a UX: Refactor composer buttons into flat buttons 2017-07-25 12:00:19 -04:00
Régis Hanol
d67fe4c674 FIX: block all emails associated to a user when destroying their record 2017-07-25 17:44:46 +02:00
Guo Xiang Tan
601064a95a Remove stray debugger. 2017-07-25 22:51:47 +09:00
Guo Xiang Tan
bdf1be65a3 FIX: Broken topic invite button. 2017-07-25 22:48:10 +09:00
Jakub Macina
2d45b3fc6d Add infinite loading to full page search. 2017-07-25 15:33:25 +02:00
Joffrey JAFFEUX
8556d3c27f FIX: emoji-picker do not reload all everything when changing diversity 2017-07-25 12:23:38 +02:00
Joffrey JAFFEUX
22c5fb20b4 FIX: emoji-picker broken and skipped specs 2017-07-25 12:23:38 +02:00
Régis Hanol
c7c93e7159 FEATURE: new 'strip image metadata' site setting 2017-07-25 11:48:39 +02:00
Guo Xiang Tan
6c0a29698b Fix JS tests failing when running in RAILS_ENV=test. 
Fixes the following error:

```
phantomjs /home/tgxworld/work/discourse/vendor/assets/javascripts/run-qunit.js http://localhost:60099/qunit
2017-07-25 16:27:41 +0900: Rack app error handling request { GET /stylesheets/desktop.css }
<Errno::ENOENT: No such file or directory @ rb_sysopen - /home/tgxworld/work/discourse/tmp/stylesheet-cache/desktop.css>
/home/tgxworld/work/discourse/app/controllers/stylesheets_controller.rb:65:in `write'
/home/tgxworld/work/discourse/app/controllers/stylesheets_controller.rb:65:in `show_resource'
/home/tgxworld/work/discourse/app/controllers/stylesheets_controller.rb:9:in `show'
```
 2017-07-25 16:31:31 +09:00
awesomerobot
3905d6bc0d mildly lighter @mention 2017-07-24 22:26:14 -04:00
Jeff Atwood
df653a2350 Merge pull request #4991 from awesomerobot/master 
fixing @mention color
 2017-07-24 18:33:00 -07:00
awesomerobot
3dd79b3b3a fixing @mention color 2017-07-24 21:11:14 -04:00
Benjamin Elijah Griffin
4f77ca72a3 Stop Rails from escaping the HTML in this description. 2017-07-24 17:15:15 -07:00
Sam
4da98cdcfe FIX: allow bbcode to be unquoted for default 2017-07-24 18:36:17 -04:00
Neil Lalonde
25097deb39 FIX: saving profile preferences removes name in account preferences 2017-07-24 13:13:50 -04:00
Sam
40abcfc2f5 FIX: smart quote edge case with quotes 2017-07-24 12:21:49 -04:00
Sam Saffron
045a2abcec FEATURE: remove the timecop gem 
We should only have one way of mocking time, misuse of timecop
was causing build stability issues
 2017-07-24 12:11:10 -04:00
Robin Ward
5dd56a41d9 Merge branch 'master' into master 2017-07-24 12:01:48 -04:00
Neil Lalonde
b5a375c70a FIX: oops, real fix for change email instructions 2017-07-24 11:15:55 -04:00
Neil Lalonde
1f1d84c378 FIX: wrong position for change email instructions 2017-07-24 11:14:36 -04:00
Guo Xiang Tan
6b17178533 Validate uniquness of api_key. 2017-07-24 21:46:08 +09:00
Joffrey JAFFEUX
d9696c98c3 FIX: broken spec 2017-07-24 13:59:36 +02:00
Joffrey JAFFEUX
995d253030 FIX: improves efficiency 2017-07-24 12:42:54 +02:00
Guo Xiang Tan
1b0750d7ef Merge pull request #4983 from tgxworld/group_owners_can_invite_users_to_groups 
Group owners can invite users to groups
 2017-07-24 16:21:19 +09:00
Guo Xiang Tan
6593f0355f FIX: Exclude www in topic map links. 
https://meta.discourse.org/t/topic-popular-links-panel-domain-extraction-doesnt-handle-country-tlds/60156/38?u=tgxworld
 2017-07-24 10:14:33 +09:00
Guo Xiang Tan
887c3b66f5 Revert "UX: Don't try to figure out root domain." 
This reverts commit 7690cc6ca5.
 2017-07-24 09:40:57 +09:00
Régis Hanol
65ab5f58fe FIX: keep newlines between paragraphs when quoting a post 2017-07-23 15:25:28 +02:00
David Taylor
2ddf365e3a Fix user stats colour for dark themes 2017-07-22 23:48:31 +01:00
Joffrey JAFFEUX
f68e711fb2 FIX: makes emoji filter case insensitive 2017-07-22 22:48:22 +02:00
Jeff Atwood
bc9270defb filetype comparison needs to be case insensitive 2017-07-22 13:18:15 -07:00
Joffrey JAFFEUX
e2e0221dd7 FIX: make sure there are meaningful titles on the picker 2017-07-22 17:32:12 +02:00
Robin Ward
bc3a32385c FIX: Empty lines should be selected for block quotes 2017-07-21 16:32:29 -04:00
Sam
9b4f5710e6 api cleanup for before / after rules 2017-07-21 16:12:11 -04:00
Joffrey JAFFEUX
bb35d9fc07 FIX: do not restore scroll on successive click on the same first emoji 2017-07-21 21:42:23 +02:00
Robin Ward
2f8f2aa1dd FEATURE: Whitelists for inline oneboxing 2017-07-21 15:41:47 -04:00
Arpit Jalan
9727977fef Fix the build. 2017-07-22 00:34:39 +05:30
Joffrey JAFFEUX
8c17596aa5 FIX: keep scroll position when adding first recent emoji 2017-07-21 20:57:17 +02:00
Joffrey JAFFEUX
cdefb58018 FIX: emoji-picker filtering false positive 2017-07-21 20:42:34 +02:00
Arpit Jalan
6d09fbde44 UX: use down chevron icon to expand "show more links.." 2017-07-22 00:10:37 +05:30
Régis Hanol
fff5e2c3a5 Merge pull request #4984 from LeoMcA/unrecognized-error-email 
FEATURE: send rejection email for unrecognized errors
 2017-07-21 20:40:18 +02:00
Robin Ward
574681dc47 FIX: Show emoji in inline oneboxes 2017-07-21 14:24:48 -04:00
Joffrey JAFFEUX
c2db2c5c78 FIX: do not store scroll position in local storage 2017-07-21 20:18:32 +02:00
Joffrey JAFFEUX
d5f53da43f FIX: filtered emojis now correctly include custom emojis 2017-07-21 19:46:40 +02:00
Joffrey JAFFEUX
e36d9f55c3 replaces links/imgs by buttons in the emoji-picker 2017-07-21 19:42:50 +02:00
Joffrey JAFFEUX
54e0075a3e use the EMOJI_VERSION constant 2017-07-21 19:42:49 +02:00
Leo McArdle
407a23663d FEATURE: send rejection email for unrecognized errors 2017-07-21 18:26:52 +01:00
Sam
e1ce47a901 Pass the full CommonMark spec 2017-07-21 13:20:52 -04:00
Robin Ward
aa5b8a5749 REFACTOR: Merge onebox and inline onebox code paths 2017-07-21 13:12:30 -04:00
Leo McArdle
ddc0134b48 add DiscourseEvent triggers necessary to update a user's permissions before they're notified 2017-07-21 11:03:54 -04:00
Guo Xiang Tan
2a17f1ccd7 FIX: Group owners should be able to invite users to their groups. 
https://meta.discourse.org/t/group-owner-cannot-send-an-invite-to-a-group/60617/12
 2017-07-21 23:48:25 +09:00
Joffrey JAFFEUX
c7f2b0fe58 tweaks to copy and styles 2017-07-21 14:19:04 +02:00
Joffrey JAFFEUX
79c8b505e8 FIX: faster successive loading of emojis 2017-07-21 14:18:02 +02:00
Joffrey JAFFEUX
1ce1953ee1 FIX: makes sure we don’t track when clicking on recent emojis 2017-07-21 13:35:55 +02:00
Joffrey JAFFEUX
c906bd3f22 emoji-picker refactoring 2017-07-21 13:35:29 +02:00
Joffrey JAFFEUX
1ca0c33802 FIX: dot not close emoji-picker when click is inside picker 2017-07-21 12:01:39 +02:00
Joffrey JAFFEUX
0c9ea1aaf2 reduce emoji loading threshold 2017-07-21 11:46:34 +02:00