Commit Graph

7552 Commits

Author SHA1 Message Date
Neil Lalonde 95e6419fd8 Merge pull request #2200 from awesomerobot/master
adding styles for preformatted text not covered by highlight.js
2014-03-27 15:45:39 -04:00
Kris Aubuchon 99fb7b74b0 adding styles for preformatted text not covered by highlight.js 2014-03-27 15:36:14 -04:00
Neil Lalonde 0d57e4b235 FIX: render uncategorized badge in category chooser 2014-03-27 15:25:47 -04:00
Neil Lalonde 5d4995640b Use sub-category badge on categories page too 2014-03-27 15:25:47 -04:00
Régis Hanol 32b7405941 BUGFIX: background on inline code blocks + pre blocks 2014-03-27 19:42:29 +01:00
Régis Hanol f397a3e157 Revert "BUGFIX: highlight standard code blocks"
This reverts commit d5b1b64bb8.
2014-03-27 19:21:32 +01:00
Régis Hanol 218384e86c make sure the draft-status is visible on mobile 2014-03-27 19:06:23 +01:00
Régis Hanol 20d9cb26fc make the composer smaller on mobile when creating/editing first post 2014-03-27 18:53:29 +01:00
Neil Lalonde 11c586ed93 Merge pull request #2198 from borhub/prevent_bgcolor_issues_in_basic_topic_list
Align basic-topic-list table structure with Categories page topic-list table structure
2014-03-27 12:26:37 -04:00
Régis Hanol 5edec22e28 fix the build 2014-03-27 16:57:46 +01:00
Régis Hanol e663d78104 SECURITY: sanitize markdown urls (prevent XSS) 2014-03-27 15:34:35 +01:00
Régis Hanol d5b1b64bb8 BUGFIX: highlight standard code blocks 2014-03-27 15:17:50 +01:00
Sam fe80e02b75 Merge pull request #2199 from chancancode/fix_deprecated_finder_methods
Remove deprecated finder method calls
2014-03-27 20:14:30 +11:00
Godfrey Chan b68dbe081c Remove deprecated finder method calls 2014-03-27 00:00:23 -07:00
Boris 0ad869c256 Align basic-topic-list table structure with Categories page topic-list table structure
This is an optimization for people that choose their table row highlighting to be inverse of the default Discourse theme.
If people choose to have the heading row (or individual th columns) and 'even' rows highlighted in topic-list.scss for the Categories page, the alternate coloring is not carried over to the User Activity page's Messages list. Because the basic-topic-list table there doesn't use the THEAD and TBODY wrappers, the first data row is effectively an 'odd' row, so highlighting is now applied both on the heading row and the first data row.
By adding the THEAD and TBODY wrappers, we make sure that the table structures across the app are the same and global row highlighting styles work out of the box also on the User Activity page.
2014-03-27 17:15:32 +11:00
Sam b7ff4173c9 BUGFIX: mitigate unbound table growth on top_topics 2014-03-27 15:43:24 +11:00
Jeff Atwood b046fab1c4 Merge pull request #2194 from awesomerobot/master
some basic variable reorganiztion
2014-03-26 20:47:04 -07:00
Kane York 810ee7e4df Improve plugins.md text 2014-03-26 20:34:08 -07:00
Kris Aubuchon 95d98a4266 some basic variable reorganiztion 2014-03-26 21:16:41 -04:00
slainer68 6fb323fd71 Delete enable_local_account_create option as it is not used anywhere.
JS fixture
2014-03-27 00:55:06 +01:00
Jorge Manrubia bd1047a579 Restore locale entry I shouldn't have removed 2014-03-26 23:20:19 +01:00
Jorge Manrubia 806924dd7e Option to change the email subject prefix
It adds a new setting 'email_prefix' to configure which [label] will be used in the subject of emails. Discourse currently uses '[title]'. The problem is that sometimes you need to set a longer title, that doesn't really work well for emails. I think this is very common since the HTML `<title>` tag is very important for SEO.

It will default to '[title]' if this setting is not used.

