Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,281 Commits 248 Branches 502 Tags 914 MiB
Commit Graph

3281 Commits

Author SHA1 Message Date
Neil Lalonde 41729aab14 Stub site setting methods instead of setting them 2013-07-03 16:54:41 -04:00
Neil Lalonde 2c8ed8414c If an auto-closing topic is manually closed, remove the auto-close countdown 2013-07-03 16:54:41 -04:00
Robin Ward 44cd5505d3 FIX: Repeatedly editing a post was popping up abandon dialog 2013-07-03 15:57:23 -04:00
Stephan Kaag 7cc7116680 No need to include all ActionView::Helpers in Topic, we only need the sanitize helper. 
This also fixes a bug in Rails 4 where image_url gets accidentally overridden.
 2013-07-03 21:43:29 +02:00
Kuba Brecka f7e2b3be7f remove localization duplicate - seems like a typo 2013-07-03 21:27:46 +02:00
Kuba Brecka e58f9ef843 cs translation update 2013-07-03 21:22:41 +02:00
Neil Lalonde 115491a057 Don't overlap post date with a quote inside an embedded post. CSS could still be improved. 2013-07-03 15:11:35 -04:00
Robin Ward ba0bd934ba FIX: Links to images in posts won't go through the Discoruse router 2013-07-03 14:06:34 -04:00
Robin Ward b0e10673a2 FIX: Small bugs with progress indicator 2013-07-03 12:31:00 -04:00
Neil Lalonde 80928de21e Don't double render faq and privacy policy 2013-07-03 11:57:27 -04:00
Robin Ward ffac22a143 FIX: Support underscores in autocomplete widget 2013-07-03 11:48:59 -04:00
Robin Ward c7ac11458b FIX: Removed some leftover posts references outside of the stream 2013-07-03 11:29:29 -04:00
Robin Ward f328804488 Merge branch 'add-list-of-authorized-extensions' of git://github.com/ZogStriP/discourse into ZogStriP-add-list-of-authorized-extensions 
Conflicts:
	app/models/site_setting.rb
 2013-07-03 11:18:42 -04:00
Robin Ward 07791ea471 Fix update statement for Rails 4 preparation 2013-07-03 11:17:16 -04:00
Robin Ward 6364fc74ef Merge branch 'rewrite_update_alls' of git://github.com/stephankaag/discourse-1 into stephankaag-rewrite_update_alls 
Conflicts:
	app/services/spam_rules_enforcer.rb
 2013-07-03 11:13:56 -04:00
Robin Ward c12e87650d Merge pull request #1130 from adrianlang/patch-1 
Fix German translation of user_automatically blocked template
 2013-07-03 08:06:15 -07:00
Robin Ward 3f28edbd32 Merge pull request #1132 from ThomasHarper/patch-8 
Update client.fr.yml
 2013-07-03 07:58:35 -07:00
ThomasHarper 7ef5f0ac9b Update server.fr.yml 2013-07-03 14:47:38 +02:00
ThomasHarper 4f10ea9880 Update server.fr.yml 
Added few POPS3 translations and few things
 2013-07-03 14:22:31 +02:00
ThomasHarper 67502d0c8e Update server.fr.yml 
added cas_domainname
 2013-07-03 14:07:26 +02:00
ThomasHarper 64a00e284e Update client.fr.yml 
Missing capital on homepage
 2013-07-03 11:43:52 +02:00
Navin 3da37506da Back end - temporary boosting of trust levels 2013-07-03 10:30:40 +02:00
Navin f92d9cec47 Front end mods to use combobox for selecting user's trust level 2013-07-03 10:30:32 +02:00
Adrian Lang 5ea2bce646 Fix German translation of user_automatically blocked template 
Right now this bug prevents blocking with German locale.
 2013-07-03 09:38:21 +02:00
Sam d3cfb56000 buggy is reply directly below 2013-07-03 16:48:55 +10:00
Sam 4d4a5735d2 logic to bypass trust level filter for high scoring posts 2013-07-03 12:37:17 +10:00
Robin Ward ce0a7739cf FIX: Invalid Unicode in preload store JSON 2013-07-02 20:43:52 -04:00
Neil Lalonde bb74c8b9cf Widen the Age column on categories page to fit the new date format 2013-07-02 17:22:35 -04:00
Neil Lalonde 0270ee0d98 Add classes to td's in suggested topics 2013-07-02 17:03:23 -04:00
Robin Ward 05fe33111e FIX: Moving a post should also update its TopicLink records 2013-07-02 16:42:25 -04:00
Robin Ward 22e6b3f466 FIX: When moving topics to an existing topic, say it's an existing topic in the moderator message. 2013-07-02 15:47:15 -04:00
Robin Ward 9c552c39a2 FIX: CSS for post selection was off in lower resolutions 2013-07-02 15:29:05 -04:00
Robin Ward 7f70bc3bbd Add `discourse.forum` to all List-Ids 2013-07-02 15:21:34 -04:00
Neil Lalonde 0fde2a2d54 Move post timestamp in embedded post to the top right 2013-07-02 15:10:58 -04:00
Neil Lalonde 075ed1ab53 Refactor user blocking code; hide the Block button in admin 2013-07-02 14:42:53 -04:00
Robin Ward fab1be7c8e Adds a List-Id header to outgoing mail 2013-07-02 14:13:46 -04:00
Robin Ward 1308dbbef7 FIX: Quote popup broke in refactor 2013-07-02 13:36:38 -04:00
Robin Ward a04924deea FIX: Progress wasn't docking properly 2013-07-02 13:10:38 -04:00
Robin Ward 064efa1671 FIX: Progress bar updates faster 2013-07-02 12:46:49 -04:00
Stephan Kaag 89b621d31a Refactor update_all statements in order to prevent deprecation warnings in Rails 4 2013-07-02 18:36:47 +02:00
Robin Ward 5770879472 Refactor: Move Topic Details into better objects, identity map, tests, query string filters 2013-07-02 10:36:46 -04:00
Robin Ward d051e35000 Merge pull request #1117 from maddenwg/improve-docs 
add step to drop and recreate database before changing seed Edit
 2013-07-02 07:10:09 -07:00
Robin Ward 9820e1b046 Merge pull request #1129 from merugear/patch-1 
Changed grammar on powered_by_html
 2013-07-02 07:07:28 -07:00
merugear f47effa154 Changed grammar on powered_by_html 2013-07-02 12:11:28 +02:00
Jeff Atwood 8057851cf5 "there are no more" is sufficient, drop "to read" 2013-07-01 23:29:49 -07:00
Sam 12f866a727 Merge pull request #1120 from abbat/master 
Russian translation (actual version)
 2013-07-01 22:44:30 -07:00
Sam b664b9aeb3 Merge pull request #1121 from mfeckie/update-readme 
Update README.md to link to Ubuntu install guide
 2013-07-01 22:43:11 -07:00
Sam 9ef2ad1d66 Merge pull request #1126 from rylnd/refactor_logging 
Refactor duplicated #log method
 2013-07-01 22:22:45 -07:00
Sam c3f64f99b3 fix up messed up routes 2013-07-02 15:21:26 +10:00
Sam e4baea77be guide had invalid api 2013-07-02 13:19:52 +10:00