Commit Graph

3466 Commits

Author SHA1 Message Date
Sam 0b3ad8a3fd Merge branch 'master' of github.com:discourse/discourse 2015-05-07 11:51:09 +10:00
Sam 77cc087b13 FIX: proper error message when account created is hit with no session 2015-05-07 11:00:22 +10:00
Sam d6c06eb547 Get rid of CSRF errors 2015-05-07 10:42:21 +10:00
Arpit Jalan ee960899df Update Translations 2015-05-06 21:32:11 +05:30
Jeff Atwood 6447c6c81d posts -> replies in too_few_topics_notice 2015-05-06 01:33:48 -07:00
Sam cea9cfe49f remove alihack 2015-05-06 16:59:41 +10:00
Sam 2f82caafa2 Add ignore for another type of not found 2015-05-06 16:21:59 +10:00
Sam c96a057395 ignore routing errors on multisite 2015-05-06 12:47:30 +10:00
Sam 19e5304813 add hostname to fake env 2015-05-06 12:28:32 +10:00
Erick Guan b772ff6e13 FEATURE: add slug geneartion options 2015-05-05 18:08:30 +08:00
Sam f58d85edea FEATURE: move stylesheet cache out of the uploads directory 2015-05-05 15:50:13 +10:00
Jeff Atwood b84c4ef0c6 add warning around must_approve_users 2015-05-04 11:33:03 -07:00
Jeff Atwood 8f706f11cb remove trust level reference from flag unhide PM 2015-05-04 01:19:04 -07:00
Jeff Atwood 77992a11b9 correct copy and de-experimental browser icon count 2015-05-03 23:29:56 -07:00
Sam 0369f26a39 add some ignores 2015-05-04 16:12:03 +10:00
Sam 4dfc1907ac Simplify desktop notifications, only include if mention/reply/pm/link
Include post excerpt in the notification
2015-05-04 13:49:32 +10:00
Sam 803feefd54 MessageBus handles readonly redis now, no need to wrap it 2015-05-04 12:21:00 +10:00
Jeff Atwood 83b7620cb2 use pencil glyph on edit history dialog 2015-05-02 03:48:37 -07:00
Jeff Atwood 80003e0821 improve copy for password change token expired 2015-05-01 01:39:53 -07:00
Jeff Atwood bafcfa5b6a Improve password reset expired link copy 2015-05-01 01:30:13 -07:00
Jeff Atwood 7c42cb7c22 "reset password" doesn't exist, forgot does. 2015-05-01 00:52:50 -07:00
Jeff Atwood 6139090e9e improvement to accept invite password instructions 2015-05-01 00:51:17 -07:00
Sam f3188ab8f2 remove unused setting 2015-04-30 12:06:32 +10:00
riking a3338e9798 Missed localization key 2015-04-29 15:06:04 -07:00
Arpit Jalan 787b30c354 Update Translations 2015-04-29 22:38:29 +05:30
Sam fd7c34cfa7 Merge pull request #3409 from zzakcanncode/rails-42
Rails 4.2 and master support and CI
2015-04-29 17:32:19 +10:00
Sam d7d93c20d7 Merge pull request #3406 from techAPJ/patch-2
FEATURE: prefill topic title, body and category via URL
2015-04-29 13:46:26 +10:00
Arthur Neves d2b1cc55b9
Disable raise_in_transactional_callbacks for now 2015-04-28 23:20:08 -04:00
Sam 7bc220956a this quickstart file is confusing and not needed
removing
2015-04-29 13:15:53 +10:00
Arthur Neves 439d0d2e37
Check Rails.version instead of ENV
Like that we can have code that works on multiple Rails versions, and we
dont need to mix a new method on Kernel.
Also, this makes easier to have multiple versions.
For instance, before master was 4.2, which is not the case anymore, so
on the code we should check versions and not Environment variables
2015-04-28 22:27:47 -04:00
Robin Ward 15ea0c4789 Merge pull request #3304 from riking/desktop-notifications
Desktop notifications!
2015-04-28 16:24:02 -04:00
Arpit Jalan cff6e49eb7 FEATURE: prefill topic title, body and category via URL 2015-04-29 00:01:10 +05:30
Sam 729aaa826b Merge pull request #3404 from techAPJ/patch-1
FEATURE: magic login route for admin when SSO is enabled
2015-04-28 07:47:50 +10:00
Robin Ward 8c930c97e0 If there are pending posts in a topic, display a message at the bottom 2015-04-27 15:55:10 -04:00
Robin Ward ecafbb0a63 Can delete users via the moderation queue 2015-04-27 15:06:20 -04:00
Arpit Jalan 2932284293 FEATURE: magic login route for admin when SSO is enabled 2015-04-27 22:54:48 +05:30
Jeff Atwood 04b064cbde add mention of HTML to reply placeholder 2015-04-25 02:48:08 -07:00
Jeff Atwood 6233770e3a period at bottom of topic msg was dangling 2015-04-25 01:40:55 -07:00
Robin Ward 15dbce5886 Show pending posts count in modal when your posts are enqueued 2015-04-24 15:44:59 -04:00
Robin Ward 3a6efa25f0 Allow ReadOnly to propogate up to the Ember app via Response Header 2015-04-24 14:37:16 -04:00
Robin Ward 5b3f99aa50 Don't blow up if Redis switches to READONLY 2015-04-24 14:37:16 -04:00
Régis Hanol a5804d7040 FIX: reduce 'download_remote_images_threshold' default value to 10 2015-04-24 12:07:01 +02:00
Arpit Jalan 574052b786 Update Translations 2015-04-22 19:05:15 +05:30
riking f5e27fe2c8 FEATURE: Desktop notifications 2015-04-21 20:21:52 -07:00
Jeff Atwood 444fe5757d improve new topic copy 2015-04-21 17:10:49 -07:00
Robin Ward 5bf8c31af4 Users can see their pending posts 2015-04-21 16:44:47 -04:00
Neil Lalonde 3071650eb3 FEATURE: when post is too short, suggest using the like button instead 2015-04-20 11:10:56 -04:00
Robin Ward ba6d5505af FIX: Typos in translations 2015-04-19 11:04:15 -04:00
Jeff Atwood dac4c646d5 add warning on default trust level 2015-04-17 15:29:40 -07:00
Robin Ward a61c202ac4 Rewrite `/private-messages` to `/messages` 2015-04-17 12:01:50 -04:00
Sam 0c11b4c707 timings is a POST 2015-04-17 12:49:55 +10:00
Sam 2599b94920 ignore uploads for mini profiler 2015-04-17 12:16:37 +10:00
Robin Ward 788b66e4a3 Update SourceURL to work better 2015-04-16 16:51:49 -04:00
Robin Ward c7d367996a PERF: Concatenate scripts in development mode
This improves my DOMContentLoaded from 9s+ to less than 4s.
Pinging @SamSaffron on this because this was previously controversial.

