Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,502 Commits 209 Branches 500 Tags 870 MiB
Commit Graph

1364 Commits

Author SHA1 Message Date
Sam fe594f5d1e Merge pull request #2372 from vikhyat/badge-system 
Multiple grant badges
 2014-05-30 10:18:00 +10:00
Catrin 66dccfe8d0 clean up 2014-05-29 18:18:27 -04:00
Catrin 772a304fc2 dropdown on categorypage 2014-05-29 18:18:27 -04:00
Sam 5adc486cef BUGFIX: missing avatars in topic map 
Cleanup uneeded column
 2014-05-29 14:59:14 +10:00
Sam d9f51961c4 BUGFIX: pick gravatar if it was just downloaded 
BUGFIX: don't go rebaking unless all avatars are downloaded
 2014-05-28 16:54:21 +10:00
Sam f6753d3d46 FEATURE: automatically rebake out-of-date posts 2014-05-28 12:30:57 +10:00
Sam 2791852bd8 FEATURE: ability to regenerate system avatars as needed 
BUGFIX: made system letter avatar more thinner for less block look
 2014-05-28 12:30:57 +10:00
Sam b1d5f4440b Annotate models 2014-05-28 12:30:57 +10:00
Robin Ward 7c22d738b6 FEATURE: Add a location field to a user's profile 2014-05-27 13:54:04 -04:00
Sam 1e28668e9f missed one spot where route changed 2014-05-28 01:09:01 +10:00
Sam Saffron 4b611f87e9 use bicubic so we support earlier image magicks like the one in docker 
TODO upgrade docker base image to latest image magick
 2014-05-27 15:38:11 +10:00
Vikhyat Korrapati a79bf11edb Admin badge creation bug fixes. 2014-05-27 09:03:55 +05:30
Sam Saffron 9262a714bd BUGFIX: include avatar for system user 2014-05-27 12:38:16 +10:00
Sam 033cbc61bf BUGFIX: broken spec 2014-05-27 10:08:03 +10:00
Sam 504cfcff96 Fix specs for avatars 
Implement avatar picker
Correct avatar related jobs
 2014-05-27 10:08:03 +10:00
Sam 6c1c8be794 Work in progress, keeping avatars locally 
This introduces a new model to store the avatars and 3 uploads per user (gravatar, system and custom)

user can then pick which they want.
 2014-05-27 10:08:03 +10:00
Sam 4ccf07be8c Improve resize logic so images end up sharper 2014-05-27 09:48:13 +10:00
Robin Ward 7900c7bd2f Allow multiple subcategories with the same name 2014-05-26 15:33:51 -04:00
Robin Ward fc3ce934f5 Show categories on the user streams for topics. 2014-05-26 13:49:57 -04:00
Robin Ward b1d2aba0f3 Clean up notifications if a user can't see a topic 2014-05-26 13:26:46 -04:00
Sam ff6755f1e5 Merge pull request #2343 from knutaldrin/patch-1 
Fix suspended scope
 2014-05-23 12:56:32 +10:00
Sam e06da1821d BUGFIX: notifications were not updated correctly live 
- missing notifications when multiple replies in topic (till refresh)
- not cleared properly on click
 2014-05-23 11:34:34 +10:00
Neil Lalonde d2c34d17b7 Fix failing spec. Stubbing intermittently does not stub... 2014-05-22 11:06:19 -04:00
Neil Lalonde 867c56d9c7 Add link to google config instructions. Fix dashboard warning for google oauth2. 2014-05-21 19:11:10 -04:00
Sam 7fee3d7f8f Annotate models 2014-05-22 09:00:38 +10:00
Neil Lalonde 742841ddce Add Google Oauth2 authenticator. The current Google OpenID authentication has been deprecated by Google and will NOT work for any new websites. 2014-05-21 18:35:10 -04:00
Neil Lalonde 68747c8d2d FIX: category_list_spec would sometimes fail. It was passing only by luck. 2014-05-21 10:37:37 -04:00
Vikhyat Korrapati d208e4d517 Multiple grant badges. 2014-05-21 12:54:55 +05:30
Neil Lalonde 27cbc06563 Add fixed_category_positions site setting to handle whether categories are ordered by specified positions or by activity. 2014-05-16 11:33:52 -04:00
Sam eff8c22638 There is this thing called SQL and it is about 1000x faster 2014-05-16 10:34:06 +10:00
Sam 5914d0e132 Merge pull request #2311 from vikhyat/badge-system 
Add automatically assigned trust level badges
 2014-05-16 09:08:00 +10:00
Knut Aldrin Wikström 579f2bf7b8 Fix suspended scope 
:non_suspended should check if suspension is <= NOW, else one could end up in neither group.
 2014-05-15 15:47:49 +02:00
Sam 198cf851ff BUGFIX: exact username match not correctly prioritized on search 2014-05-15 12:22:35 +10:00
Robin Ward 3211c60bbe FEATURE: A new site setting `public_user_custom_fields` which allows you 
to whitelist custom fields that will be exposed to the Ember client
application.
 2014-05-14 14:39:01 -04:00
