Commit Graph

1524 Commits

Author SHA1 Message Date
Sam 7c57d74e85 FEATURE: unicorn sidekiq will restart sidekiq on complete failure.
(checks every 30 minutes for complete failure)
2014-04-23 13:13:18 +10:00
Sam c6f9cc0787 UPGRADE: sidekiq to sidekiq 3.0 2014-04-23 11:01:17 +10:00
Robin Ward af877781b7 Allow admins to choose if groups are visible or not. 2014-04-22 16:43:46 -04:00
Régis Hanol 76d373161d BUGIFX: generate avatars when using S3 store 2014-04-22 17:11:06 +02:00
Sam a3b2b4baca FEATURE: custom fields on User 2014-04-22 13:52:13 +10:00
Sam 25860622b7 BUGFIX: if SSO is enabled invite system is disabled 2014-04-22 09:17:37 +10:00
Erick Guan 6d45f71254 move concerns to the model/concerns 2014-04-19 12:00:40 +08:00
Régis Hanol 2f08832cb7 FEATURE: handle 2 levels of categories in vanilla import 2014-04-19 00:59:20 +02:00
Régis Hanol ba0084edee FEATURE: vanilla import 2014-04-18 18:42:31 +02: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
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
Sam ead7c52a06 Refactor demonizer in prep for unicorn forking
Upgrade sidekiq
2014-04-17 15:58:00 +10:00
Neil Lalonde 1b4e11dec5 Version bump to v0.9.9.2 2014-04-16 11:14:38 -04:00
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
Sam d08973d60e improve logic for mod category management 2014-04-15 16:49:22 +10:00
Sam b7caa33841 Site setting to allow mods to create categories 2014-04-15 16:42:45 +10:00
Régis Hanol 4a93b1b0bc missed a newline 2014-04-15 00:04:13 +02:00
Régis Hanol 2505d18aa9 FEATURE: support email attachments 2014-04-14 22:55:57 +02: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
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
Vikhyat Korrapati aebae2fa5c Only @import plugin scss. Fixes the huge emoji issue. 2014-04-11 08:06:18 +05:30
Vikhyat Korrapati 89b9f9e2cb Fix badge serialization issue. 2014-04-11 07:33:17 +05:30
Sam 8d3c7b8f79 Merge pull request #2250 from ligthyear/fix-plugin-scss-import-path
Bugfix: Keep import path and context for plugin's scss imports
2014-04-11 10:12:09 +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
Benjamin Kampmann 269600323a Bugfix: Keep import path and context for plugin scss imports
- instead of concating all files into one gigantic file reuse the importer
 - and that way keep the context for relative paths in plugin scss