This implementation adds the `@sourceURL` directive so chrome correctly
identifies the source files.
2015-04-16 15:40:23 -04:00
Robin Ward 2459f52c71 Merge pull request #3375 from techAPJ/patch-2
FEATURE: invite existing users to private topic
2015-04-16 11:13:42 -04:00
Robin Ward 94fea09416 Merge pull request #3383 from techAPJ/patch-4
FIX: handle error for duplicate email_in address
2015-04-16 11:13:36 -04:00
Arpit Jalan 866d1cd8e3 FIX: handle error for duplicate email_in address 2015-04-16 16:23:22 +05:30
Sam Saffron 67ed6b1e9a FIX: missing pluralization, change topic card to use replies 2015-04-16 14:54:24 +10:00
Sam a5b25ad2af FEATURE: scale up likes per day as users increase trust level
tl2 = 1.5 times the likes
tl3 = 2 times the likes
tl4 = 3 times the likes

configurable via tl[234]_additional_likes_per_day_multiplier site setting
2015-04-16 09:44:30 +10:00
Robin Ward 08b4b7b7ff Moderators can edit posts that are queued before they approve/reject 2015-04-15 17:20:34 -04:00
Jeff Atwood 17696e8c6f Merge pull request #3379 from betson/pipe-delimited-indicator
indicate that lists can be pasted if pipe-delimited
2015-04-15 14:06:48 -07:00
Neil Lalonde dcb9d6e16a remove queue_size_check 2015-04-15 15:52:39 -04:00
Arpit Jalan d491d4f997 FEATURE: invite existing users to private topic 2015-04-16 00:52:54 +05:30
Robin Ward af1571a58f Site Settings for post approval 2015-04-15 14:54:37 -04:00
Robin Ward 0c233e4e25 Interface is wired up for Approving/Rejecting posts 2015-04-15 14:54:37 -04:00
Robin Ward 96d2c5069b Interface for reviewing queued posts 2015-04-15 14:54:37 -04:00
Robin Ward f1ede42569 Add the posts that need to be reviewed to the hamburger 2015-04-15 14:54:37 -04:00
Robin Ward 7f501a0c41 When a post returns `enqueued` don't insert it in the stream and notify
- Includes removal of a lot of modal boilerplate
2015-04-15 14:54:37 -04:00
betson b28a004413 indicate that lists can be pasted if pipe-delimited
In the configuration for a list-setting component, the Select2 component is initialized with a pipe ("|") as the separator. (app/assets/javascripts/admin/components/list-setting.js.es6)