Vikhyat Korrapati c07244a4e6 Refactor BadgeGranter.update_trust_level_badges! -> update_badges. 2014-05-14 21:01:41 +05:30
Vikhyat Korrapati b144b75565 Add automatically assigned trust level badges. 2014-05-14 20:47:21 +05:30
Neil Lalonde c4d3aa3d47 Theming: a UI to choose some base colors that are applied to all the site css. CSS compiled outside of asset pipeline. 2014-05-14 10:18:12 -04:00
Régis Hanol 08dde3d881 BUGFIX: moderators can notify moderators 2014-05-13 17:47:00 +02:00
Neil Lalonde 6e0eb89697 Don't show suspended users in autocomplete fields unless you are staff 2014-05-13 11:44:15 -04:00
Wojciech Zawistowski 960d64930c Wiki Post 2014-05-13 08:53:11 -04:00
Neil Lalonde 00390ee739 Add a way to show a custom message at the top of all notification emails. Customize it at /admin/site_contents/notification_email_top 2014-05-12 16:52:06 -04:00
Neil Lalonde e68e97d986 FIX: moderators can't see private topics that they aren't invited to see. 2014-05-12 15:26:46 -04:00
Régis Hanol b018b4ad18 BUGFIX: remove N+1 on topic lists 2014-05-12 10:11:05 +02:00
Régis Hanol bc3de84ebf FEATURE: remove bookmark button in activity feed 2014-05-12 09:33:26 +02:00
Régis Hanol 9125453628 FEATURE: add the first 3 participants in a private message 2014-05-12 09:32:49 +02:00
Robin Ward eb0872c5d4 FIX: Topic archetype check should only happen when the topic exists 2014-05-11 15:53:57 -04:00
Robin Ward 2bb63ffb38 FIX: Don't show links to private messages in the gutter 2014-05-11 15:16:28 -04:00
Sam 084ec87850 FEATURE: admins can invite users to groups via the web UI 2014-05-09 18:22:36 +10:00
Sam 3f07c1d0a1 Backend support for group invites 2014-05-09 18:22:35 +10:00
Sam 34d1668f9f FEATURE: backend for inviting a user to a group 2014-05-09 18:22:35 +10:00
Robin Ward 77d68ccf08 FIX: Robin is fired for the typo 2014-05-08 16:44:32 -04:00
Robin Ward 44ed0d5232 FIX: Even more safety, the topic must exist as well. 2014-05-08 16:41:25 -04:00
Robin Ward 5fb962a65f FIX: Some extra safety - in the case that an imported post was deleted, 
don't error out of the PollFeed job
 2014-05-08 16:27:17 -04:00
Sam cec18aba3f Rails 4 upgrade 2014-05-08 14:47:54 +10:00
Sam a2e2d0e886 Merge pull request #2316 from mutiny/refactor-where-first 
Refactor `where(...).first` to `find_by(...)`
 2014-05-08 09:10:45 +10:00
Régis Hanol 4b9acd6806 BUGFIX: make sure we do not try to pull images from the CDN 2014-05-07 19:49:16 +02:00
Régis Hanol 21e8ae0eca BUGFIX: the /top page now shows the first non-empty period 2014-05-07 19:04:39 +02:00
Sam ee0efab02f More logging, less problems 2014-05-07 12:37:02 +10:00
Louis Rose 1574485443 Perform the where(...).first to find_by(...) refactoring. 
This refactoring was automated using the command: bundle exec "ruby refactorings/where_dot_first_to_find_by/app.rb"
 2014-05-06 14:41:59 +01:00
Régis Hanol f20fba041c BUGFIX: improved top ranking formula (+ filter topics based on their creation date) 2014-05-05 23:05:35 +02:00
Régis Hanol c21d3f41d0 BUGFIX: only redirect new users to top page once 
Actually, new users will still be redirected to the top page during the first 30 seconds of their first visit.
 2014-05-05 19:00:40 +02:00
Régis Hanol 4642218662 FEATURE: add private messages counters in user activity feed 2014-05-02 22:53:58 +02:00
Régis Hanol 02dd80170a BUGFIX: revision history was messed up when doing quick edits 2014-04-30 22:42:56 +02:00
Régis Hanol 11af466737 FEATURE: add a specific flag reason when a post has been hidden 2014-04-30 16:58:01 +02:00
Sam f6c22cc299 Merge pull request #2297 from ligthyear/custom-fields 
Custom fields for Topic, Category, Post and Group
 2014-04-30 13:15:50 +10:00
Benjamin Kampmann f757706861 Ensure Reload reloads custom_fields, too 2014-04-29 19:34:56 +02:00
Benjamin Kampmann 0cf07d41ae Move Concern from lib into app/models. refs #2279 2014-04-29 19:26:43 +02:00
Benjamin Kampmann e502122c51 Add Custom Fields on Topics 2014-04-29 19:26:42 +02:00
Benjamin Kampmann 2450088c03 Add CustomFields to Post, Category and Group 2014-04-29 19:26:42 +02:00
Benjamin Kampmann e6e03a1a96 move custom fields into its own concern 2014-04-29 19:26:42 +02:00
Robin Ward 359d59242e If a new user receives a mention, quote or response to their post, allow 
them to continue posting in a topic.
 2014-04-29 12:59:14 -04:00
