Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,529 Commits 213 Branches 500 Tags 872 MiB
Commit Graph

16529 Commits

Author SHA1 Message Date
Sam 0ed1436a51 Merge pull request #3846 from gschlager/patch-2 
Disable byebug when RubyMine is used for debugging
 2015-10-10 11:37:59 +11:00
Gerhard Schlager 8b3b14a704 Disable byebug when RubyMine is used for debugging 
Debugger in RubyMine doesn't work well with byebug.
For example, debugging Sidekiq jobs doesn't work when byebug is loaded.
 2015-10-09 21:51:47 +02:00
Matt Palmer fb4a40e628 Fix rails server start command in Vagrant guide 
Thanks to Mittineague on meta for pointing out this needed to be fixed
for newer Rails versions.
 2015-10-09 08:47:01 +11:00
Arpit Jalan fa0f731427 FIX: do not show image as category description 2015-10-08 19:36:16 +11:00
Neil Lalonde f8aca6d530 Merge pull request #3824 from gschlager/phpbb3-importer-patch1 
FIX: phpBB3 importer should ignore unknown topic_id in internal link
 2015-10-07 19:08:47 -04:00
Neil Lalonde 91fdfa986f Merge pull request #3823 from gschlager/phpbb3-importer 
FIX: phpBB3 importer failed to import users
 2015-10-07 19:08:05 -04:00
Sam 845c33e4b1 SECURITY: XSS in search results term 
Thanks to Jerbi Nessim
 2015-10-07 10:52:24 +11:00
Régis Hanol 81a48af1a3 Merge pull request #3837 from cpradio/top-period-setting-choices 
FEATURE: Allow default period to be set for Top Page
 2015-10-07 10:18:26 +11:00
Régis Hanol 0696cf5f48 Merge pull request #3838 from gschlager/phpbb3-importer-patch2 
FIX: phpBB3 importer should ignore invalid birthdates
 2015-10-07 10:16:14 +11:00
Gerhard Schlager a3afdba59e FIX: phpBB3 importer should ignore invalid birthdates 2015-10-06 21:08:54 +02:00
cpradio 8cabc14099 FEATURE: Allow default period to be set for Top Page 2015-10-06 12:04:31 -04:00
Jeff Atwood af7d51e923 Merge pull request #3831 from tgxworld/fix_emoji_toolbar 
UX: Emoji toolbar on mobile.
 2015-10-05 17:30:19 +11:00
Jeff Atwood 9d9af1f79d Update README.md 
fix inverted links for screenshots
 2015-10-05 17:26:24 +11:00
Régis Hanol 9f14c197f2 less errors in js tests suite 2015-10-05 17:04:19 +11:00
Sam Saffron 85f1cf7d1b correct test 2015-10-05 16:45:53 +11:00
Sam Saffron 4ade6138d3 FIX: suggested topics showing up when last post not loaded 
New fix means that was show suggested

1. If all posts are loaded
2. If we are in the process of loading 1 more post due to message bus
 2015-10-05 16:10:00 +11:00
Régis Hanol b30a90f7fe Merge pull request #3833 from dandv/patch-5 
Fix run-on sentence re. entering HTML tables
 2015-10-05 15:46:07 +11:00
Régis Hanol 196954e355 Merge pull request #3835 from scossar/category-unread-typo 
FIX: typo in category-unread.hbs
 2015-10-05 15:44:45 +11:00
scossar 71bc7d2e89 fix typo 2015-10-04 10:49:58 -07:00
Dan Dascalescu cce830e42c Fix run-on sentence re. entering HTML tables 2015-10-03 20:54:10 -07:00
Guo Xiang Tan 8b59f76f59 FIX: Don't append when there is nothing to append. 2015-10-03 17:22:13 +08:00
Guo Xiang Tan 904a36eea2 UX: Emoji Toolbar was too wide on mobile. 2015-10-03 17:08:13 +08:00
Sam 992386b22e Merge pull request #3829 from cpradio/fix-liked-avatars 
FIX: Who Liked a Post now shows UserCard when avatar is clicked
 2015-10-03 08:34:28 +10:00
