github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-27 00:23:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
8,780 Commits 214 Branches 500 Tags 960 MiB
ba65aa3f6c
Commit Graph

1497 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
Sam
35952055e2 BUGFIX: web crawlers messing with anon caching 2014-04-29 10:48:09 +10:00
Neil Lalonde
495f78f574 oops, fix broken current_user_spec 2014-04-28 14:01:22 -04:00
Neil Lalonde
1da59e7e2e FIX: deactivated users shouldn't be able to log in 2014-04-28 13:46:28 -04:00
Neil Lalonde
9fba385172 FIX: don't onebox hidden posts 2014-04-28 11:03:19 -04: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
Sam
4445b8c3c0 Factor out mocks 2014-04-28 00:34:55 +10:00
Neil Lalonde
47d000edcc Merge pull request #2292 from ligthyear/sass-variables 
Improved Plugins SCSS management
 2014-04-25 15:29:50 -04:00
Neil Lalonde
7993c27ce5 Also allow system_user to send pm's even if enable_private_messages is disabled 2014-04-25 14:52:57 -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
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
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
Neil Lalonde
ee8bbadfe8 Allow contact user to send private messages even if enable_private_messages is false 2014-04-23 17:00:22 -04:00
Robin Ward
84da39f5dc FIX: Admins should always be able to see groups so they can edit them. 2014-04-23 15:15:46 -04:00
Régis Hanol
b61abe3107 FEATURE: warn the admin whenever we disable the download_remote_images_to_local site setting 2014-04-23 12:43:10 +02: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
Robin Ward
b9ca124756 Support for /my/preferences to automatically redirect to the logged in 
user.
 2014-04-21 11:52:11 -04:00
Jaime Iniesta
2c3a10aa5b fixes user specs about ampersands in gravatar URLs 2014-04-21 10:52:58 +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
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
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
8113e8d897 Basic UI for selecting gold/silver badges as titles. 2014-04-18 09:20:51 +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
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
Neil Lalonde
890e53cd6e Remove the default_invitee_trust_level+1 privilege from trust level 3. 2014-04-17 15:05:15 -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
Robin Ward
b3ed8b6a32 Use query params for sortable table headings 2014-04-17 10:52:57 -04:00
paully21
84d100be85 Add blurb of post to search results via API 2014-04-17 07:58:51 -05: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
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
de23caa871 Slightly faster badge system specs. (Shaves off ~100ms) 2014-04-16 18:08:10 +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
Régis Hanol
542d54e6bf BUGFIX: uploads to S3 2014-04-15 13:04:14 +02:00
Régis Hanol
2505d18aa9 FEATURE: support email attachments 2014-04-14 22:55:57 +02:00
Robin Ward
0d238db43c Exclude category definition topics from similar search 2014-04-14 15:21:05 -04:00
Sam
63f4a0e050 Tighten API, add spec for recovery, keep mutex semantics 2014-04-14 10:51:46 +10:00
Vikhyat Korrapati
56ee1ac569 Extract scheduler cross-process locking into DistributedMutex. 2014-04-13 00:05:46 +05:30
Sam
6daef624c3 BUGFIX: smoke test was broken 2014-04-10 16:57:23 +10:00
Sam
de9aa49b52 BUGFIX: default should register CSS for both mobile and desktop 
If you want desktop only use :desktop option
 2014-04-10 16:30:22 +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
034287033e Add back onebox support for flash video 2014-04-09 13:41:25 -04:00
Régis Hanol
c3a1c867dd REFACTOR: poll mailbox specs 2014-04-09 19:26:19 +02:00
Sam
8cdf25532c Merge pull request #2207 from riking/list-setting 
UI for list site settings
 2014-04-09 09:34:50 +10:00
