Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
24,200 Commits 211 Branches 500 Tags 865 MiB
Commit Graph

24200 Commits

Author SHA1 Message Date
Guo Xiang Tan 54f09ca59d Install rubocop in development mode. 2017-08-01 10:51:44 +09:00
Neil Lalonde 24edbbb89c fix rubocop offenses 2017-07-31 20:34:02 -04:00
Neil Lalonde 1fdf2e4d4b badly resolved conflicts 2017-07-31 20:28:16 -04: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
Régis Hanol 88ba052446 secure default for the 'find_related_post_with_key' site setting 2017-08-01 00:03:04 +02: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
Sam cdf7a020c1 correct mistake in spec 2017-07-31 16:40:59 -04:00
Neil Lalonde 7c1d7fb423 Merge branch 'master' into fix_limited_search_results 2017-07-31 15:55:31 -04:00
Mohammad AlTawil 7836b064f4 [FIX] invalid byte sequence in UTF-8 (#5003) 
Invalid encoding fixed prior to empty check
 2017-07-31 15:34:11 -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 83011045c8 fix rubocop offenses 2017-07-31 11:59:16 -04:00
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 057a69a55d Merge pull request #4917 from dmacjam/search_posts_with_images 
Search posts with images
 2017-07-31 11:17:36 -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
Neil Lalonde d336d9a515 Remove mention of unhandled flags in description of the contact_email setting 2017-07-31 10:08:54 -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
Régis Hanol c7f76aa554 fix the receiver_spec 2017-07-31 11:29:39 +02:00
Régis Hanol cae437850e update email_reply_trimmer to latest 2017-07-31 11:21:41 +02:00
Régis Hanol e018e7a8f6 `db:test:prepare` doesn't seem to work 2017-07-31 11:17:56 +02:00
Régis Hanol 5e43c05bf8 Update DEVELOPER-ADVANCED doc with latest ruby & node versions 2017-07-31 11:09:09 +02:00
Quangbuu Le 0daa177805 Enhance bulk import scripts (#5010) 
* Enhance bulk import scripts

* Fix: restore running statement of BulkImport::VBulletin
 2017-07-31 10:56:57 +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
Guo Xiang Tan 358d245dd8 Upgrade Rails to 4.2.9. 2017-07-31 15:37:46 +09:00
Guo Xiang Tan 0eb7159e51 UX: Discobot advanced tutorial certificate does not work with dark theme. 
https://meta.discourse.org/t/discobot-assets-certificate-svg/65523/11?u=tgxworld
 2017-07-31 15:27:47 +09:00
Régis Hanol b6055b5ab3 Merge pull request #5011 from jomaxro/patch-1 
Add placeholder text to group member add field
 2017-07-31 07:35:45 +02:00
jomaxro 65c4e81bb2 Add placeholder text to group member add field 2017-07-30 23:52:46 -04:00
Guo Xiang Tan 6e74f726cf FIX: Staged users did not have a `UserEmail` record. 2017-07-31 12:40:32 +09:00
Guo Xiang Tan 305b9b2da0 Add spec to ensure that even staged users contain a primary email. 2017-07-31 12:16:08 +09:00
Guo Xiang Tan 24e0e000b9 FIX: Always validate presence of user's primary_email. 2017-07-31 11:47:29 +09:00
Arpit Jalan b059a0f789 extract url escaping to a dedicated class method and improved tests 2017-07-29 22:16:51 +05:30
Arpit Jalan 1fe553873c FIX: preserve fragment identifier when escaping url 2017-07-29 17:22:45 +05:30
Joffrey JAFFEUX da5e7dc876 FIX: Pull last emoji-db revision 
This commit will add new images in some sets and fix a bug where
🤦‍♂️ was using :person_facepalming: image which is in fact
represented as a woman in most sets.
 2017-07-29 13:12:45 +02:00
Sam 56fd3e1cd4 attempt to stablise flaky spec 2017-07-28 16:59:37 -04: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
Robin Ward 43fd90b2da Remove serve_public_dir -- it's not needed 2017-07-28 13:44:38 -04:00
Robin Ward 9a76559345 FIX: Remove unused test 2017-07-28 11:59:12 -04:00
Robin Ward 5ae79697b8 Remove unused `register_theme` code, expose `serve_public` 2017-07-28 11:47:25 -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 e84e310325 Merge pull request #5007 from tgxworld/split_public_settings 
FEATURE: Add group settngs to allow users to leave a group freely.
 2017-07-28 15:15:33 +09:00