Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,987 Commits 179 Branches 500 Tags 935 MiB
Commit Graph

3987 Commits

Author SHA1 Message Date
Sam 7c5e15966f Merge pull request #1225 from ZogStriP/upload-selector-handles-attachments 
uploads selector texts is now different when attachments are enabled
 2013-07-23 00:44:17 -07:00
Sam 9ac6c6e2e9 Merge pull request #1233 from sir-pinecone/improve-group-deletion 
Add confirmation modal to admin group deletion
 2013-07-23 00:43:06 -07:00
Sam ef201e02d7 Merge pull request #1238 from ZogStriP/moar-bullets 
change the pipe into a bullet in the lightbox overlay
 2013-07-23 00:41:47 -07:00
Sam 7e92109ac8 Merge pull request #1240 from abbat/master 
Fix locale dependend stemmer for FTS
 2013-07-23 00:40:54 -07:00
Sam 4b735a5a09 Merge pull request #1239 from abbat/patch-1 
Add russian stemmer for FTS
 2013-07-23 00:39:00 -07:00
Jeff Atwood 0aeab5a73f multisite desc should be simpler and less scary 2013-07-22 23:38:41 -07:00
Jeff Atwood 6b30c3df2d clarify what "private network" means, specifically 2013-07-22 23:36:39 -07:00
Jeff Atwood e020ebdda8 make redis update section match nginx update section 2013-07-22 23:33:11 -07:00
Jeff Atwood 7d1d234237 add minor clarifications based on feedback 2013-07-22 23:28:05 -07:00
Jeff Atwood e35db35e75 ENOUGH WITH THE DAMN "GiB" ALREADY 2013-07-22 23:18:04 -07:00
Sam 478ae6d6c7 correct bug where delete stub job would fail when attempting to delete stubs off deleted topics 
skip deleting stubs if a post is actively flagged
 2013-07-23 16:11:44 +10:00
Sam 73e0418b41 deleted class only for real deleted posts 2013-07-23 15:42:44 +10:00
Sam 3ad7d74c52 correct no highlighting categories when clicked 2013-07-23 13:24:39 +10:00
Sam 060c79ecc0 remove dupes before correcting topic_ids in user action consistency check job 2013-07-23 12:44:20 +10:00
Sam 9c5734b773 tone down badges for the love of all that is good 2013-07-23 12:44:20 +10:00
Sam ac47da1722 Merge pull request #1241 from dougalcorn/config-pbkdf-algorithm 
Parameterize the PBKDF2 algorithm in application config
 2013-07-22 18:39:36 -07:00
Doug Alcorn 35a2bb7919 Parameterize the PBKDF2 algorithm in application config 
http://meta.discourse.org/t/sso-between-discourse-and-xmpp/8567/5
 2013-07-22 21:36:01 -04:00
Sam 4b269de724 correct: http://meta.discourse.org/t/cant-save-adding-a-group-permission-to-a-category/8537 
can not save category after adding a new custom group
 2013-07-23 10:10:36 +10:00
Sam 0acc96c94e work around for http://meta.discourse.org/t/activerecord-statementinvalid-exception-raised-in-models-user-action-rb/7275/4 2013-07-23 09:48:18 +10:00
Sam 7b1f9928e4 staff can change trust levels 2013-07-23 09:13:48 +10:00
Anton Batenev aa7d1c2fbe Fix locale dependend stemmer for FTS 
Fix locale dependend stemmer for FTS to improve search relevance on non English languages.
 2013-07-23 03:07:59 +04:00
Anton Batenev 4a6a4db241 Add russian stemmer for FTS 2013-07-23 02:05:18 +04:00
Sam ea7684fb32 Merge pull request #1226 from stephankaag/rails4_updates 
Some Rails4 updates
 2013-07-22 15:03:37 -07:00