riking
9c4dd1cb35 Change comma-delim site settings to pipe-delim 2014-04-08 14:17:55 -07: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
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
Robin Ward
7e3ea5d644 Support for crawling topic links 2014-04-07 14:08:34 -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
Sam
0372b81d11 FEATURE: allow moderators to globally pin topics 2014-04-07 16:38:51 +10:00
Sam
ae3b2a6e02 Disable problem spec 2014-04-07 15:21:37 +10: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
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
558a06a117 Adds better reusable error message support. Added to fetching remote 
posts. /cc @riking
 2014-04-02 13:22:10 -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
eff20fdda7 fix bust spec 2014-04-02 16:22:12 +11:00
Vikhyat Korrapati
317f9bcd08 Use custom DiscourseSassImporter for site customization SCSS compilation. 2014-04-01 23:05:02 +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
Sam
a3f270f0e9 BUGFIX: broken spec 2014-04-01 16:08:18 +11:00
Régis Hanol
706fd3c59a Merge pull request #2206 from riking/posted 
Fix the 'posted' view so that it actually does something
 2014-03-31 23:05:48 +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
Neil Lalonde
379f4a87d5 FIX: remove likes and other post actions before nuking a user 2014-03-31 14:06:35 -04: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
Sam
64b0d7e0ea PERF: use before suite vs before file 
BUGFIX: correctly punch through settings to local provider
 2014-03-31 12:34:13 +11:00
Sam
f3cc7360e0 BUGFIX: Correct after_fork semantics 
After fork SiteSettings was not getting a new process id,
causing site settings not to refresh properly in unicorn

This code also centralizes the logic
 2014-03-31 12:34:13 +11:00
riking
df5229a399 Add spec for posted list 
The test fails on 956b14a and passes on this branch
 2014-03-30 14:21:35 -07: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
e6989b5313 Merge pull request #2192 from jorgemanrubia/configurable-emails-prefix 
Option to change the subject prefix in emails
 2014-03-28 15:08:50 +01:00
Neil Lalonde
fd504e741f FIX: reply by email can handle emails with attachments. Attachments are still ignored, but a post or topic can be created from the email now. 2014-03-28 09:57:20 -04: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
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
Thomas Cioppettini
38882eb1a7 Remove threequals from ruby files 2014-03-26 12:20:41 -07: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
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
4191972afe Merge pull request #2173 from vikhyat/badge-system 
Forgot to specify "dependent: destroy" for UserBadges
 2014-03-25 08:25:31 +11:00
Neil Lalonde
ea86cfd4ef FIX: categories with non-ascii names will have broken next page urls 2014-03-24 13:36:23 -04:00
Vikhyat Korrapati
b1e524e9c3 Specify dependent: destroy for UserBadges. 2014-03-24 22:39:58 +05:30
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
Vikhyat Korrapati
dcaa069bb5 Log badge grant/revoke to the staff actions log. 2014-03-21 11:10:07 +05:30
Neil Lalonde
342d09bc34 FIX: support sso_url that has query params 2014-03-19 17:14:31 -04:00
Robin Ward
d3f1eb395d Updated import for TypePad 2014-03-19 15:02:49 -04:00
Neil Lalonde
c708d6fcb8 FIX: post_mover_spec needs to order posts 2014-03-19 11:05:18 -04:00
Sam
9fc31932cf BUGFIX: don't alery myself when I link to myself 2014-03-19 12:07:48 +11:00
Neil Lalonde
0b1550f9d4 Add excerpt column to topics table to remove N+1 query in ListableTopicSerializer 2014-03-18 15:24:29 -04:00
Sam
5c26b3dad1 FIX: broken specs after new link alerting code 2014-03-18 15:22:53 +11:00
Neil Lalonde
2c725e2779 FEATURE: Trust level 4 abilities: pin/unpin, close, archive, make invisible, split/merge topic 2014-03-17 14:50:28 -04:00
Benjamin Kampmann
e63b9b362e allow apps to give custom admin javascripts 2014-03-17 13:19:08 +01:00
Sam
798b8444cf BUGFIX: work correctly if process forks 2014-03-17 15:22:11 +11:00
Sam
90139efc6f Fix spec, remove pointless have_many etc preamble 2014-03-17 12:47:47 +11:00
Sam
2c8ae22b87 FEATURE: add a simple queue Scheduler::Defer.later {} 
For quick jobs that do not need to be sent to sidekiq,
runs inline in a single thread but does not block
 2014-03-17 12:16:19 +11:00
