codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-28 10:08:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
8126 commits 7 branches 179 tags 87 MiB
Commit graph

2911 commits

Author SHA1 Message Date
Sam
0fc4c47927 Merge pull request #2295 from vikhyat/badge-system 
Titleable badges
 2014-04-29 11:26:51 +10:00
Robin Ward
ba683bc611 FIX: XSS in markdown converter. 2014-04-28 14:44:15 -04:00
Boris
c934411228 User profile page template: add extra wrapper into primary details section to allow laying textual items out on the right of the avatar 2014-04-28 17:51:15 +10:00
Vikhyat Korrapati
a8e2c5e616 Use PreloadStore for the badge pages. 2014-04-28 10:30:50 +05:30
Vikhyat Korrapati
b4e037dfb2 Allow badges to be marked as "titleable". 2014-04-28 10:30:38 +05:30
Robin Ward
b91c70cac3 FIX: Don't show quote controls when the post id is missing. 2014-04-25 15:41:24 -04:00
Benjamin Kampmann
64918c35f5 Improved Plugins SCSS management 
- Moves the import of plugins for both mobile and desktop from common after discourse loading, allowing plugins to overwrite
 - Make desktop-option behave like the mobile-option: SCSS/CSS marked with that option will only be loaded for desktop from now on and ignored in mobile
 - Add variables-keyword, allowing plugins to ship and overwrite variables before they get imported by discourse (great for theming)
 2014-04-25 18:25:45 +02:00
Neil Lalonde
20df262814 Add filters to colors ui 2014-04-25 10:10:17 -04:00
Robin Ward
cf6cbb955b REFACTOR: Introduce Discourse.computed.setting to create a computed 
property that links to a `Discourse.SiteSetting`
 2014-04-24 18:36:02 -04:00
Robin Ward
f527ac33b0 FIX: Make sure the unread counter is updated following a "Dismiss New" 2014-04-24 18:36:02 -04:00
Neil Lalonde
feaaf55a0c Theming: color scheme editing. Unfinished! Doesn't have any effect on css files yet. 2014-04-24 16:49:12 -04:00
Régis Hanol
d1b96d0e8b Merge pull request #2290 from vikhyat/badge-system 
Incrementally load users in the badge page
 2014-04-24 12:14:41 +02:00
Vikhyat Korrapati
0357370b0d Use the user-badge component in the admin user badges page. 2014-04-24 14:48:30 +05:30
Vikhyat Korrapati
4e89b64e64 Load 100 users at a time for the badge page, with a button to load more. 2014-04-24 14:48:26 +05:30
Sam
9bee0b6e2d BUGFIX: we don't need this param 2014-04-24 12:46:54 +10:00
Sam
05efc8df16 BUGFIX: likes would cause whole post to re-render 2014-04-24 12:42:04 +10:00
Sam
2d123ef1c7 REGRESSION: sortable columns were missing sortable class on first render 2014-04-24 11:24:58 +10:00
Sam
3ff1d63a8d Improve mobile style for topic lists 
This has been driving me nuts for a while now
 2014-04-24 11:10:50 +10:00
Sam
2debf7d97d Correct colors for tracking glyph in notification area 2014-04-24 10:48:04 +10:00
Robin Ward
e48cf06fc9 REFACTOR: Add urls for admin groups, make it more idiomatic ember 2014-04-23 15:15:46 -04:00
Neil Lalonde
448802f006 Merge pull request #2288 from yomybaby/i18n_plural_ko 
add pluralization rules in ember for Korean (ko)
 2014-04-23 12:59:56 -04:00
Régis Hanol
de53385ed2 display the copy & paste images hint to FF users too 2014-04-23 18:49:54 +02:00
Régis Hanol
ff1823beca BUGFIX: backups logs page was busted since last Ember update 2014-04-23 11:20:22 +02:00
Sam
8abf652dc3 SECURITY: self XSS by admin by editing badge name 2014-04-23 09:46:32 +10:00
Jeff Atwood
6538874064 remove unnecessary css witdh 2014-04-22 16:22:25 -07:00
Jong Eun Lee
00ff3f8953 add pluralization rules in ember for Korean (ko) 2014-04-23 08:08:39 +09:00
Robin Ward
af877781b7 Allow admins to choose if groups are visible or not. 2014-04-22 16:43:46 -04:00
Robin Ward
8538e31fb4 Don't show link counts in the body of posts for internal links. They are 
already in the sidebar.
 2014-04-22 15:40:08 -04:00