Régis Hanol 6474e7df97 uploads selector texts is now different when attachments are enabled 2013-07-22 23:15:23 +02:00
Robin Ward 6221fe2d60 JSHint fix 2013-07-22 16:56:09 -04:00
Robin Ward 43ceacabab Link to edit "About Me" links directly to the field. 2013-07-22 16:53:21 -04:00
Régis Hanol dbf6fb0232 change the pipe into a bullet in the lightbox overlay 2013-07-22 22:41:08 +02:00
Stephan Kaag b58da2fcf9 Add some TODO's 2013-07-22 22:39:20 +02:00
Stephan Kaag ebd5fa76c5 Reuse post-analyzer and cooked-document when requesting multiple post stats 2013-07-22 22:24:47 +02:00
Michael Campagnaro a0465485b4 use group.get as per PR comment 2013-07-22 16:19:08 -04:00
Stephan Kaag ad2b667504 Remove dead code 2013-07-22 22:16:46 +02:00
Neil Lalonde b0ca3a34ca Neil have fixed his grammar 2013-07-22 15:45:46 -04:00
Robin Ward fd1d376975 Merge pull request #1235 from stephankaag/remove_all 
Remove some calls to `all`
 2013-07-22 12:26:00 -07:00
Robin Ward 0ad93e436c Merge pull request #1232 from sir-pinecone/fix-group-member-removal 
Fix for autocomplete delete action removing only the last item
 2013-07-22 12:22:14 -07:00
Robin Ward 5398553628 Merge pull request #1234 from stephankaag/template_args 
Determine template_args only once per instance
 2013-07-22 12:20:23 -07:00
Robin Ward 4aa8f718d0 Merge pull request #1236 from jbruni/pt_BR 
Brazilian Portuguese translation of "static" files (FAQ, TOS and Privacy)
 2013-07-22 12:18:34 -07:00
Robin Ward 3e7b418ea8 First Try: Include Post History (context) in Notification Emails 2013-07-22 15:06:37 -04:00
J. Bruni e257cfc56c Merge branch 'master' into pt_BR 2013-07-22 16:00:09 -03:00
J. Bruni 1c78b485d3 Brazilian Portuguese translation (FAQ) - improvements and corrections 2013-07-22 15:46:26 -03:00
J. Bruni 701eac17c7 Brazilian Portuguese translation (Terms of Service) 2013-07-22 15:45:40 -03:00
Stephan Kaag 0e3b8fbb24 Remove some calls to `all`. They are not required, and Rails4 raises warnings about them. 2013-07-22 20:44:11 +02:00
Stephan Kaag ea51f0fe04 Determine template_args only once per instance 2013-07-22 20:20:41 +02:00
Stephan Kaag b19f631b3a Some Rails4 updates 2013-07-22 19:01:22 +02:00
Robin Ward 112b9f9c2a FIX: The previous flag reason was selected when opening the modal. 2013-07-22 12:05:13 -04:00
Robin Ward e73c809836 FIX: Reply as new Topic wasn't clearing drafts 2013-07-22 11:42:22 -04:00
Neil Lalonde 52acbec647 Load pagedown_custom.js a bit later so it can use translations 2013-07-22 11:01:15 -04:00
Robin Ward 0c4e3d5233 Merge pull request #1221 from jbruni/patch-1 
Update faq.en.html.erb (only fixed a comma position)
 2013-07-22 07:35:00 -07:00
Robin Ward a71e4d5216 Merge pull request #1219 from bolandrm/fix_graphical_error_admin_dash 
Fix Graphical Error on Admin Dashboard
 2013-07-22 07:33:08 -07:00
Robin Ward ed745c3fdd Merge pull request #1222 from ZogStriP/fix-s3-related-issues 
Fix s3 related issues
 2013-07-22 07:30:41 -07:00
Robin Ward 0f1533f41d Merge pull request #1229 from ZogStriP/close-lightbox-when-using-back-button 
FIX: lightbox is not closed when using the back button
 2013-07-22 07:29:53 -07:00