See: https://meta.discourse.org/t/where-to-change-the-email-subject-prefix/11989
2014-03-26 23:06:00 +01:00
Neil Lalonde ec1ea18877 FIX: rendering bug of private categories in category chooser 2014-03-26 16:55:07 -04:00
William Karavites fa2278c015 Formatting changes for the MAILING-LIST-SETUP doc
Added some formatting changes for the MAILING-LIST-SETUP doc to make it
easier to read.
2014-03-26 15:25:17 -04:00
Thomas Cioppettini 38882eb1a7 Remove threequals from ruby files 2014-03-26 12:20:41 -07:00
Neil Lalonde 2c6fe8ec29 Merge pull request #2189 from willkara/doc-edits
Add link to the main Discourse Plugin page for the PLUGINS doc.
2014-03-26 15:15:02 -04:00
Neil Lalonde 79caebc00e Merge pull request #2186 from pkgr/pkgr
Automatically generate a debian package
2014-03-26 15:14:31 -04:00
William Karavites 9599e3768f Add link to the main Discourse Plugin page for the PLUGINS doc.
Sorry for all of the crazy commits. I got my branches mixed up, I
should be good now.

This adds a link to the main discourse plugin page
2014-03-26 15:04:44 -04:00
Régis Hanol e5a04e3d5c BUGFIX: mismatched braces 2014-03-26 18:17:40 +01:00
Régis Hanol 59f3721fff Merge pull request #2187 from awesomerobot/master
fixing admin bar chart color
2014-03-26 17:32:24 +01:00
Kris Aubuchon 236eb66235 fixing admin bar chart color 2014-03-26 12:03:58 -04:00
Cyril Rohr 99772c9ea2 Fix .pkgr.yml so that discourse can be packaged with https://pkgr.io. 2014-03-26 15:08:53 +00:00
Cyril Rohr 3631ba2eb5 Use string interpolation, to avoid segmentation fault.
The segmentation fault was ocurring when precompiling assets, with ruby2.0.0.
2014-03-26 15:06:22 +00:00
Neil Lalonde 4d0035e7fd Remove the quote post button from pagedown editor when creating a topic and editing About Me in preferences 2014-03-26 10:45:22 -04:00
Neil Lalonde 0f98c1644a Remove more admin options code since it's gone from composer 2014-03-26 10:19:01 -04:00
Régis Hanol 71ba674167 Merge pull request #2185 from Mikulas/patch-missing-group-l10n
add localization to group administration
2014-03-26 14:32:20 +01:00
Mikulas c30a9365e4 add localization to group administration 2014-03-26 13:45:58 +01:00
Onaldanm 750745ba5f French Translations Updates
Updates client and server
Fix wrong "active" in privacy.html
Use same same terms between faq/tos/privacy page.
2014-03-26 11:24:58 +01:00
Sam be06156629 SECURITY: when enabled_local_logins is false users could log in via API
thanks @Nicholas Blanco
2014-03-26 15:39:44 +11:00
Sam 1a60969347 Update onebox gem 2014-03-26 15:07:42 +11:00
Sam 30d48a4ea4 Merge pull request #2183 from riking/class
Fix 0be7483f19
2014-03-26 15:01:33 +11:00
Sam 5897d3419c BUGFIX: identity_url was not fished out correctly
If I user logged in with Google and then changed email,
they would no longer be able to log in with google
2014-03-26 14:52:50 +11:00
Sam 49dbb992ad BUGFIX: someone missed a replacement 2014-03-26 13:22:04 +11:00
riking f51cffdb94 Rename style to onebox-avatar 2014-03-25 19:01:51 -07:00
Sam 0be7483f19 Merge pull request #2175 from riking/class
CSS rule for GitHub commit avatars
2014-03-26 11:45:56 +11:00
Jeff Atwood 1306eaedb2 we don't need max width on header logo 2014-03-25 17:04:15 -07:00
Sam 35ee341122 SECURITY: GitHub returns unvalidated emails 2014-03-26 10:55:36 +11:00
Thomas Cioppettini 2beaeed36d More idiomatic approach to finding drafts 2014-03-25 15:56:21 -07:00
Neil Lalonde 86244e3a4b New sub-category badges in category chooser. Normalize category badge rendering code. 2014-03-25 17:29:59 -04:00
Neil Lalonde ac32b1c5a5 Also show new sub-category badge in the message at the bottom of a topic 2014-03-25 16:20:13 -04:00