Commit graph

4386 commits

Author SHA1 Message Date
Sam
7b3618baf9 clean up style 2014-04-10 18:34:50 +10:00
Sam
cd8b30bfcb BUGFIX: clicking on home was broke 2014-04-10 18:31:39 +10:00
Benjamin Kampmann
72a6566bfd Prevent user from selecting the same category twice for different notification levels in their preferences 2014-04-10 10:08:59 +02:00
Sam
41631311e9 jiggle comment 2014-04-10 16:36:39 +10:00
Sam
49386412ca Merge pull request #2247 from bradx3/fix_null_topic_error
BUGFIX: suppress error when scrolling at bottom of topic
2014-04-10 16:33:01 +10:00
Sam
97269fc918 FEATURE: education panel on pinning at bottom of topics 2014-04-10 15:53:58 +10:00
Brad Wilson
629e6f4158 BUGFIX: suppress error when scrolling at bottom of topic
fixes "Uncaught TypeError: Cannot call method 'get' of null" when 
scrolling at the bottom of the topic screen.
2014-04-10 15:36:44 +10:00
Kris Aubuchon
ec96ca4c60 modifying some styles for the new pin/unpin feature 2014-04-09 23:27:05 -04:00
Kris Aubuchon
1725f6e5bc Merge remote-tracking branch 'upstream/master' 2014-04-09 21:26:00 -04:00
Kris Aubuchon
8067381782 de-bluing some non-links 2014-04-09 21:19:04 -04:00
Sam
b9d4edd91a FEATURE: display unpinned state, allow unpinning by clicking on pin 2014-04-10 10:59:02 +10:00
Jeff Atwood
3f6764ce22 don't need the external link glyph in summary now 2014-04-09 17:10:07 -07:00
Sam
ac097e2d0f Merge pull request #2244 from vikhyat/css-import
Site Customization @import fixes
2014-04-10 07:01:34 +10:00
Neil Lalonde
7d760a5145 Add subcategory badge to digest emails 2014-04-09 13:59:39 -04:00
Régis Hanol
c3a1c867dd REFACTOR: poll mailbox specs 2014-04-09 19:26:19 +02:00
Robin Ward
ce40a27274 FIX: If there is an invalid URI in the import, don't throw an error 2014-04-09 11:04:45 -04:00
Vikhyat Korrapati
33307a50b3 Get rid of plugins.css, inject it using DiscourseSassImporter. 2014-04-09 19:42:43 +05:30
Régis Hanol
3e72de7dc1 BUGFIX: share pop-up wasn't properly positioned when activated using keyboard 2014-04-09 16:01:09 +02:00
Vikhyat Korrapati
8c129e480a Always use DiscourseSassImporter, add optional sprockets deps tracking. 2014-04-09 19:17:19 +05:30
Sam
4c82386f80 BUGFIX: bust for anon 2014-04-09 11:24:33 +10:00
Sam
8cdf25532c Merge pull request #2207 from riking/list-setting
UI for list site settings
2014-04-09 09:34:50 +10:00
Sam
b0dc9279ff Merge pull request #2203 from riking/change-owner
Change post owner functionality
2014-04-09 09:31:46 +10:00
riking
6779bec58c Add UI for list site settings 2014-04-08 14:17:55 -07:00
riking
9c4dd1cb35 Change comma-delim site settings to pipe-delim 2014-04-08 14:17:55 -07:00
Robin Ward
aa63868d5e FIX: Problem crawling amazon titles 2014-04-08 16:39:47 -04:00
Robin Ward
c3bc49d5d4 Ditch params when showing link domains 2014-04-08 15:15:22 -04:00
Régis Hanol
79ad879170 BUGFIX: uses markdown instead of HTML when inserting hyperlinked images 2014-04-08 19:33:14 +02:00
Régis Hanol
6373de550f update annotations 2014-04-08 17:35:44 +02:00
Vikhyat Korrapati
ce4f87e461 Pass sprockets context and environment to Sass::Engine. 2014-04-08 20:09:11 +05:30
riking
eb90315dfd Strip whitespace from site settings 2014-04-08 01:59:48 -07:00
riking
1540a3d5e5 Allow changing ownwership of posts by admins 2014-04-08 01:47:42 -07:00
Sam
792393442f Merge pull request #2159 from riking/widen-gap
Widen 'post omitted' bars
2014-04-08 17:05:04 +10:00
Sam
d71f62a9f9 Merge pull request #2180 from tomciopp/master
More idiomatic approach to finding drafts
2014-04-08 16:46:24 +10:00
Sam
01cf3cf0c8 Merge pull request #2219 from fantasticfears/notifications_button
set visual indicator for active notification level
2014-04-08 16:36:52 +10:00
Sam
3e41c8fd87 Merge pull request #2236 from ligthyear/mobile-styles-via-plugin
Allow plugins to ship custom styles only for mobile
2014-04-08 16:17:21 +10:00
riking
8934d2b49d Fix 'post omitted' bar lengths 2014-04-07 16:02:33 -07:00
Robin Ward
1e3faddfe4 FIX: Change crawl size to 10k. Youtube for example doesn't work with the
first 1k
2014-04-07 16:03:47 -04:00
Robin Ward
7e0028ba50 FIX: Don't crawl in test mode, raise correct exception when parameters
are missing
2014-04-07 14:38:18 -04:00
Robin Ward
7e3ea5d644 Support for crawling topic links 2014-04-07 14:08:34 -04:00
Régis Hanol
7e7ca43a19 BUGFIX: backup/restore when using multisite 2014-04-07 17:55:38 +02:00
Neil Lalonde
a784583004 FIX: search of site settings supports space or underscore 2014-04-07 11:14:12 -04:00
Benjamin Kampmann
d22df7731d Allow plugins to ship custom styles only for mobile
- adds another :mobile-flag to register_assets
- adds test for plugin registering of assets
- load plugins when on desktop and plugins_mobile when on mobile
2014-04-07 16:33:35 +02:00
Jeff Atwood
4a2438edc3 tighten up spacing in expanded replies 2014-04-07 01:29:57 -07:00
Sam
0372b81d11 FEATURE: allow moderators to globally pin topics 2014-04-07 16:38:51 +10:00
Sam
d5ff793ea2 Merge pull request #2235 from awesomerobot/master
fixing the username font on windows
2014-04-07 11:42:36 +10:00
Sam
c6b525bd5c lets see if travis can give us some better info 2014-04-07 11:34:35 +10:00
Sam
fcd463cc36 disabled scroll sync pending fixes to be discussed in meta 2014-04-07 10:55:31 +10:00
Sam
f7644e2cdf BUGFIX: scroll sync messing with loose lists 2014-04-07 10:51:15 +10:00
Kris Aubuchon
dd18a07604 fixing the username font on windows 2014-04-06 20:08:08 -04:00
Sam
af6e376ee3 Merge pull request #2231 from arunisrael/fix_search_key_shortcut
[bugfix] Fix for '/' keyboard shortcut putting '/' into search input
2014-04-07 06:22:00 +10:00
Kris Aubuchon
0fcee0dd88 dialing back username weight, reply-to-tab text is now grey 2014-04-05 22:01:53 -04:00
Robin Ward
802ee04e9d FIX: Can click on links in expanded blog posts 2014-04-05 20:05:48 -04:00
Robin Ward
06913474b4 Add new class to expanded content so it can be styled 2014-04-05 15:01:28 -04:00
Arun Israel
9ced796674 [bugfix] Fix for '/' keyboard shortcut putting '/' into search input
Changed the search button binding from a click binding in mousetrap.js to a function binding.
Added a showSearch function that uses jquery to click the '#search-button' element
and the function returns false preventing the default action and stops the keydown event
from bubbling upwards.