Vikhyat Korrapati
ba862439f2 Move badge styles from desktop to common/base. 2014-04-22 11:50:16 +05:30
Vikhyat Korrapati
d54edc7c0e Display username and granted at on badge page. 2014-04-22 11:49:31 +05:30
Robin Ward
78f8fbb7ea FIX: Link to user profile broke the back button 2014-04-21 17:49:10 -04:00
Régis Hanol
39cc147138 BUGFIX: only redirect users top /top page once 2014-04-21 20:00:37 +02:00
Régis Hanol
561f7e0148 BUGFIX: add h2 with period when browsing top pages 2014-04-21 20:00:30 +02:00
Jeff Atwood
1623ec77e4 make top user link profile, not activity 2014-04-21 10:18:50 -07:00
Régis Hanol
362c6e443a Merge pull request #2286 from awesomerobot/master 
fixing the composer that I just re-broke
 2014-04-21 18:01:16 +02:00
Kris Aubuchon
2c44f724f4 fixing the composer that I just re-broke 2014-04-21 11:54:57 -04:00
Robin Ward
b9ca124756 Support for /my/preferences to automatically redirect to the logged in 
user.
 2014-04-21 11:52:11 -04:00
Robin Ward
61e6eae728 FIX: /topics/period routes were broken 2014-04-21 10:26:24 -04:00
Robin Ward
4dc20e6855 FIX: Sanitize custom quote attributes 2014-04-21 10:19:39 -04:00
Kris Aubuchon
5fd874b74a desktop composer fix 2014-04-21 09:56:10 -04:00
Kris Aubuchon
e4d1aaa290 pulling some more styles out of desktop/mobile to common/base 2014-04-20 15:17:11 -04:00
Kris Aubuchon
bffeba5e3b pulling some more styles out of desktop/mobile to common/base 2014-04-20 15:16:06 -04:00
Kris Aubuchon
3f102a98da initial move of common desktop/mobile styles to common/base 2014-04-19 14:04:22 -04:00
Régis Hanol
756ea0178a Merge pull request #2276 from vikhyat/badge-system 
Badge system updates
 2014-04-18 11:46:19 +02:00
Régis Hanol
b014d66b65 Merge pull request #2277 from vikhyat/fix-title-html 
Fix HTML tags in topic titles
 2014-04-18 11:37:33 +02:00
Jeff Atwood
b846eb4544 backup size column does not need to be so large 2014-04-17 23:49:58 -07:00
Vikhyat Korrapati
25a080a8e1 Fix HTML tags in topic titles. 
We no longer sanitize titles before saving to the database since it
would cause problems like HTML entities showing up when you try to edit
a topic title. It isn't even really necessary since we only render
fancy_title directly and never title.

The escaping logic used here is the same that is used both in lodash and
onebox. See:

1. https://github.com/discourse/onebox/pull/190/files
2. https://github.com/lodash/lodash/blob/2.4.1/dist/lodash.compat.js#L6194
 2014-04-18 10:47:00 +05:30
Vikhyat Korrapati
27b62df48b Change "awarded" to "granted". 2014-04-18 09:20:55 +05:30
Vikhyat Korrapati
e6eb16ee73 Fix infinite loading spinner for badges that have not been granted yet. 2014-04-18 09:20:55 +05:30
Vikhyat Korrapati
8113e8d897 Basic UI for selecting gold/silver badges as titles. 2014-04-18 09:20:51 +05:30
Vikhyat Korrapati
95b430df72 Link poster expansion "+x more" to user badges page. 2014-04-18 08:24:48 +05:30
Vikhyat Korrapati
5bb3a1a05a Show badges filter in user profiles only when the user has badges. 2014-04-18 04:03:13 +05:30
Neil Lalonde
6c7863bbba Show installed version on dashboard after upgrade 2014-04-17 14:26:44 -04:00
Robin Ward
ffc1634193 FIX: Only show link clicks on the title of a onebox, not repeatedly in 
its body.
 2014-04-17 13:01:44 -04:00
Robin Ward
b3ed8b6a32 Use query params for sortable table headings 2014-04-17 10:52:57 -04:00
Robin Ward
2eab288dc9 Port "Summarize Topic" to query-params-new 2014-04-17 10:46:33 -04:00
Robin Ward
fdb751296a FIX: ZALGO test suite was causing failures in the wrong place due to 
missing `async` bits.
 2014-04-17 10:46:33 -04:00
Robin Ward
c9c95a9ac2 FIX: Ember doesn't allow one route name, basic, and Discourse used it! 2014-04-17 10:45:06 -04:00
Robin Ward
c820747ea3 FIX: Malformed HTML in templates 2014-04-17 10:45:06 -04:00
Robin Ward
fc65bc28be FIX: Use the container to register Discourse's custom location handler 2014-04-17 10:45:06 -04:00
Robin Ward
2f9bb6b88f FIX: Deprecation warnings on Ember.js for render without quotes. 2014-04-17 10:45:06 -04:00
Robin Ward
73cc722ed5 Update Ember.js, Handlebars and jQuery to latest 2014-04-17 10:45:06 -04:00
Onaldanm
bf8d727a91 Add badges class 
Add badges class to the container to custom this new page differently.
 2014-04-17 11:40:06 +02:00
