Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
14,402 Commits 218 Branches 500 Tags 887 MiB
Commit Graph

14402 Commits

Author SHA1 Message Date
Gerhard Schlager 409a367ab7 Replace all occurrences of totalVotes 2015-05-04 16:20:13 +02:00
Régis Hanol 86d7412f30 REFACTOR: rename "total_votes" poll field to the more accurate "voters" 
FEATURE: automagically load plugin's migrations
 2015-05-04 16:01:57 +02:00
Jeff Atwood 8f706f11cb remove trust level reference from flag unhide PM 2015-05-04 01:19:04 -07:00
Régis Hanol e9ade9c0e1 Merge pull request #3428 from techAPJ/patch-2 
UX: show caps lock warning on password reset page
 2015-05-04 09:38:02 +02:00
Arpit Jalan f3687b6e56 UX: show caps lock warning on password reset page 2015-05-04 13:01:35 +05:30
Sam bbef1e3493 whitelisted correctly later on 2015-05-04 16:32:31 +10:00
Jeff Atwood 77992a11b9 correct copy and de-experimental browser icon count 2015-05-03 23:29:56 -07:00
Jeff Atwood 9a2d999d5a Merge pull request #3427 from techAPJ/patch-3 
FIX: allow site_name to be present in rejection email subject
 2015-05-03 23:23:54 -07:00
Sam 539ca73668 avoid N+1 query even if no custom fields exist 2015-05-04 16:12:03 +10:00
Sam 0369f26a39 add some ignores 2015-05-04 16:12:03 +10:00
Sam c3e3afcb2c PERF: eliminate N+1 query due to polls 2015-05-04 16:12:03 +10:00
Arpit Jalan d9ec6888e1 FIX: allow site_name to be present in rejection email subject 2015-05-04 11:22:54 +05:30
Sam 374e7325fa Merge pull request #3416 from gschlager/transifex 
Simplify the pull_translations script
 2015-05-04 14:39:02 +10:00
Sam 4dfc1907ac Simplify desktop notifications, only include if mention/reply/pm/link 
Include post excerpt in the notification
 2015-05-04 13:49:32 +10:00
Sam 803feefd54 MessageBus handles readonly redis now, no need to wrap it 2015-05-04 12:21:00 +10:00
Sam 1c7fa956dc Improve Notification probing 2015-05-04 11:14:03 +10:00
Sam 5623827433 careful checking for a global that is not there 2015-05-04 11:08:52 +10:00
Sam 77a3bc1045 Merge pull request #3364 from rubo77/patch-3 
Keeping your VM up to date (and first install)
 2015-05-04 10:25:44 +10:00
Sam fe34a6acbd Merge pull request #3420 from techAPJ/patch-2 
FEATURE: accept category_id as new-topic param to better support subcategory
 2015-05-04 10:13:06 +10:00
Sam 9723b77b6d Merge pull request #3422 from riking/notifications-patches 
FIX: Don't ask for notification permission until first one
 2015-05-04 10:10:23 +10:00
Sam 4408ea2a42 FIX: if redis is flushed message bus will keep working 
also remove message bus dependency on eventmachine
 2015-05-04 10:03:22 +10:00
Régis Hanol 0a062112d9 Merge pull request #3425 from gschlager/patch-1 
FIX: error message used wrong filesize
 2015-05-03 21:57:05 +02:00
Régis Hanol 44bf8fc7f7 Merge pull request #3423 from gschlager/polls-refactor 
Extract the parsing of polls
 2015-05-03 19:50:58 +02:00
Régis Hanol 5df7a5b4e3 Merge pull request #3421 from gschlager/poll 
FIX: closed polls with no votes showed NaN as percentage and average
 2015-05-03 19:50:29 +02:00
Gerhard Schlager 9a76ee8f8a FIX: error message used wrong filesize 2015-05-03 19:26:54 +02:00
Régis Hanol c9d72e8845 Merge pull request #3424 from Elberet/patch-1 
Fix: @mention dialect matches too often
 2015-05-03 19:02:27 +02:00
Jens Maier 23cde96a1b Fix: @mention dialect matches too often 2015-05-03 18:30:53 +02:00
Gerhard Schlager 9bc750e43d Extract the parsing of polls 2015-05-02 23:44:45 +02:00
riking 6ea2051c4e FIX: Don't ask for notification permission until first one 2015-05-02 12:53:30 -07:00
Jeff Atwood 83b7620cb2 use pencil glyph on edit history dialog 2015-05-02 03:48:37 -07:00
Jeff Atwood bbb1348118 add Swiftbot to crawler regex 2015-05-02 03:18:58 -07:00
Gerhard Schlager c9e4fd578d FIX: closed polls with no votes showed NaN as percentage and average 2015-05-02 01:58:23 +02:00
Jeff Atwood 2ead293098 Merge pull request #3419 from techAPJ/patch-1 
FIX: include youtube link in embedded comments
 2015-05-01 14:54:13 -07:00
Arpit Jalan 480cea7284 FEATURE: accept category_id as new-topic param to better support subcategory 2015-05-01 21:40:28 +05:30
Neil Lalonde 8521ee24b1 FIX: /password-reset route now works when login_required is enabled 2015-05-01 11:14:09 -04:00
Régis Hanol 2954c99a1e FEATURE: new 'poll_maximum_options' site setting to limit the number of options in a poll 2015-05-01 16:44:51 +02:00
Régis Hanol f83638c154 FIX: check the selected options when casting a vote 2015-05-01 16:33:24 +02:00
Régis Hanol 9106331d4f FIX: 'migrate_old_poll' rake task to support options with HTML 2015-05-01 15:53:02 +02:00
Arpit Jalan 23fd16850a FIX: include youtube link in embedded comments 2015-05-01 18:34:45 +05:30
Jeff Atwood 80003e0821 improve copy for password change token expired 2015-05-01 01:39:53 -07:00
Jeff Atwood 0810022caf Merge branch 'master' of https://github.com/discourse/discourse 2015-05-01 01:30:16 -07:00
Jeff Atwood bafcfa5b6a Improve password reset expired link copy 2015-05-01 01:30:13 -07:00
Régis Hanol 062c72336f Merge pull request #3418 from Elberet/supsup 
Apply fix against nested SUP tags to preview
 2015-05-01 10:10:13 +02:00
Jeff Atwood 7c42cb7c22 "reset password" doesn't exist, forgot does. 2015-05-01 00:52:50 -07:00
Jeff Atwood 6139090e9e improvement to accept invite password instructions 2015-05-01 00:51:17 -07:00
Sam 4f1c6a30cd Update logster so it does not crash error reporting where redis is down 2015-05-01 17:21:14 +10:00
Sam 6993fb36ac FIX: distributed cache failing to clear certain values sometimes 
this makes the cache resilient to cross machine / forking concerns
 2015-05-01 15:25:23 +10:00
Robin Ward f9069c350f FIX: Permission issues when editing topics 
If a user can't create a topic in a category, they should'be be
able to edit topics.
 2015-04-30 17:08:12 -04:00
Jens Maier 1a692bee0c Apply fix against nested SUP tags to preview 2015-04-30 23:05:04 +02:00
Robin Ward 886cd41b15 Merge pull request #3417 from techAPJ/patch-2 
FIX: flagging topic was giving error message
 2015-04-30 16:50:37 -04:00