Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,516 Commits 235 Branches 500 Tags 866 MiB
Commit Graph

2516 Commits

Author SHA1 Message Date
Neil Lalonde dc07563c0d Add unstarred_at column to topic_users so we can permanently track when topics are starred 2013-04-29 11:39:05 -04:00
Neil Lalonde 60208e3ded Merge pull request #787 from PabloC/master 
Oneboxer for Slideshare
 2013-04-29 08:16:11 -07:00
Pablo Corral 2ff244a7ca new oneboxer for Slideshare 2013-04-29 15:31:29 +02:00
Sam 56a6c96f38 same as previous commit, but with more force 2013-04-29 17:11:20 +10:00
Sam f44fe3e689 dear smoke test, I love you, thanks ... the management 2013-04-29 16:52:56 +10:00
Sam 5cfcdc7ef0 backend for secure categories mostly done (todo pm groups) 2013-04-29 16:33:43 +10:00
Sam a99efecb39 Merge pull request #783 from bolandrm/rotten_tomatoes_onebox 
added rottentomatoes.com onebox
 2013-04-28 20:46:50 -07:00
Hugo Almeida 4f77c61654 Fixed combo boxes display in edit history 2013-04-29 04:02:11 +01:00
Sam b5e01e5a87 Merge pull request #782 from sanderdatema/dutch_translation 
Updates to Dutch translation
 2013-04-28 19:05:41 -07:00
Sam c850dd9f88 Merge pull request #784 from ZogStriP/fix-right-click-on-selection-deselects 
FIX: right click on selection deselects
 2013-04-28 19:01:55 -07:00
Sam 1b3faaa60f Merge pull request #785 from ZogStriP/show-diff-in-history-view 
show diff in post history view
 2013-04-28 19:01:31 -07:00
Régis Hanol ede9d2a0a8 show diff in post history view 2013-04-29 03:20:51 +02:00
Régis Hanol a651270c09 FIX: right click on selection deselects 2013-04-29 01:38:14 +02:00
Ryan Boland 9bc8faeaf2 added rottentomatoes.com onebox 2013-04-28 16:24:03 -04:00
Sander Datema 76e447ff8d Updates to Dutch translation 
Updated til commit 9e3b70c20e
 2013-04-28 15:42:21 +02:00
Jeff Atwood 9e3b70c20e Merge pull request #780 from jroes/fix-778 
Strip whitespace when changing e-mail addresses
 2013-04-28 02:03:30 -07:00
Sam a6d2c9db03 Merge pull request #776 from jroes/use-oj 
Use oj for json encoding
 2013-04-28 00:42:10 -07:00
Jonathan Roes 057b4768e6 strip whitespace when changing e-mail addresses 
Fixes #778.
 2013-04-27 23:03:06 -04:00
Jeff Atwood 7b8c40028e Merge pull request #779 from ZogStriP/flash-draft-status-for-new-users 
flash draft status when requirements are not met for new users
 2013-04-27 18:16:40 -07:00
Régis Hanol 0b222550f7 flash draft status when requirements are not met for new users 2013-04-28 02:37:53 +02:00
Jeff Atwood b30445c3ef Merge pull request #777 from ZogStriP/meaningful-error-message-on-upload 
add meaningful error message on upload [fixes #773]
 2013-04-27 12:03:12 -07:00
Régis Hanol dca2fbcefc add meaningful error message on upload [fixes #773] 2013-04-27 20:26:17 +02:00
Jon Roes abfcb93904 use oj for json encoding 2013-04-26 21:45:53 -04:00
Jeff Atwood eae2e74152 Merge pull request #774 from ZogStriP/patch-1 
force the browse dialog to only accept images...
 2013-04-26 17:15:09 -07:00
Neil Lalonde bbf982984d Add TOS and Privacy Policy site settings that can link to external sites. 2013-04-26 18:46:36 -04:00
Jeff Atwood 514df5441a these parens! 2013-04-26 15:32:26 -07:00
Jeff Atwood 2e2160f964 oops my bad 2013-04-26 15:26:59 -07:00
Jeff Atwood 01e0226086 ignore username matches inside <pre> or <code> 
also remember, lazy ? faster than greedy, less backtracking
 2013-04-26 15:11:26 -07:00
Jeff Atwood dd9ea50456 fix username lookup regex for mentions 2013-04-26 14:34:12 -07:00
Neil Lalonde 1375954fbc Add title tags to dashboard stats to show percent change from previous period 2013-04-26 17:14:03 -04:00
Neil Lalonde c589b4b187 Add a js spec for admin/report model, and find a bug too 2013-04-26 17:14:02 -04:00
Jeff Atwood a1c879668d f**k you && and || 2013-04-26 13:09:40 -07:00
Neil Lalonde 6063f81946 Show something on categories page when js is disabled 2013-04-26 13:10:41 -04:00
Régis Hanol 07b9c47efe force the browse dialog to only accept images 
on image upload
 2013-04-26 13:56:05 +03:00
Sam b82e408351 add list unsubscribe 2013-04-26 16:56:28 +10:00
Sam f9e33ec6b8 store ip address and current user with incoming links 
make links long an readable in share dialog
 2013-04-26 16:18:55 +10:00
Sam a56a926582 seed fu should not run before the suite, just before fork 
we have no seeds.rb so do nothing there
 2013-04-26 16:18:55 +10:00
Sam 7d9fd350d3 dup is critical cause people are mucking with stuff that comes out of the cache 2013-04-26 16:18:55 +10:00
Sam 5ccc3edcbe bug fixes with test runner 2013-04-26 16:18:54 +10:00
Sam 67dc590794 gem downgrade to keep guard happy 2013-04-26 16:18:54 +10:00
Sam eb085beea8 attempt to fix the UTF-8 warn in the log, turns out this runs really deep, when you hit deliver in test it clones the mail not setting charset properly, leaving as is for today but fixing prod at least 2013-04-26 16:18:54 +10:00
Sam 14f33b80e4 lets not let without a block rspec gets very upset 2013-04-26 16:18:54 +10:00
Sam 9cf03b352c fix rspec runner for neil 2013-04-26 16:18:54 +10:00
Sam 1076aa50a8 big gem update 2013-04-26 16:18:54 +10:00
Sam bb30ccb5db Merge pull request #772 from Merp/master 
Fix for Issue #756
 2013-04-25 17:52:49 -07:00
Merp 71d2903879 Bugfix for change password button in user preferences, fixed bad function parameter name passed to forgot_password. 2013-04-25 20:06:31 -04:00
Sam f0d3500ada Merge pull request #735 from kubabrecka/i18n_user_actions4 
move i18n of UserActions to JS-side and make sentences translatable (take 3)
 2013-04-25 15:53:17 -07:00
Sam f8c6a47892 Merge pull request #770 from ZogStriP/keep-french-l10n-up-to-date 
keep French l10n up to date
 2013-04-25 15:52:41 -07:00
Jeff Atwood 4dbe25bfc2 very minor new user education copy tweaks 2013-04-25 15:42:03 -07:00
Neil Lalonde 159c9b10d5 Add a nag to admin dashboard if you haven't changed the title site setting from the default 'Discourse' 2013-04-25 17:53:31 -04:00