Sam 0fc4c47927 Merge pull request #2295 from vikhyat/badge-system 
Titleable badges
 2014-04-29 11:26:51 +10:00
Neil Lalonde 340fd303c8 FIX: in multisite setup, links to the current forum are whitelisted when looking for spam hosts 2014-04-28 10:37:28 -04:00
Vikhyat Korrapati b4e037dfb2 Allow badges to be marked as "titleable". 2014-04-28 10:30:38 +05:30
Sam e88e43bfb6 Merge pull request #2279 from fantasticfears/concern 
move concerns to the model/concerns
 2014-04-28 09:48:33 +10:00
Robin Ward 89df580560 FIX: Reflected post links were being deleted when they shouldn't and 
vice versa.
 2014-04-25 16:49:48 -04:00
Régis Hanol f8d9fb7bdc Revert "Merge pull request #2284 from jaimeiniesta/patch-1" 
This reverts commit a6b88d1e7e, reversing
changes made to 9bee0b6e2d.
 2014-04-25 11:40:38 +02: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
riking b309deef11 Add site setting for domains to never download images from 2014-04-23 22:24:35 -07:00
Sam a6b88d1e7e Merge pull request #2284 from jaimeiniesta/patch-1 
escape gravatar URLs to comply with W3C standards
 2014-04-24 12:56:16 +10:00
Sam 05efc8df16 BUGFIX: likes would cause whole post to re-render 2014-04-24 12:42:04 +10:00
Sam 759f4b4fe9 BUGFIX: category name is reserved in multisite 2014-04-24 09:19:59 +10:00
Robin Ward e48cf06fc9 REFACTOR: Add urls for admin groups, make it more idiomatic ember 2014-04-23 15:15:46 -04:00
Robin Ward af877781b7 Allow admins to choose if groups are visible or not. 2014-04-22 16:43:46 -04:00
Sam a3b2b4baca FEATURE: custom fields on User 2014-04-22 13:52:13 +10: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
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 b014d66b65 Merge pull request #2277 from vikhyat/fix-title-html 
Fix HTML tags in topic titles
 2014-04-18 11:37:33 +02: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
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 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
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
Vikhyat Korrapati 843023d7c9 Fix user_badges n+1 query. 2014-04-17 21:58:05 +05:30
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 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
Régis Hanol 9cd8476453 REFACTOR: use an options hash instead of multiple nil-able parameters 2014-04-15 17:17:10 +02: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 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
Sam b0ed9082b3 FEATURE: Hidden site setting for max username length 2014-04-14 12:55:33 +10:00
Sam 41631311e9 jiggle comment 2014-04-10 16:36:39 +10:00
Sam b9d4edd91a FEATURE: display unpinned state, allow unpinning by clicking on pin 2014-04-10 10:59:02 +10:00
Sam ac097e2d0f Merge pull request #2244 from vikhyat/css-import 
Site Customization @import fixes
 2014-04-10 07:01:34 +10: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 8c129e480a Always use DiscourseSassImporter, add optional sprockets deps tracking. 2014-04-09 19:17:19 +05:30
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 9c4dd1cb35 Change comma-delim site settings to pipe-delim 2014-04-08 14:17:55 -07: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 1540a3d5e5 Allow changing ownwership of posts by admins 2014-04-08 01:47:42 -07:00
Sam d71f62a9f9 Merge pull request #2180 from tomciopp/master 
More idiomatic approach to finding drafts
 2014-04-08 16:46:24 +10: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
Sam 0372b81d11 FEATURE: allow moderators to globally pin topics 2014-04-07 16:38:51 +10:00
Sam c6b525bd5c lets see if travis can give us some better info 2014-04-07 11:34:35 +10:00
Sam 78c844f8d8 BUGFIX: new users not getting correct error messages 2014-04-04 11:08:54 +11:00
Robin Ward 767048cc8d FIX: Strips spaces from the end of URLs 2014-04-03 15:35:31 -04:00
Robin Ward 10d0320532 FIX: Allow expanding posts when anonymous, add specs 2014-04-03 11:30:43 -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 b250aa36a0 Remote fetching of blog 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
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 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 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
Régis Hanol ef24a4c71c FEATURE: add redirect_users_to_top_page site setting (default to true) 2014-03-31 21:53:38 +02: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 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
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
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
Sam b7ff4173c9 BUGFIX: mitigate unbound table growth on top_topics 2014-03-27 15:43:24 +11:00
Thomas Cioppettini 38882eb1a7 Remove threequals from ruby files 2014-03-26 12:20:41 -07:00
Thomas Cioppettini 2beaeed36d More idiomatic approach to finding drafts 2014-03-25 15:56:21 -07:00