Sam
fe63db7953 Merge pull request #2115 from vikhyat/badge-system 
Initial badge system implementation
 2014-03-17 10:06:37 +11:00
Sam
f4c2fef407 Merge pull request #2121 from LessonPlanet/disable-name-edit-for-sso 
Adding name to the list of uneditable items in preferences UI
 2014-03-17 10:05:11 +11:00
Vikhyat Korrapati
e3702ecb30 Improved crawler detection: add Twitterbot, Facebook, curl, Bing, Baidu. 2014-03-16 19:30:20 +05:30
Neil Lalonde
98284d771f Mark failing spec as pending for Robin to investigate 2014-03-14 18:13:45 -04:00
Robin Ward
e22f1ae186 Support for a daily job at a certain hour. Convert backup job to run at 
3am instead of randomly during the day.
 2014-03-14 13:02:45 -04:00
Vikhyat Korrapati
9b26c8584e Initial badge system implementation. 2014-03-14 21:49:26 +05:30
Forest Carlisle
e904b2faad Adding name to the list of uneditable items in preferences UI 
* If enable_names,  enable_sso, and sso_overrides_name settings are true.
  * Added serialization of can_edit_name so the UI has access to the right.
 2014-03-13 13:26:40 -07:00
Neil Lalonde
9f8477d0c1 Add support for categories page to smoke tests 2014-03-13 15:03:34 -04:00
Régis Hanol
fd1c824187 Revert "Merge pull request #2116 from LessonPlanet/disable-name-edit-for-sso" 
This reverts commit 91aa21671a, reversing
changes made to f19596af0d.
 2014-03-13 18:17:59 +01:00
Neil Lalonde
283dc7dd2d Trust level 4: add ability to edit any post and see edit history 2014-03-13 10:47:49 -04:00
Forest Carlisle
e8c7c6fab7 Adding name to the list of uneditable items in preferences UI 
* If enable_names,  enable_sso, and sso_overrides_name settings are true.
 2014-03-12 17:09:53 -07:00
Robin Ward
085f7997a2 FEATURE: Upload backups to S3 when complete. 2014-03-12 16:24:45 -04:00
Robin Ward
42ca83ece5 FEATURE: New site setting to enable a daily automatic backup 2014-03-12 13:30:47 -04:00
Neil Lalonde
9ca516e58d Rename nickname to username in the code. Use new hub routes. (Old routes still exist as aliases for old Discourse instances.) 2014-03-12 12:39:36 -04:00
Robin Ward
dc1d6decf5 Support for removal of old backups automatically via a site setting 2014-03-12 12:24:35 -04:00
Neil Lalonde
cf630207b7 Remove an unused variable in check_reviving_old_topic spec 2014-03-12 10:46:50 -04:00
Neil Lalonde
659e7fa4ce FEATURE: Warn when reviving a topic that has been inactive for X days. Setting warn_reviving_old_topic_age controls when the warning is shown. Set it to 0 to disable this feature. 2014-03-12 10:44:12 -04:00
Régis Hanol
363fabd3e7 add tests for ListController.best_period_for 2014-03-12 12:58:41 +01:00
Neil Lalonde
2838e1c3b5 FIX: don't show option to flag with notify_user to trust level 0 users. they can't send private messages. 2014-03-10 11:48:40 -04:00
Benjamin Kampmann
680197200e Add support for arrays to PluginStore 2014-03-10 14:59:59 +01:00
Sam
1b66ed903f Merge pull request #2091 from Xenograph/fix-sso-override 
Added spec for SSO override username/email changes
 2014-03-10 13:11:25 +11:00