Meta Discourse Bug Thread: https://meta.discourse.org/t/shortcut-for-search-leaves-a-in-the-search-field/14394
Mousetrap reference: http://craig.is/killing/mice
2014-04-05 01:38:00 -04:00
Kris Aubuchon
6d8164ec79 making usernames black instead of blue 2014-04-04 22:39:04 -04:00
Jeff Atwood
3385f23a40 remove display:inline from full-name 2014-04-04 15:48:12 -07:00
Neil Lalonde
45e75f3d48 FIX: normalize category badge code on edit category modal 2014-04-04 16:48:14 -04:00
Wojciech Zawistowski
2566d106d7 Markdown Editor clean up. 2014-04-04 20:22:18 +02:00
Régis Hanol
e7601db730 BUGFIX: ensured logged in wasn't listing all anonymous filters 2014-04-04 10:05:40 -07:00
Sam
78c844f8d8 BUGFIX: new users not getting correct error messages 2014-04-04 11:08:54 +11:00
Neil Lalonde
dc3739d49f Replace underscore with space when showing site setting names 2014-04-03 16:08:14 -04:00
Robin Ward
767048cc8d FIX: Strips spaces from the end of URLs 2014-04-03 15:35:31 -04:00
Robin Ward
dbab628e16 Support for creating embedded topics via API 2014-04-03 14:42:44 -04:00
Neil Lalonde
ecf211aa3f Send email to contact_email if there are flags submitted more than 48 hours ago. Configurable with the notify_about_flags_after site setting. 2014-04-03 14:34:40 -04:00
Régis Hanol
7fd0db857f BUGFIX: check image size before uploading an avatar/background 2014-04-03 19:19:38 +02:00
Robin Ward
faa341148e FIX: Escape name on activity feed 2014-04-03 11:54:51 -04:00
Robin Ward
10d0320532 FIX: Allow expanding posts when anonymous, add specs 2014-04-03 11:30:43 -04:00
Erick Guan
0e0013b73f *minus #show-topic-admin button z-index by 1 which will be covered by #user-dropdown
*Add 14px width for #topic-admin-menu icon, align the button text
2014-04-03 17:51:09 +00:00
Erick Guan
5226d8345c set visual indicator for active notification level 2014-04-03 12:01:31 +00:00
Sam
858eb5ed9a Merge pull request #2223 from velesin/about_me_editor_fix
FIX: broken Pagedown editor for About, Site Content and similar places.
2014-04-03 18:43:04 +11:00
Jeff Atwood
c19bbfa78e better use secondary text color a few places 2014-04-03 00:21:51 -07:00
Wojciech Zawistowski
6dd3909e38 FIX: broken Pagedown editor for About, Site Content and similar places. 2014-04-03 02:33:47 -04:00
Kris Aubuchon
3846826bb1 fixing blockquotes in composer preview 2014-04-02 22:59:25 -04:00
Robin Ward
079123f008 Allow the content_sha1 column of topic_embed to be nullable 2014-04-02 16:18:51 -04:00
Robin Ward
d1e7fa1c47 Minor tweaks to importing first posts 2014-04-02 15:54:21 -04:00
Robin Ward
558a06a117 Adds better reusable error message support. Added to fetching remote
posts. /cc @riking
2014-04-02 13:22:10 -04:00
Robin Ward
b250aa36a0 Remote fetching of blog contents 2014-04-02 10:26:46 -04:00
Robin Ward
50fb048b99 Interface for expanding OP contents 2014-04-02 10:26:46 -04:00
Robin Ward
f5c7ccb4e6 New field: Whether or not to include an expandable first post for
embedded content.
2014-04-02 10:26:46 -04:00
Sam
eff8b48da9 Revert "BUGFIX: raise message bus messages after data is committed"
This reverts commit d2926424d6.
2014-04-02 16:24:36 +11:00
Sam
d2926424d6 BUGFIX: raise message bus messages after data is committed 2014-04-02 12:47:28 +11:00
Régis Hanol
8032864efe Merge pull request #2217 from vikhyat/css-import
Allow importing Discourse styles in custom CSS
2014-04-01 20:14:09 +02:00
Jeff Atwood
3116715a69 reduce header icon left-margin to fit 2014-04-01 11:09:41 -07:00
Vikhyat Korrapati
45a23f524a Fix asset precompilation issues. 2014-04-01 23:05:17 +05:30
Vikhyat Korrapati
317f9bcd08 Use custom DiscourseSassImporter for site customization SCSS compilation. 2014-04-01 23:05:02 +05:30
Vikhyat Korrapati
ef99ab59a5 Allow importing Discourse styles in custom stylesheets to modify vars. 2014-04-01 23:04:50 +05:30
Régis Hanol
89a3311bf5 Merge pull request #2215 from vikhyat/fix-post-creation-jitter
Fix missing avatar while a post is being created
2014-04-01 16:31:44 +02:00
Régis Hanol
77a8a4083a Revert "Merge pull request #2125 from vikhyat/css-variables"
This reverts commit b537de3ca5, reversing
changes made to b925827e5b.
2014-04-01 16:24:29 +02:00
Vikhyat Korrapati
dea978d7fc Fix missing avatar while a post is being created. 2014-04-01 19:26:54 +05:30
Régis Hanol
b537de3ca5 Merge pull request #2125 from vikhyat/css-variables
Allow importing Discourse styles in custom stylesheets to modify vars
2014-04-01 15:24:09 +02:00
Régis Hanol
b925827e5b Merge pull request #2100 from velesin/synchronized_editor
Synced editor scrolling PoC.
2014-04-01 15:19:55 +02:00
Vikhyat Korrapati
df5ef38085 Use custom DiscourseSassImporter for site customization SCSS compilation. 2014-04-01 17:25:35 +05:30
Vikhyat Korrapati
ddd1dfe896 Allow importing Discourse styles in custom stylesheets to modify vars. 2014-04-01 15:25:43 +05:30
Robin Ward
58d43fc6f0 Merge pull request #2210 from jtescher/master
Remove confusing/incorrect comments
2014-03-31 16:02:52 -04:00
Robin Ward
08917e71bd Merge pull request #2211 from velesin/delayed_tab_switch_spinner
Delays loading spinner when switching between tabs.
2014-03-31 16:02:13 -04:00
Robin Ward
e3db0add5b Merge pull request #2213 from vikhyat/fix-title-lt
Unescape topic title before setting it as the document title
2014-03-31 16:00:13 -04:00
Wojciech Zawistowski
c0a11adbc5 Moves Markdown Editor from vendor to discourse. 2014-03-31 21:56:19 +02:00
Régis Hanol
ef24a4c71c FEATURE: add redirect_users_to_top_page site setting (default to true) 2014-03-31 21:53:38 +02:00
Wojciech Zawistowski
297c25ca1f Synced editor scrolling PoC. 2014-03-31 20:57:45 +02:00
Robin Ward
7baa8ea0af FIX: Upwards scrolling. Updates ember-cloaking 2014-03-31 14:32:51 -04:00
Neil Lalonde
379f4a87d5 FIX: remove likes and other post actions before nuking a user 2014-03-31 14:06:35 -04:00
Vikhyat Korrapati
d62017c598 Unescape topic title before setting it as the document title. 2014-03-31 23:03:14 +05:30
Régis Hanol
7e33834afe FEATURE: create hyperlinked images from the image insertion dialog 2014-03-31 18:19:16 +02:00
Wojciech Zawistowski
a561cbc5fa Delays loading spinner when switching between tabs. 2014-03-31 17:56:23 +02:00
Neil Lalonde
d84b2b5117 Add post highlighting to mobile 2014-03-31 11:29:32 -04:00
Benjamin Kampmann
2815e98e6d Make autohighighting for all Code-Blocks a SiteSetting 2014-03-31 09:44:35 +02:00
Julian Tescher
a6062e0b98 Remove confusing/incorrect comments 2014-03-30 23:14:21 -07:00
Sam
9aec32688b BUGFIX: when RTT is short likes may not appear to work
BUGFIX: site settings db provider not triggering updates
  at the correct point