This should be communicated to the user in the event they want to paste a list of domains for the blacklist/whitelist.
2015-04-15 11:42:39 -04:00
Arpit Jalan 499bed69e2 FIX: show error message if user already exist in group 2015-04-15 14:15:58 +05:30
Sam 6a0cce8571 UX: tweak copy and position of tracking and new prefs 2015-04-15 08:38:42 +10:00
Arpit Jalan 77baae13bc Update Translations 2015-04-13 23:58:48 +05:30
Neil Lalonde 0ba2ac97f2 Merge pull request #3358 from techAPJ/update-translations
Update Translations
2015-04-10 12:43:54 -04:00
Arpit Jalan e6df97f01d FIX: add email reply error message for topic not getting created in restricted category 2015-04-10 17:11:52 +05:30
Sam 75890aed26 FEATURE: allow admins to choose a group as a primary group
FEATURE: allow admins to set a default title for a group
2015-04-10 12:17:28 +10:00
Arpit Jalan 8623f179ff Update Translations 2015-04-09 20:58:06 +05:30
Régis Hanol 4a9587fa23 FIX: auto-load all plugin locales so that they can be used in PrettyText 2015-04-09 17:04:14 +02:00
Qasem Hajizadeh f89b1002f0 change fa key to fa_IR in plurals.rb
change fa key to fa_IR in plurals.rb
2015-04-09 01:39:59 +04:30
Sam 2d9d60e9a2 we don't need oobgc in ruby 2.2, disable for now 2015-04-08 15:24:17 +10:00
Sam 4bfca12b11 FEATURE: anonymous_account_duration_minutes , cycle anon accounts after N minutes from last post
fixes it so anon users can not like stuff
2015-04-08 12:30:02 +10:00
Régis Hanol babbbc06d1 FIX: add support for .tgz and .gz backup files 2015-04-07 15:26:47 +02:00
Sam f5d89169e2 FEATURE: initial implemenation of anonymous posting mode 2015-04-07 18:05:31 +10:00
Régis Hanol cd5af46fb7 Merge pull request #3341 from techAPJ/patch-1
FIX: include topic excerpt in topic/message invite mail for existing user
2015-04-07 09:25:18 +02:00
Arpit Jalan d5db44da87 FIX: include topic excerpt in topic/message invite mail for existing user 2015-04-07 12:02:04 +05:30
Régis Hanol 2389bee24c FEATURE: add notice when successfully changing avatar 2015-04-06 18:14:13 +02:00
Régis Hanol 1fd50634f0 FIX: translation issues with top periods 2015-04-06 13:24:46 +02:00
Régis Hanol 7749b3e99f Merge pull request #3320 from Qasem-h/Add-Persian-Language
Add persian language for Discourse
2015-04-06 12:12:44 +02:00
Régis Hanol 33879e1311 Merge pull request #3199 from fantasticfears/seo
FEATURE: add microdata prop and more links for crawler
2015-04-06 11:18:34 +02:00
Régis Hanol 50edad5fb2 Merge pull request #3336 from techAPJ/patch-1
FEATURE: support inviting existing users to topic and message when SSO is enabled
2015-04-06 11:11:42 +02:00
Qasem Hajizadeh 87df1dad43 Update server.fa_IR.yml 2015-04-05 21:27:52 +04:30
Qasem Hajizadeh ae75edf1be Update client.fa_IR.yml 2015-04-05 21:25:54 +04:30
Arpit Jalan e8dd5592c6 FEATURE: support inviting existing users to topic and message when SSO is enabled 2015-04-05 14:31:35 +05:30
riking 1d4a6618d0 UX: Use ellipsis in topic wrench menu for 'more choices' 2015-04-04 21:59:00 -07:00
Arpit Jalan af948f6931 minor improvement in copy 2015-04-04 18:18:34 +05:30
Arpit Jalan 3f59cf752d UX: add reply-to glyph in composer 2015-04-04 13:02:55 +05:30
Sam 6f63f4fe17 correct anon search 2015-04-04 07:55:32 +11:00
Jeff Atwood 2da0019228 remove word "by" in editor title, ONW 2015-04-03 12:42:23 -07:00
Jeff Atwood 456d19f44d clarify avatar crop warning 2015-04-03 11:43:46 -07:00
Erick Guan 4065df29f1 add missing period in the translation file
Transifex doesn't recognize the `one` and `other` again :( Hope this can fix that.
2015-04-03 20:26:24 +08:00
Arpit Jalan 125a0ec5bf UX: dynamic invite copy 2015-04-03 16:24:17 +05:30
Jeff Atwood d3c0fc8288 better copy for invites 2015-04-03 03:06:34 -07:00
Régis Hanol 0e1c4a0a44 Merge pull request #3313 from techAPJ/patch-1
FEATURE: invite existing user to a topic
2015-04-03 11:41:10 +02:00
Régis Hanol 00976304bc Default 'allow animated thumbnails' to true 2015-04-03 11:40:54 +02:00
Arpit Jalan 8c2d7dcaac FEATURE: invite existing user to a topic 2015-04-03 15:00:04 +05:30
Neil Lalonde 30b063c08b FEATURE: make full names a required field of user profiles with the full_name_required setting 2015-04-02 17:08:04 -04:00
Régis Hanol a799f6f8d9 Merge pull request #3321 from techAPJ/patch-2
FIX: include site name in email reply error subject
2015-04-02 13:55:49 +02:00
Arpit Jalan a80c742855 FIX: include site name in email reply error subject 2015-04-02 15:46:22 +05:30
Jeff Atwood a51cb6c8d5 add placeholders for all long badge descs 2015-04-02 02:24:36 -07:00
Sam 09c733831c missing localization 2015-04-02 17:09:57 +11:00
Sam 214034f34a regression search route was getting in the way 2015-04-02 17:03:32 +11:00
Sam 1f59375c82 rename max_word_length to title_max_word_length 2015-04-02 16:46:53 +11:00
Sam 4dbd065026 work-in-progress full page search 2015-04-02 16:02:07 +11:00
Jeff Atwood a764840794 increase default attachment size to match images 2015-04-01 15:37:40 -07:00
Qasem Hajizadeh d23ff0de2f Create server.fa_IR.yml 2015-04-02 02:53:36 +04:30
Qasem Hajizadeh 1df2f6eba4 Create client.fa_IR.yml 2015-04-02 02:53:16 +04:30
Arpit Jalan 47525c6af4 Update Translations 2015-04-01 22:16:57 +05:30
Jeff Atwood 801d04997a FIX: staff message color was wrong on mobile 2015-04-01 01:07:22 -07:00
Jeff Atwood 39f284ac26 remove date from digest email subject field 2015-04-01 00:29:26 -07:00
Sam 1a05a675ae UX: user page copy change replies -> responses 2015-04-01 16:39:31 +11:00
Robin Ward 910571c45a Add a redirect from `/c` to `/categories` 2015-03-30 12:15:02 -04:00
Régis Hanol b861669ceb add global notice for S3 deprecation warning 2015-03-30 11:26:45 +02:00
riking 0b98b7da60 FEATURE: Use fa-at for mentioned notification 2015-03-27 14:09:45 -07:00
Régis Hanol f036b23be5 FIX: add CORS header for .woff2 2015-03-27 13:30:18 +01:00
Sam 1721872084 cleanup out-of-memory detection and correction code 2015-03-27 15:44:52 +11:00
Sam 251ebb0d65 disable memory check till we confirm all is good 2015-03-27 14:51:22 +11:00
Sam 43eb030402 PERF: restart sidekiq if it consumes more than 500MB
configurable with UNICORN_SIDEKIQ_MAX_RSS
2015-03-27 14:27:01 +11:00
Jeff Atwood d5eed540ea fix minor site setting copy mistake 2015-03-26 16:58:37 -07:00
Jeff Atwood 6875a09f79 Change "Private Message" to "Message" (server side) 2015-03-26 16:56:08 -07:00
Jeff Atwood f2a819064d Change "Private Message" to just "Message" 2015-03-26 16:26:03 -07:00
Jeff Atwood adc9e68e66 remove SSO full name override warning not needed 2015-03-26 16:19:00 -07:00
Régis Hanol 6493e4f641 FIX: missing tooltip on backup screen 2015-03-26 18:05:27 +01:00
Robin Ward 2cc5858163 Add site setting to disable User Directory, include restricted info 2015-03-26 11:26:19 -04:00
Régis Hanol b4b505d45f UX: move automatic/custom groups properties to their own fields group in user admin 2015-03-25 20:16:47 +01:00
Régis Hanol 90de61ee3d S3 deprecation warning 2015-03-25 18:34:07 +01:00
Robin Ward 1e3e4135a3 Add Posts Read + Visits to User Directory 2015-03-24 15:31:54 -04:00
Arpit Jalan 7acae703d9 Update Translations 2015-03-24 20:57:12 +05:30
Sam 92e371f0b3 FEATURE: civilized mute
Allow user to mute all notifications generated by specific users
2015-03-24 11:55:22 +11:00
Neil Lalonde 55f293d062 FEATURE: add a route to show the password reset dialog: /password-reset 2015-03-23 15:14:50 -04:00
Sam 1601211617 Revert "FEATURE: allow end users to opt out of getting any private messages"
This reverts commit 229ecc4f8a.
2015-03-23 17:21:58 +11:00
Sam 229ecc4f8a FEATURE: allow end users to opt out of getting any private messages 2015-03-23 15:50:45 +11:00
Sam acf6b253e1 FEATURE: pick a valid hostname for notification email based on hostname
FEATURE: allow notification email to be set via ENV
2015-03-23 11:57:59 +11:00
Jeff Atwood ce09adb5ff some tweaks to Feature this Topic 2015-03-20 12:47:39 -07:00
Robin Ward 4d26ef5e29 Add Title tag, rename to "Users" 2015-03-20 14:20:50 -04:00
Régis Hanol 18f4f60956 FIX: used 'pin' terminology instead of 'feature topic' 2015-03-20 11:43:05 +01:00
Régis Hanol e70597a0d0 typo 2015-03-20 10:17:16 +01:00
Robin Ward 051a2a3d14 FEATURE: Can search the user directory by name 2015-03-19 18:07:48 -04:00
Robin Ward 326dff6068 UX: User directory tweaks.
Also includes Better refresh semantics for query params (avoids
transition)
2015-03-19 17:09:39 -04:00
Régis Hanol b18dfa7ca0 change copy of the 'save' button when creating a topic 2015-03-19 20:30:19 +01:00
Régis Hanol 225c1dc682 oops - typo (:fired:) 2015-03-19 20:07:48 +01:00
Régis Hanol 28c0f9dd1f FIX: only nag when pinning globally 2015-03-19 20:05:03 +01:00