Douglas Browne
a1e70ac57e Added spec for SSO override username/email changes 2014-03-09 21:38:36 -04:00
Sam
3f0964bf60 BUGFIX: spec would blow up when DST kicked in 2014-03-10 10:12:09 +11:00
Régis Hanol
8214536614 BUGFIX: don't show redirect reason if you aren't redirected 
Move the redirect to top page logic server-side and make sure the reason
is not shown when top is not in the navigation menu (top_menu).
 2014-03-07 18:58:53 +01:00
Robin Ward
c3e5ee1d7e FIX: Failing specs 2014-03-07 12:06:20 -05:00
Régis Hanol
f618278b42 make sure topic specs aren't DST sensitive 2014-03-07 11:38:24 +01:00
Sam
73ef91cf27 junk code removed 2014-03-07 19:00:36 +11:00
Sam
b19400726f BUGFIX/FEATURE: store topic changes in post revisions 
History + edit notifications for title and category changes
 2014-03-07 19:00:36 +11:00
Régis Hanol
11d91328ab Merge pull request #2056 from vikhyat/pm-likes 
Don't suppress like notifications in private messages
 2014-03-06 14:53:27 +01:00
Vikhyat Korrapati
944246f4af Add test to ensure creation of like notification in a PM. 2014-03-06 19:07:26 +05:30
Régis Hanol
ac99947979 BUGFIX: topic specs were dependent on Time.now 
which would fail when DST was around
 2014-03-06 12:44:52 +01:00
Régis Hanol
bce4130d39 Merge pull request #2036 from ArmedGuy/profile-backgrounds 
FEATURE: Profile Backgrounds
 2014-03-05 16:00:49 +01:00
Johan Jatko
98c479c3c4 FEATURE: Profile Backgrounds 
Shares a modified codebase with avatars called "user_image"
 2014-03-05 15:10:44 +01:00
Sam
edf86a207b fix build 2014-03-05 14:26:42 +11:00
Sam
adb6541635 FEATURE: mailing list mode always available 2014-03-05 14:21:53 +11:00
Sam
69b498da24 Merge pull request #2034 from birarda/custom_username_length 
allow for custom username length via site setting
 2014-03-05 12:06:23 +11:00
Stephen Birarda
4a2dab9c5e allow for custom min_username_length 
change constant in user to be global range and not default
 2014-03-04 16:37:05 -08:00
Sam
ea553202f0 Merge pull request #2033 from birarda/master 
add option to override user attributes from SSO payload
 2014-03-05 11:33:32 +11:00
Robin Ward
aa3f7f764d You can only reuse email tokens within 24 hours. 2014-03-04 14:03:04 -05:00
Stephen Birarda
c3eb2025d8 add option to override user attributes from SSO payload 
add an external_username attribute for username from SSO payload

repair the field name in SingleSignOnRecord migration

move setting of external_username for sso to controller

add settings toggle to override username/email from SSO payload

fix changing of external username after override toggle

complete tests and logic for sso override

add some extra context to username override option

add external_email and external_name to single sign on record

add setting for name override from SSO payload

complete override with stored external_email and external_name

add missing checks to tests

remove an unneeded describe block

break up a monster method for single sign on

fixes for sso attribute override after failed tests
 2014-03-04 09:52:21 -08:00
Robin Ward
5e6764e9c9 FIX: Remove update, should fix issue with broken specs 2014-03-04 12:47:14 -05:00
Robin Ward
a2b0e2b50f BUGFIX: Fix ailing tests 2014-03-03 16:24:20 -05:00
Robin Ward
f9cd354a2c FEATURE: Button to reset new 2014-03-03 15:47:01 -05:00
Robin Ward
3abe84941f FEATURE: Add new_since column to UserStat so we can reset the "New" 
date.
 2014-03-03 15:47:00 -05:00
Sam
5c3f2feed4 BUGFIX: recovery code in case an unknown job is scheduled 2014-03-04 07:37:12 +11:00
Sam
172e517b31 Merge pull request #2012 from ligthyear/incoming-emails 
Advanced New-Topic via Email Feature
 2014-03-03 10:58:10 +11:00