2014-04-10 16:24:45 +02:00
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 b0405d7cfa Adds a Site Setting to whitelist onebox domains 2014-04-09 16:57:45 -04:00
Robin Ward 034287033e Add back onebox support for flash video 2014-04-09 13:41:25 -04:00
Vikhyat Korrapati 33307a50b3 Get rid of plugins.css, inject it using DiscourseSassImporter. 2014-04-09 19:42:43 +05:30
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 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
Neil Lalonde 948c509148 Version bump to v0.9.9.1 2014-04-08 17:16:09 -04:00
Régis Hanol b328fd0031 BUGFIX: N+1 query when listing users in admin section 2014-04-08 19:12:53 +02:00
Régis Hanol 79c6bb718a BUGFIX: make sure site settings are refreshed after a restore 2014-04-08 18:06:53 +02:00
riking 1540a3d5e5 Allow changing ownwership of posts by admins 2014-04-08 01:47:42 -07:00
riking 7a843d2ac2 FIX: Only unhide flagged post if editor is the author
Also, rename @user to @editor in PostRevisor
2014-04-08 01:47:36 -07:00
riking 4814659b7b FIX: Edit ratelimits should be on the actor, not post owner 2014-04-08 01:47:36 -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 b9799a886d Thor task to enqueue a backfill of topic links 2014-04-07 15:23:30 -04:00
Régis Hanol bb0baa6d7c BUGFIX: properly reconnect to the current db after forking 2014-04-07 19:38:47 +02: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
Neil Lalonde d91a72a791 Allow rebaking posts for only one site in multisite. Use RAILS_DB. 2014-04-04 11:11:05 -04:00
Robin Ward dbab628e16 Support for creating embedded topics via API 2014-04-03 14:42:44 -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
Sam 024b86e112 BUGFIX: incorrect OOBGC algorithm, not dynamically adjusting 2014-04-02 12:26:59 +11: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 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
Sam 239bcd19df BUGFIX: protect ourselved against rogue onebox gem 2014-04-01 15:29:14 +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
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
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 86fe11b277 Fix the 'posted' view
Now is actually topics that you have posted in - previously, it was all topics you had tracked, starred, posted, read, ....
No clue how that came about.
2014-03-30 14:21:35 -07: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
Régis Hanol d23585e444 BUGFIX: backup/restore operations keep track of the read-only mode status 2014-03-28 12:15:53 +01:00
Neil Lalonde bc5896e7a4 Version bump to v0.9.9 2014-03-27 16:15:52 -04: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
Cyril Rohr 3631ba2eb5 Use string interpolation, to avoid segmentation fault.
The segmentation fault was ocurring when precompiling assets, with ruby2.0.0.
2014-03-26 15:06:22 +00: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 35ee341122 SECURITY: GitHub returns unvalidated emails 2014-03-26 10:55:36 +11:00
Sam 2f4ec5a17c BUGFIX: no idea how this worked in test 2014-03-25 15:15:46 +11:00
Régis Hanol 0def4747da FEATURE: send the backup/restore logs when operation fails 2014-03-24 19:34:16 +01:00
Sam 7e7c4efcc0 FEATURE: on initial boot hint users on how to get admin 2014-03-24 18:03:39 +11:00
Sam a3344a6be3 oops 2014-03-24 13:32:32 +11:00
Sam 090f5c99c2 FEATURE: Live update edits 2014-03-24 12:19:08 +11:00
Jeff Atwood 1353cc61ba Merge pull request #2156 from riking/fix-necro
Only warn about necromancy when replying
2014-03-22 15:08:26 -07: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
Robin Ward c1b4f5b80b FIX: `sed` on OSX sucks and doesn't work with the same commands as on
most Linux machines. This regexp is compatible with both.
2014-03-21 11:57:33 -04:00
Robin Ward f12b2b45aa Version bump to v0.9.8.11 2014-03-20 16:26:03 -04:00
riking dc230cb7e4 Only warn about necromancy when replying 2014-03-19 17:04:42 -07:00
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 a74764c833 Log when facebook doesn't provide an email address 2014-03-19 13:31:17 -04: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
Sam 00a46253ae BUGFIX: Don't resolve oneboxes when cooking
Defer to post save job
2014-03-18 15:22:53 +11:00
Sam 24667cedee FEATURE: notify users when linked
Extract out PostAlerter from observer
Track outgoing post links correctly
Notify users they are linked when linked
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 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
Robin Ward d50c92b34b Mostly working importer for typepad blogs 2014-03-14 18:16:05 -04:00
Neil Lalonde 20ced1a55e FIX: ORDER BY for new topics within current category was second in list, needs to be first 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
Régis Hanol dbe72fe26d FEATURE: minimize duration of read-only mode when backing up 2014-03-14 15:53:58 +01:00
Régis Hanol ea953c9c0e BUGFIX: only wait for jobs of the current_site when backing up 2014-03-14 15:49:35 +01:00
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 87f054366c Version bump to v0.9.8.10 2014-03-13 15:20:08 -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
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 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 5b7f2b4488 ooops. I don't know how to write smtp 2014-03-12 11:55:08 +01:00
Régis Hanol c5298cd25f BUGFIX: require net/stmp module to properly handle exceptions 2014-03-12 11:53:10 +01:00
Régis Hanol 8c89931747 do not log sensitive commands during backup/restore 2014-03-12 11:45:55 +01:00
Régis Hanol 9eb3958374 FEATURE: gzip backups using best compression 2014-03-11 12:47:51 +01:00
Nick Schonning 9f8d608a8d JSHint headless-ember
- Mark all exported vars
- Mark redefined global vars
- Suppress leak warning for the redefinition of jQuery
2014-03-11 03:18:57 -04:00
Nick Schonning 3782fbed2b JSHint run-qunit.js
- Turn on devel for console and phantom for the phantomjs globals
- Remove unnecessary semicolons
- Use strict comparisons
- Add missing var statements used by for…in
2014-03-11 03:10:55 -04: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
Sam bf23c7a0c4 Merge pull request #2066 from riking/red-popup
Style 'urgent' composer popups differently
2014-03-10 10:46:15 +11:00
Sam cbf269fdbf Merge pull request #2080 from Xenograph/fix-sso-override
Username/email change should not be allowed with SSO and username/email override enabled
2014-03-10 10:32:08 +11:00
Sam b7ece53966 BUGFIX: rescue should splat 2014-03-09 23:06:54 +11:00
Douglas Browne 23d7b17f1a Disabled editing of SSO overridden fields 2014-03-08 01:16:49 -05:00
Robin Ward dc9003b8d4 In the event of a misconfigured locale, don't raise an exception. 2014-03-07 14:59:29 -05:00
Régis Hanol 18e9d319fd BUGFIX: catch STMP client errors in email sending background job
Will log the exception message in the skipped reason instead of keeping
the job in the queue whenever the email address is invalid
2014-03-07 16:33:15 +01:00
Régis Hanol f52ab7fc77 Merge pull request #2067 from riking/better-backup-name
Add site name to beginning of backup filename
2014-03-07 11:47:58 +01:00
Régis Hanol 2c2d3ac071 Merge pull request #2068 from riking/site_settings_refresh
Refresh the site after updating certain site settings
2014-03-07 11:46:15 +01:00
Régis Hanol f25bcc5067 couple of bugfixes identified while importing from VB 2014-03-07 10:44:04 +01:00
riking ccd3e635d2 Refresh the site after updating certain site settings 2014-03-06 20:24:23 -08:00
riking 01826b9c18 Add site name to beginning of backup filename 2014-03-06 16:34:31 -08:00
riking e0063920b7 Style 'urgent' composer popups differently
The two "bad behavior" composer popups get the 'urgent' class, which colors them red.
2014-03-06 15:35:47 -08:00
Sam adb6541635 FEATURE: mailing list mode always available 2014-03-05 14:21:53 +11: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 88772cce5a Version bump to v0.9.8.9 2014-03-04 14:54:52 -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
Régis Hanol 23aa478473 Merge pull request #2052 from vikhyat/plugin-tests
Don't run plugin gem tests
2014-03-04 11:48:40 +01:00
Vikhyat Korrapati 56a7a68238 Don't run plugin gem tests. 2014-03-04 14:30:35 +05:30
Sam d969958b18 PERF: workaround aweful sass compiling perf with HUGE css files 2014-03-04 17:16:53 +11:00
Sam f602c568e2 PERF: speed up css precompilation by caching 2014-03-04 16:55:23 +11:00
Sam 5c3f2feed4 BUGFIX: recovery code in case an unknown job is scheduled 2014-03-04 07:37:12 +11:00
Robin Ward 158487dfc2 FIX: Clean up next/prev rel links 2014-03-03 12:56:37 -05:00
Sam ceb80611d6 PERF: defer last_ip_address and last_seen updates 2014-03-03 15:16:38 +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