codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-12-24 06:22:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
7991 commits 7 branches 179 tags 87 MiB
Commit graph

4386 commits

Author SHA1 Message Date
Sam
a3b2b4baca FEATURE: custom fields on User 2014-04-22 13:52:13 +10:00
Robin Ward
78f8fbb7ea FIX: Link to user profile broke the back button 2014-04-21 17:49:10 -04:00
Robin Ward
4eb5474858 Add a SiteSetting to configure how many topics are in the email digest. 2014-04-21 17:49:10 -04:00
Régis Hanol
64b8f2f759 TRIVIAL: remove puts statement (cc. @eviltrout) 2014-04-21 23:00:13 +02: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
Jaime Iniesta
6084cb969d escape gravatar URLs to comply with W3C standards 
This fixes an HTML validation error due to & not being properly escaped on the gravatar URLs.
 2014-04-21 00:46:00 +02: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
Erick Guan
6d45f71254 move concerns to the model/concerns 2014-04-19 12:00:40 +08:00
Régis Hanol
454f11e597 FEATURE: new title_sanitize site setting 2014-04-18 21:01:21 +02: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
Robin Ward
64faee0935 Break down new topic counts by category if a digest contains many. 2014-04-17 16:42:40 -04:00
Robin Ward
0e56157212 Basic "Also, there are x new topics" text for the digest 2014-04-17 16:04:26 -04:00
Robin Ward
fd4007eefc FIX: Don't sort the new topics by score since the Top logic is already 
sorting them by score.
 2014-04-17 15:43:24 -04:00
Robin Ward
564b1d86b0 Digest should exclude muted topics. 2014-04-17 15:27:11 -04:00
Robin Ward
89aa2380c6 Use "Top" logic for digest emails. Leave out muted categories. 2014-04-17 15:22:19 -04:00
Robin Ward
2341118570 Add categories to the first topics in the email digest 2014-04-17 15:22:19 -04:00
Régis Hanol
b2cb4b27a1 Merge pull request #2273 from paully21/development-branch 
Add blurb of post to search results via API
 2014-04-17 21:06:03 +02:00
Régis Hanol
bda47c2bf8 Merge pull request #2274 from vikhyat/badge-system 
Fix user_badges n+1 query
 2014-04-17 21:05:48 +02:00
Neil Lalonde
890e53cd6e Remove the default_invitee_trust_level+1 privilege from trust level 3. 2014-04-17 15:05:15 -04:00
Neil Lalonde
6c7863bbba Show installed version on dashboard after upgrade 2014-04-17 14:26:44 -04:00
Robin Ward
a57f802048 If there's a TopicEmbed record for a url, we don't have to crawl it. 
This should help sites like Boing Boing where sometimes links are
crawled before saved in WordPress.
 2014-04-17 14:00:22 -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
87682f7539 FIX: Don't include image meta data when embedded in an email 2014-04-17 12:32:51 -04:00
Vikhyat Korrapati
843023d7c9 Fix user_badges n+1 query. 2014-04-17 21:58:05 +05:30
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
paully21
84d100be85 Add blurb of post to search results via API 2014-04-17 07:58:51 -05: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
30e73104e4 Bump up to 200 for now, UI perf needs lots of work 2014-04-17 16:25:06 +10:00
Sam
87f37b3ee9 Merge pull request #2271 from vikhyat/badge-system 
Badge system updates
 2014-04-17 16:22:41 +10:00
Sam
50d65fc876 Merge pull request #2269 from vikhyat/username-on-top 
Add username on top to CSS directory so it can be imported
 2014-04-17 16:13:27 +10:00
Vikhyat Korrapati
b62606e7f1 Remove color_hexcode column from badge_types. 2014-04-17 05:36:29 +05:30
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
8f53b7a65b Detect arrays for serialization using respond_to?(:to_ary). 
This is the way AMS detects arrays, and is more robust than checking
is_a? for whitelisted classes. For example, this works for
ActiveRecord::AssociationRelation which the current logic does not
handle.
 2014-04-16 20:48:09 +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
e0a4959dc9 Sort featured badges by badge type first, followed by grant count. 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
91bfd47419 FIX: don't show contents of hidden posts when quoting the post and when replying as new topic. Also don't allow public to view edit history of hidden posts. 2014-04-15 12:49:08 -04:00
Neil Lalonde
f0e8423445 FIX: don't show hidden posts to crawlers, disabled javascript, and in rss feeds 2014-04-15 12:49:08 -04:00
Régis Hanol
9cd8476453 REFACTOR: use an options hash instead of multiple nil-able parameters 2014-04-15 17:17:10 +02:00
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
542d54e6bf BUGFIX: uploads to S3 2014-04-15 13:04:14 +02:00
Sam
862a6696c0 Correct annotations 
allow longer usernames (up to 60)
 2014-04-15 15:53:48 +10:00
Sam
e5f41b8a21 FEATURE: whitelist and blacklist selectors for embeds 2014-04-15 14:07:30 +10:00
Robin Ward
a49b38ac35 TRIVIAL: Remove irrelevant comment :) 2014-04-14 21:00:52 -04: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
Robin Ward
b909e26fa4 Also use the body of the post when looking for similar topics 2014-04-14 15:48:58 -04:00
Robin Ward
0d238db43c Exclude category definition topics from similar search 2014-04-14 15:21:05 -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
Robin Ward
122f2a00cc Don't look for a JS format. IE11 seems to not request it even with a 
`<script>` tag.
 2014-04-14 12:16:08 -04:00
Sam
4a0c63ec7f Tweak badge styling 2014-04-14 15:58:52 +10:00
Sam
0d114d7b17 Tweak badge granter not to try to double grant 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
89b9f9e2cb Fix badge serialization issue. 2014-04-11 07:33:17 +05:30
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
Robin Ward
e80851b0fa Special case: When crawling a link to an image, just put the filename as 
the title.
 2014-04-10 13:45:13 -04:00
Robin Ward
99e2bab62d Use update_all to prevent after_commit from executing again. 2014-04-10 13:19:57 -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
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