Sam
87f37b3ee9 Merge pull request #2271 from vikhyat/badge-system 
Badge system updates
 2014-04-17 16:22:41 +10:00
Vikhyat Korrapati
89f45901bc Create notification when badge is granted. 2014-04-17 01:58:01 +05:30
Vikhyat Korrapati
b55734da91 Add badges tab to user profile. 2014-04-17 01:58:01 +05:30
Vikhyat Korrapati
3136217fc1 Add badge page. 2014-04-17 01:57:57 +05:30
Vikhyat Korrapati
acfcf0b64e Add /badges route that lists all defined badges. 2014-04-16 18:42:06 +05:30
Vikhyat Korrapati
4c0f85650e Display badge count in the user admin page. 2014-04-16 18:08:10 +05:30
Vikhyat Korrapati
057c56ef9b Add user-badge component. 2014-04-16 18:08:00 +05:30
Vikhyat Korrapati
a1333989f4 Add username on top to CSS directory so it can be imported. 2014-04-16 14:44:55 +05:30
Neil Lalonde
8b79debde2 Merge pull request #2266 from fantasticfears/locale 
add pluralization rules in ember for Chinese
 2014-04-15 11:08:22 -04:00
Neil Lalonde
3b53c1814b FIX: don't reload page when creating account with external auth and must_approve_users is enabled. 2014-04-15 10:13:57 -04:00
Erick Guan
2c6b7d8bed add pluralization rules in ember for Chinese 2014-04-15 19:59:20 +08:00
Régis Hanol
2505d18aa9 FEATURE: support email attachments 2014-04-14 22:55:57 +02:00
Robin Ward
ed6e2b1d79 Remove Zalgo API from Discourse.Mention: 
http://blog.izs.me/post/59142742143/designing-apis-for-asynchrony -
Thanks @riking for finding it.
 2014-04-14 16:51:18 -04:00
Neil Lalonde
2c4ada6c7d FIX: give an accurate reason why a user's posts can be deleted from admin 2014-04-14 15:10:41 -04:00
Sam
4a0c63ec7f Tweak badge styling 2014-04-14 15:58:52 +10:00
Sam
cfccf8b4ed Tweak live reload due to CSS bundling in dev 2014-04-14 15:58:52 +10:00
Sam
b0ed9082b3 FEATURE: Hidden site setting for max username length 2014-04-14 12:55:33 +10:00
Sam
d3810ba3bc Merge pull request #2212 from vikhyat/badge-system 
Show badges in the poster expansion card
 2014-04-14 10:54:43 +10:00
Jeff Atwood
782f8e401e improve keyboard shortcut css styles 2014-04-13 14:51:30 -07:00
Robin Ward
1ae6c726dc Removes duplicate Controller definition 2014-04-11 12:51:09 -04:00
Robin Ward
0b42228663 FIX: Double clicking the home logo could leave you in a perpetual 
"Loading" state.
 2014-04-11 11:57:12 -04:00
Neil Lalonde
6e939c28fb Remove topic.notifications.title translation key since it's always an empty string 2014-04-11 10:54:02 -04:00
Vikhyat Korrapati
3f4c5ed451 Show badges in the poster expansion card. 2014-04-11 06:59:11 +05:30
Sam
668a5ff526 FEATURE: lock icon for archived topics 
remove model sniffing hack
 2014-04-11 10:27:04 +10:00
Sam
fe6153ba96 Merge pull request #2232 from vikhyat/username-on-top-setting 
Add option to show username on top of posts instead of the left gutter
 2014-04-11 10:13:18 +10:00
Brad Wilson
836b0c41ab BUGFIX: adjust page padding when composer view open 
From https://meta.discourse.org/t/discourse-general-polish/13184 :

"Footer padding gets out of sync: start typing a new topic in the composer ... size it big ... got to random topic ... footer padding is not added so you can not see the last post on topic. (workaround, resize composer once more so footer padding is added). This need to be added everywhere automatically. Including admin screens."
 2014-04-11 09:54:14 +10:00
Neil Lalonde
cb11967715 Add transifex config. Reconcile client.yml and server.yml translations in github and transifex. Transifex is now the source of all client.yml and server.yml files. 2014-04-10 15:42:38 -04:00
Vikhyat Korrapati
af69b78ecb Changes to posts template to make it easier to display posts on top. 2014-04-10 21:56:13 +05:30
Régis Hanol
d0591c18f8 Merge pull request #2245 from ligthyear/category-double-selection-fix 
Bugfix: double selection of categories in user preferences
 2014-04-10 10:52:57 +02:00
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
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
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
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
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
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
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
7e3ea5d644 Support for crawling topic links 2014-04-07 14:08:34 -04: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
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
Neil Lalonde
dc3739d49f Replace underscore with space when showing site setting names 2014-04-03 16:08:14 -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
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
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
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