cpradio 57c1b15911 FIX: Who Liked a Post now shows UserCard when avatar is clicked 2015-10-02 18:10:06 -04:00
Neil Lalonde 95e90ee9aa Version bump to v1.5.0.beta2 2015-10-02 11:08:09 -04:00
Neil Lalonde 1e5ad6f219 Update translations 2015-10-02 10:40:28 -04:00
Jeff Atwood ccb55b82e6 adjust alignment of topic progress popup 2015-10-02 02:41:37 -07:00
Sam 1754fcccf7 PERF: instead of N redis operations perform in bulk 2015-10-02 15:00:51 +10:00
Sam 43345063b9 PERF: avoid needless :try invokes respond_to? etc 2015-10-02 15:00:00 +10:00
Sam 6246dd0aa2 PERF: memoize to avoid N+1 query in category page 2015-10-02 12:35:47 +10:00
Sam 55c0f6a20c PERF: avoid method_missing 2015-10-02 12:27:38 +10:00
Sam 38f50d3bcc FIX: stop rendering blank urls for icons 
You get an instant double request if you allow rendering of "" as
a favicon or apple touch icon.
 2015-10-02 10:12:58 +10:00
Régis Hanol 2c384aec83 FIX: reply as new topic wasn't working in FF when the post was only composed of an image 2015-10-01 21:43:43 +02:00
Jeff Atwood 2c9058ab00 Merge pull request #3828 from discourse/revert-3827-align-topic-progress 
Revert "FIX: align topic-progress with topic-progress-expanded"
 2015-10-01 10:13:36 -07:00
Jeff Atwood 0237bece88 Revert "FIX: align topic-progress with topic-progress-expanded" 2015-10-01 10:13:31 -07:00
Régis Hanol c4285147bf Merge pull request #3827 from scossar/align-topic-progress 
FIX: align topic-progress with topic-progress-expanded
 2015-10-01 19:10:01 +02:00
scossar de61ae272a align topic-progress with topic-progress-expanded 2015-10-01 10:01:57 -07:00
Neil Lalonde dd0a7107a8 FIX: canonical urls for category and topic pages was wrong when deployed to subfolder 2015-10-01 12:24:07 -04:00
Régis Hanol c7b344b00f Merge pull request #3826 from gschlager/patch-1 
Adds pluralization to js.user.invited.truncated
 2015-10-01 16:26:22 +02:00
Gerhard Schlager 7186b4d641 Adds pluralization to js.user.invited.truncated 
https://meta.discourse.org/t/showing-the-first-count-invites-needs-pluralization/33988
 2015-10-01 16:22:08 +02:00
Sam 6f43b575a8 FEATURE: no need to cap new and unread together anymore 
- leave unread alone
- cap new at 500 per site, with a site setting
 2015-10-01 17:17:15 +10:00
Régis Hanol 9bb7a3884b fix the build 2015-10-01 01:17:34 +02:00
Jeff Atwood 0b295150e7 UX: clearer delete user action buttons 2015-09-30 16:06:55 -07:00
Régis Hanol 25cb19eeca FIX: hide 'Quote Reply' button when there's no selection anymore on iOS 2015-10-01 00:11:18 +02:00
Gerhard Schlager ba0cbd5658 FIX: phpBB3 importer should ignore unknonw topic_id in internal link 2015-09-30 21:55:34 +02:00
Robin Ward 7bd51e7882 FIX: Don't incldue whispers in context emails 2015-09-30 12:39:56 -04:00
Robin Ward 33e58c0587 FIX: You can click to see your own PMs from flags 
Also refactors post action users to be a new object type since they can
have `post_url` which is not a field of a `User`
 2015-09-30 12:28:55 -04:00
Gerhard Schlager a03ead9767 FIX: phpBB3 importer failed to import users 
FEATURE: Skip batches if posts or messages exists
 2015-09-30 17:56:37 +02:00
Arpit Jalan 97fbf09259 UX: post action glyphs color on mobile should match desktop color 2015-09-30 20:30:52 +05:30
Gerhard Schlager 29d27ec2ef FIX: Prevent cast error when import_id contains strings and numbers 
Some importers insert numbers and strings as import_id into the same
custom_fields table. This change prevents cast errors during imports.
 2015-09-30 16:38:06 +02:00