2014-03-31 12:34:13 +11:00
Sam
8fc2549873 Stop using global vars where not needed
Simplify local process site setting provider
Stop setting up methods over and over
Centralize cache clearing
2014-03-31 12:34:13 +11:00
Régis Hanol
956b14a4ab Merge pull request #2208 from riking/notext
Add no-text class to buttons with no text
2014-03-30 18:12:35 +02:00
riking
0828cf52ee Add no-text class to buttons with no text 2014-03-29 23:28:04 -07:00
Jeff Atwood
94c5bd3fc0 add bold back to post count in topic lists 2014-03-29 23:14:33 -07:00
Jeff Atwood
6527a50052 better topic header max-width for medium-width 2014-03-29 22:54:06 -07:00
Jeff Atwood
7436d04954 mobile editor tweaks 2014-03-29 22:49:05 -07:00
Régis Hanol
cdeb7445dc Merge pull request #2167 from riking/higher-facebook
Make Facebook login popup taller
2014-03-28 15:11:30 +01:00
Régis Hanol
3ee8b087ca Merge pull request #2197 from aslakknutsen/feed_url_case
Normalize URL from Feed Entry after adding link to original in Topic
2014-03-28 15:09:55 +01:00
Régis Hanol
93b3cc1e15 Merge pull request #2201 from vikhyat/fix-post-highlight
Fix post highlighting
2014-03-28 15:07:49 +01:00
Régis Hanol
622448fc9c Merge pull request #2184 from Onaldanm/translate-fr-updates
French Translations Updates
2014-03-28 15:07:02 +01:00
Vikhyat Korrapati
49298ec327 Fix post highlighting. 2014-03-28 14:35:19 +05:30
Jeff Atwood
5fee49292c mobile private message composer tweak 2014-03-27 15:47:55 -07:00
Jeff Atwood
aed6cda836 tighten up mobile create topic fields 2014-03-27 15:44:46 -07:00
Jeff Atwood
1a3729811d fix mobile header 2014-03-27 15:01:12 -07:00
Aslak Knutsen
f011fbdca9 Normalize URL from Feed Entry after adding link to original in Topic
Since a URL might be case sensitive, adding a link to the original
Feed Entry with changed case to the Topic could end in 404.
2014-03-27 20:48:01 +01:00
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
Kris Aubuchon
95d98a4266 some basic variable reorganiztion 2014-03-26 21:16:41 -04:00
Neil Lalonde
ec1ea18877 FIX: rendering bug of private categories in category chooser 2014-03-26 16:55:07 -04:00
Thomas Cioppettini
38882eb1a7 Remove threequals from ruby files 2014-03-26 12:20:41 -07:00
Régis Hanol
e5a04e3d5c BUGFIX: mismatched braces 2014-03-26 18:17:40 +01:00
Kris Aubuchon
236eb66235 fixing admin bar chart color 2014-03-26 12:03:58 -04: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
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
30d48a4ea4 Merge pull request #2183 from riking/class
Fix 0be7483f19
2014-03-26 15:01:33 +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
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
Neil Lalonde
a40896bb55 Category badge preview uses new sub-category badge styling in create/edit category modal 2014-03-25 16:17:04 -04:00
Neil Lalonde
497a03fc2c Show new sub-category styling in hamburger menu too 2014-03-25 15:29:34 -04:00
Neil Lalonde
e7ceb58cf4 FIX: modal buttons on Safari iOS are at the bottom of the viewport, which is an unusable part of the screen in iOS 7. Add padding so you can scroll those buttons high enough so they're clickable. Apple, fix this garbage omgwtfbbq. 2014-03-25 14:48:23 -04:00
Neil Lalonde
bfc8c65212 Remove wrench icon and auto-close options from composer. The same options are available after the topic has been created. 2014-03-25 14:07:05 -04:00
Régis Hanol
9d23cfcece update highlight.js to latest version 2014-03-25 18:13:38 +01:00
Kris Aubuchon
71034a33a1 clearing up variable duplication as discussed https://github.com/discourse/discourse/pull/2174 2014-03-25 09:53:07 -04:00
Régis Hanol
c10e44c0cf Merge pull request #2171 from Mikulas/patch-missing-localization
add localization to post multiselect
2014-03-25 14:35:36 +01:00
Régis Hanol
ae98bc91a1 Merge pull request #2178 from vikhyat/badge-system
Don't display granted badges in the badge grant combobox
2014-03-25 12:04:23 +01:00
Vikhyat Korrapati
61ec2b390e Don't display granted badges in the badge grant combobox. 2014-03-25 15:45:34 +05:30
Vikhyat Korrapati
fa6ff26061 Update combobox when contents are changed. 2014-03-25 15:29:13 +05:30
riking
87d47ece59 CSS rule for GitHub commit avatars 2014-03-24 21:52:40 -07:00
Kane York
473201c9a4 Change specified height to 450 2014-03-24 20:02:04 -07:00
Sam
3830f41e5f BUGFIX: attachments bust under multisite 2014-03-25 10:37:31 +11:00
Sam
4191972afe Merge pull request #2173 from vikhyat/badge-system
Forgot to specify "dependent: destroy" for UserBadges
2014-03-25 08:25:31 +11:00
Régis Hanol
9454ad1ef9 Merge pull request #2172 from vikhyat/firefox-paste-image
Fix pasting into the subject field in Firefox
2014-03-24 18:41:40 +01:00
Neil Lalonde
ea86cfd4ef FIX: categories with non-ascii names will have broken next page urls 2014-03-24 13:36:23 -04:00
Mikulas
fffe3dee6e add localization to multiselect popup 2014-03-24 18:23:29 +01:00
Vikhyat Korrapati
b1e524e9c3 Specify dependent: destroy for UserBadges. 2014-03-24 22:39:58 +05:30
Vikhyat Korrapati
881340213e Fix pasting into the subject field in Firefox. 2014-03-24 22:33:20 +05:30
Neil Lalonde
36cbd0d348 FIX: broken admin user page when must_approve_users is enabled 2014-03-24 11:43:06 -04:00
Neil Lalonde
e823558742 FIX: admin user page for suspended user was busted 2014-03-24 10:19:15 -04:00
Sam
7e7c4efcc0 FEATURE: on initial boot hint users on how to get admin 2014-03-24 18:03:39 +11:00
Sam
c27c87911e FEATURE: refactor notice code, add optional global notice.
Set the global_notice site setting to notify users of a critical event.
2014-03-24 16:51:48 +11:00
riking
c978eade56 Make Facebook login popup taller 2014-03-23 22:00:15 -07:00
Sam
1cd32ced33 FEATURE: update likes and flags live. 2014-03-24 13:22:03 +11:00
Sam
090f5c99c2 FEATURE: Live update edits 2014-03-24 12:19:08 +11:00
Sam
89b62e133d BUGFIX: overflow hidden messes stuff up for chrome on mac 2014-03-24 10:13:46 +11:00
Robin Ward
9d1855f92f Always use lower case URLs, fix date formatting and add full date title 2014-03-23 15:22:02 -04:00
Jeff Atwood
70fc006991 add img max width to embedded iframe comments 2014-03-22 15:51:46 -07:00
Jeff Atwood
7c19863d90 5px not 5 2014-03-22 15:17:37 -07:00
Jeff Atwood
129f82759c embedded iframe css improvements 2014-03-22 15:05:38 -07:00
Kris Aubuchon
7521a8d41a a few simple style clean-ups 2014-03-22 17:39:47 -04:00
Régis Hanol
6b8a5d1d78 BUGFIX: bound avatars in revision history UI 2014-03-22 17:39:59 +01:00
Jeff Atwood
a8000c11a6 tighten up problem messages display 2014-03-22 00:37:18 -07:00
Jeff Atwood
73a9290d3f make header only box-shadow on bottom 2014-03-21 23:55:08 -07:00
Jeff Atwood
43f2e5b747 make user setting desc less big/dark 2014-03-21 23:09:48 -07:00
Jeff Atwood
57f33686cc make setting descriptions less big/dark 2014-03-21 23:06:53 -07:00
Neil Lalonde
c3c5ac3ef7 Some tweaks to sub-category badges 2014-03-21 15:33:44 -04:00
Robin Ward
097125215a Merge pull request #2163 from awesomerobot/master
added the header shadow back in
2014-03-21 15:11:44 -04:00
Kris Aubuchon
3b8f6d3fe1 added the header shadow back in 2014-03-21 14:50:42 -04:00
Neil Lalonde
c649959e34 Show parent category on category badges 2014-03-21 14:34:50 -04:00
Robin Ward
539890afdf Let's not show tons of extra information about invites unless you're the
person who invited them.
2014-03-21 14:16:11 -04:00
Kris Aubuchon
63eb7a60e5 dialing back the animations I added previously 2014-03-21 09:23:22 -04:00
Régis Hanol
88ba80b239 Merge pull request #2160 from borhub/fix-excessive-li-in-category-breadcrumb
Fix visual bug from excessive LIs being rendered around Category breadcrumbs
2014-03-21 10:00:04 +01:00
Boris
0a330544b3 Prevent rendering of excessive <li> wrapper around a category breadcrumb which already is a <li>.
The excessive <li> wrapper coming from the template is automatically closed by the browser during the HTML parsing step, causing an empty <li> being visible in the rendered source (preceding the first breadcrumb). This causes a visual bug when not using the default Discourse stylesheet, because the extra LI element pushes the content to the right and sometimes also renders an extra black pixel.
2014-03-21 16:58:06 +11:00
Vikhyat Korrapati
dcaa069bb5 Log badge grant/revoke to the staff actions log. 2014-03-21 11:10:07 +05:30
Vikhyat Korrapati
0f9ea25010 Interface for granting/revoking badges from admin user page. 2014-03-21 11:09:19 +05:30
Vikhyat Korrapati
8163fcade7 Combobox view: escape name string. 2014-03-21 11:09:19 +05:30
Vikhyat Korrapati
50ce93a850 Use render_serialized for rendering instances in UserBadgeController. 2014-03-21 11:09:19 +05:30
Sam
2dc5e3c81e Merge pull request #2118 from vikhyat/firefox-middle-click
Fix Firefox middle-click popup blocker issue
2014-03-21 16:27:02 +11:00
Jeff Atwood
dbf3d29d9e Merge pull request #2158 from awesomerobot/master
adding a few simple animations to the topic list loading spinner and modals
2014-03-20 13:42:05 -07:00
Kris Aubuchon
ca4d211268 adding a few simple anmiations to the topic list loading message and modals 2014-03-20 16:33:03 -04:00
Robin Ward
f1b11327dd Also link avatar to user profile 2014-03-20 16:12:41 -04:00
Robin Ward
f2e17af130 Add staff and new user colours to embedded discourse. Also link
usernames to profiles.
2014-03-20 16:04:50 -04:00
Robin Ward
a4daafa026 Support trailing / when retrieving comment counts. 2014-03-20 15:22:49 -04:00
Robin Ward
e8ee490778 Extract breaking up a string into a separate file, include it in
embedded view.
2014-03-20 14:34:51 -04:00
Robin Ward
db8f4ea58f Don't show "in reply to" when there's a quote 2014-03-20 14:02:21 -04:00
Robin Ward
3fbb2cd728 Improve date displaying on embedded comments 2014-03-20 13:25:17 -04:00
Robin Ward
e5cb1cac86 FIX: Weird spacing with lists in embedded comments 2014-03-20 11:20:12 -04:00
Robin Ward
83778138ad FIX: Discourse quoting class for embedded content 2014-03-20 11:11:33 -04:00
Robin Ward
a22f6f6a02 Added blockquote class to embedded comments. 2014-03-20 11:08:30 -04:00
Robin Ward
375719edfb FIX: Links in the iframe should all be target=_blank 2014-03-20 10:57:36 -04:00
Jeff Atwood
764ba152d1 mobile notification options on own line 2014-03-19 21:43:28 -07:00
Sam
5c148faeb9 annotations were out of date 2014-03-20 15:35:51 +11:00
Sam
c240fb0d83 BUGFIX: facebook does not always provide username
We key on facebook_user_id its the only thing that matters
2014-03-20 15:35:30 +11:00
Sam
619fa50d4b BUGFIX: twitter auth asking for a password 2014-03-20 14:49:25 +11:00
Robin Ward
52fbce07ed Add emoji style for blogs 2014-03-19 17:51:41 -04:00
Robin Ward
faaada6e8a Consider URLs the same even with a trailing slash 2014-03-19 16:33:21 -04:00
Robin Ward
d3f1eb395d Updated import for TypePad 2014-03-19 15:02:49 -04:00
Régis Hanol
44888f7acc FEATURE: upload button on mobile composer 2014-03-19 18:34:08 +01:00
Neil Lalonde
a74764c833 Log when facebook doesn't provide an email address 2014-03-19 13:31:17 -04:00
Robin Ward
51e3d72461 Merge pull request #2141 from riking/correctness
Lots of JS correctness fixes
2014-03-19 11:20:15 -04:00
Neil Lalonde
a9a8e649ba Oops, and these methods too 2014-03-19 10:36:24 -04:00
Neil Lalonde
986f6e9c2a Oops I meant to delete the old method 2014-03-19 10:35:35 -04:00
Neil Lalonde
3ea477b17d FIX: performance of CategoryDetailedSerializer and Category.update_stats on large databases 2014-03-19 10:14:15 -04:00
Jeff Atwood
42ea20b439 get rid of borders around mobile glyphs 2014-03-19 07:02:09 -07:00
Jeff Atwood
e67ad58a8d Merge pull request #2149 from awesomerobot/master
removing border from topic list, making category sizes consistent
2014-03-19 06:45:06 -07:00
Kris Aubuchon
c11965ed9f removing border from topic list, making category sizes consistent 2014-03-19 09:38:35 -04:00
Régis Hanol
80bfdeee82 Merge pull request #2147 from vikhyat/serialize-params
Route `serialize` hook argument is the model, not params
2014-03-19 09:30:26 +01:00
Vikhyat Korrapati
28731ea633 Route serialize hook argument is the model, not params. 2014-03-19 12:02:27 +05:30
Sam
eab30d1c28 Merge pull request #2146 from vikhyat/badge-system
Badge creation UI improvements
2014-03-19 17:11:00 +11:00
Vikhyat Korrapati
89d3835d64 Badge creation UI improvements. 2014-03-19 10:43:38 +05:30
Vikhyat Korrapati
a4461022a3 Move badges admin tab to after users, show only if enabled. 2014-03-19 09:48:04 +05:30
riking
4699136d83 Fix this/self usage warning
To clarify the intent of using 'this' inside the closure, it is first assigned to a variable.
2014-03-18 19:09:49 -07:00
riking
8136468ec7 Fix inefficent jQuery usage
Some jQueries can be cached and reused. This commit does that.
2014-03-18 19:09:49 -07:00
riking
a871158c80 Fix some bad HTML 2014-03-18 19:09:49 -07:00
riking
2ade638d79 Remove unused variables 2014-03-18 19:09:44 -07:00
riking
834a721bbe Remove two noop backslashes in regexes 2014-03-18 18:24:36 -07:00
riking
86774fa5c1 Simplify return statements 2014-03-18 18:23:15 -07:00
riking
3f35d1062e Remove trailing commas, add trailing semicolons 2014-03-18 18:21:10 -07:00
riking
593f5df503 Corrections to JSDoc 2014-03-18 18:19:20 -07:00
Sam
9fc31932cf BUGFIX: don't alery myself when I link to myself 2014-03-19 12:07:48 +11:00