codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-30 19:08:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
9573 commits 7 branches 179 tags 87 MiB
Commit graph

2420 commits

Author SHA1 Message Date
Sam
9e9c41ac52 FEATURE: admins can clear screend emails if needed 2014-06-02 16:53:00 +10:00
riking
6431a6b849 Add tooltips to flag dialog 
re https://meta.discourse.org/t/what-does-take-action-do/16156/4?u=riking
 2014-06-01 23:36:18 -07:00
Sam
0979e7b9af BUGFIX: tracking categories was not implemented 2014-06-02 13:55:01 +10:00
Benjamin Kampmann
572ee3b94d add site_setting choices 
- add site_setting choices lists to list entries
 - allows for handy autocompletion using the new select2.js UI
 - automatically merges plugin choices into existing list, allowing for easy extension
 2014-06-01 16:37:51 +02:00
Sam
7861cabfa1 FEATURE: posts per page is configurable, so should be desktop slack 2014-05-31 10:19:29 +10:00
Neil Lalonde
8ab0d6ff51 Merge pull request #2402 from techAPJ/update-translations-2 
Update translations
 2014-05-30 15:10:29 -04:00
Robin Ward
1af2ff6201 ES6: More components moved over. 2014-05-30 12:28:05 -04:00
Sam
fa6f22dd39 Move letter avatars out of upload system 
FIX: S3 issues around system avatars
FIX: reduced backup file size
 2014-05-30 14:45:55 +10:00
Jeff Atwood
a2a834dae0 add guide links to google oauth 2 warning 2014-05-29 21:40:29 -07:00
Jeff Atwood
dab852f922 clarify that it is a new user 2014-05-29 21:37:29 -07:00
Arpit Jalan
0571d500c9 Update translations 2014-05-30 07:08:40 +05:30
Sam
fe594f5d1e Merge pull request #2372 from vikhyat/badge-system 
Multiple grant badges
 2014-05-30 10:18:00 +10:00
Jeff Atwood
a963941ebb relax trust level 1 promotion a bit 2014-05-29 15:44:27 -07:00
Catrin
772a304fc2 dropdown on categorypage 2014-05-29 18:18:27 -04:00
Neil Lalonde
1926702cff Merge pull request #2400 from wooyek/translations_pl_PL 
New pl_PL translations for Polish language
 2014-05-29 11:23:27 -04:00
Jeff Atwood
cc473f1c5d better signal on empty category desc 2014-05-29 02:14:08 -07:00
Janusz Skonieczny
ff8f70cb1d New translation per instructions: 
https://github.com/discourse/discourse/pull/2383#issuecomment-44501238
 2014-05-29 09:54:44 +02:00
Sam
4b4d775ad9 Add quote post 2014-05-29 16:09:31 +10:00
Jeff Atwood
480b8f83fd update Admin Quick Start guide a bit 2014-05-28 17:19:25 -07:00
Jeff Atwood
37e7640be0 we lost my "public" copy change 2014-05-28 17:03:03 -07:00
Sam
6d88d7a290 BUGFIX - in domain name not captured by route 2014-05-29 09:31:17 +10:00
Neil Lalonde
9aba666d3f Also warn admins when there aren't at least 50 posts 2014-05-28 13:33:48 -04:00
Jeff Atwood
6b989ff6f1 add "public" 2014-05-27 13:42:46 -07:00
Robin Ward
7c22d738b6 FEATURE: Add a location field to a user's profile 2014-05-27 13:54:04 -04:00
Robin Ward
20c640355d Silence avatar logger for sanity 2014-05-27 10:27:49 -04:00
Sam
69c36cf082 allow dots in hostname 2014-05-27 23:30:57 +10:00
Sam
0c86d9ed9e BUGFIX: proper multisite support for origin pull CDNs 2014-05-27 23:13:42 +10:00
Sam
7c6a0c7690 disable avatars mk2 2014-05-27 21:37:42 +10:00
Sam
01dcea2c8b disable avatars temporarily 2014-05-27 21:28:10 +10:00
Sam Saffron
7c3d72f77a BUGFIX: exclude avatars from mini profiler 2014-05-27 12:38:42 +10:00
Sam
724b36fe0d We need pry in development 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
Robin Ward
5284fb7cbc New Setting: Don't jump to new posts when replying 2014-05-26 16:39:03 -04:00
Neil Lalonde
8c3770c0b0 Add site setting show_create_topics_notice as a way to hide the 'Create at least 5 topics to get discussion started' message. 2014-05-26 11:20:06 -04:00
Sam
570c4b6300 certain keyboard shortcuts were never tested ever. 2014-05-25 14:59:05 +10:00
Sam
5d0fee683d Merge pull request #2381 from jsierles/fix_runit_reload 
Trap runit HUP signal and send USR2 to unicorn
 2014-05-25 13:56:31 +10:00
Sam
7fbf162666 Logster update 
cleans up a bunch of messed up context stuff with multisite
improves backtraces
adds request params
 2014-05-25 13:54:52 +10:00
Jeff Atwood
4de0351aea posted vs created 2014-05-24 15:17:59 -07:00
Jeff Atwood
64f8b8c0e8 Log in / Sign in 2014-05-24 15:14:03 -07:00
Neil Lalonde
56bd657d76 Update translations 2014-05-23 19:20:16 -04:00
Jeff Atwood
871ab7701e shorten edit category for better fit 2014-05-23 15:16:48 -07:00
Neil Lalonde
512771932a Show a warning to admins if the site has fewer than 5 topics. 2014-05-23 12:25:16 -04:00
Joshua Sierles
daa8c50745 Runit sends HUP when 'reload' is called. Trap HUP and send USR2 to unicorn. 2014-05-23 13:01:11 +02:00
Jeff Atwood
4acf247ff2 minor copyedit 2014-05-22 23:43:06 -07:00
Sam
40d397e278 FEATURE: Unhide max username length 2014-05-23 11:36:35 +10:00
Arpit Jalan
f8255f4443 Update translations 2014-05-22 22:28:47 +05:30
Jeff Atwood
11348a15ea improve domain/url block message 2014-05-21 21:51:13 -07:00
Neil Lalonde
8f76b76cf3 FIX: new sites would get enable_google_logins true, should be false now 2014-05-21 19:40:59 -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
30c86d834f * Increase pool size to allow for a few extra bg threads in sidekiq 2014-05-22 09:00:24 +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
Sam
ca95bdb023 Username length is now minimum 20 2014-05-22 08:28:16 +10:00
Kane York
8c0841dd8f Copy: Change {x} new topics -> {x} new posts 2014-05-21 13:40:13 -07:00
Vikhyat Korrapati
d208e4d517 Multiple grant badges. 2014-05-21 12:54:55 +05:30
Jeff Atwood
6617bfa454 add glyph to Sign In to Reply button 2014-05-19 22:10:47 -07:00
Jeff Atwood
0e160cc5b3 minor copyedit 2014-05-19 13:51:03 -07:00
Jeff Atwood
9c51d79d81 shorten "all subcategories" 2014-05-19 00:11:32 -07:00
Sam
832a730e36 BUGFIX: re-enable CDN js debugging in a robust way 
May be disabled if needed via site setting
 2014-05-19 08:46:28 +10:00
Jeff Atwood
e94c8b90b8 copyedit trust level badges 2014-05-18 00:55:51 -07:00
Jeff Atwood
b0ff2b2311 few more glyphs 2014-05-17 01:46:39 -07:00
Jeff Atwood
605cf96923 add some glyphs to new buttons 2014-05-17 01:27:12 -07:00
Jeff Atwood
e8d24edd16 shorten settings reset text, add glyph 2014-05-17 01:07:43 -07:00
Jeff Atwood
3793a2e06d add glyphs to user page API buttons 2014-05-17 01:02:30 -07:00
Jeff Atwood
31aea668e0 improve /top redirect copy in English master 2014-05-16 16:25:28 -07:00
Jeff Atwood
49bd865a83 improve /top redirect copy 2014-05-16 15:01:52 -07:00
Neil Lalonde
4ca0a162b4 Add a hint about the fixed_category_positions site setting in the edit category modal. 2014-05-16 11:45:54 -04:00
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
5914d0e132 Merge pull request #2311 from vikhyat/badge-system 
Add automatically assigned trust level badges
 2014-05-16 09:08:00 +10:00
Régis Hanol
986e8f2f0f Merge pull request #2338 from GitLaboratory/patch-2 
Hide version of the web server
 2014-05-15 15:22:44 +02:00
Jeff Atwood
ecd9f5fa78 clarify digest footer 2014-05-14 23:17:04 -07:00
Sam
f34862d195 FEATURE: get window.onerror working for CDNs 2014-05-15 12:59:26 +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
Neil Lalonde
f111e4ba56 Update translations 2014-05-14 12:37:00 -04:00
Vikhyat Korrapati
b144b75565 Add automatically assigned trust level badges. 2014-05-14 20:47:21 +05:30
Neil Lalonde
4980cff802 Add descriptions. Make all the actions buttons. Add a revert button to colors. Add a new variable: quaternary. 2014-05-14 10:19:00 -04:00
Neil Lalonde
3b1e1731dc Remove the message that says the themer is under contruction 2014-05-14 10:18:13 -04:00
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
Jeff Atwood
5a22385b76 unread_message_count is just a string now 2014-05-13 22:15:06 -07:00
Il'ya A. Lykov
6a20aad67f Hide version of the web server 2014-05-14 12:08:29 +07:00
Sam
97373535c8 A regression here worries me too much 2014-05-14 11:27:29 +10:00
Sam
810eda448f Merge branch 'environment-smtp-verify' of https://github.com/cfstras/discourse 2014-05-14 11:25:05 +10:00
Sam
dc06401479 PERF: reduce sidekiq worker count to 5 2014-05-14 10:21:11 +10:00
Sam
1aa200788c Monkey patching, not required. 2014-05-14 10:20:23 +10:00
Régis Hanol
2d8a4ee91f BUGFIX: add 'notify_moderators' flag reason 2014-05-13 17:36:32 +02:00
Wojciech Zawistowski
960d64930c Wiki Post 2014-05-13 08:53:11 -04:00
Jeff Atwood
c382b259f0 minor copy improvement 2014-05-12 15:39:30 -07: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
Régis Hanol
bc3de84ebf FEATURE: remove bookmark button in activity feed 2014-05-12 09:33:26 +02:00
Jeff Atwood
8322f3d5de copyedits on embedded posts 2014-05-09 23:00:49 -07:00
Neil Lalonde
9f059b1090 User lowercase names for seeded categories. Change colors of meta category badge for new sites. 2014-05-09 12:57:19 -04:00
Robin Ward
aa9a8aa217 Merge pull request #2327 from fantasticfears/patch-3 
One more line for more space in new version email
 2014-05-09 12:03:10 -04:00
Sam
084ec87850 FEATURE: admins can invite users to groups via the web UI 2014-05-09 18:22:36 +10:00
Erick Guan
f2fd38a7b8 One more line for more space in new version email 2014-05-09 15:02:22 +08:00
Claus Strasburger
b53248178b Added openssl_verify_mode parameter for action_mailer. 
- parameter in `environments/production.rb`
- documentation & default value (nil) in `discourse_defaults.conf`
 2014-05-08 22:21:36 +02:00
Robin Ward
c3ccc3e309 Transpile ES6 even without node, just using rubyracer 2014-05-08 11:35:33 -04:00
Sam
31c575687b memory_profiler should be shipped with mini profiler 2014-05-08 14:47:54 +10:00
Sam
e6418cd582 Merge pull request #2324 from kohenkatz/bugfix/puma-socket-name 
Fix Puma socket name
 2014-05-08 12:42:09 +10:00
MK
620e8aa73d Prevent IE Compatibility Mode 
As discussed at https://meta.discourse.org/t/ie10-user-is-getting-your-browser-is-too-old/15289
 2014-05-07 22:16:20 -04:00
MK
baafa15bc3 Fix Puma socket name 
As mentioned in f784a188c6 (commitcomment-5277066)
 2014-05-07 21:58:49 -04:00
Jeff Atwood
1d98d70834 update new version email with release notes too 2014-05-07 17:31:44 -07:00
Jeff Atwood
a40cf28423 update new version email copy 2014-05-07 16:36:35 -07:00
Sam
0334179c6e give logster its own redis connection 2014-05-08 06:52:59 +10:00
Régis Hanol
22d3bb1dd0 Merge pull request #2320 from shime/master 
fix inconsistency with bookmark icon label under post
 2014-05-07 21:48:04 +02:00
Neil Lalonde
11c0eb8db3 Update translations 2014-05-07 10:33:41 -04:00
Hrvoje Šimić
52066e6f00 fix inconsistency with bookmark icon label under post 
the bookmark icon under post should follow style from other
icons - downcased, no ending dot
 2014-05-07 13:06:49 +02:00
Sam
c25cd4e78d A new logster, that gets rid of a pile of 404s being logged as fatal errors. 2014-05-07 17:01:19 +10:00
Sam
19dec8c87c mini profiler too chatty 2014-05-07 08:33:07 +10:00
Sam
4af0aa9cbc logster integration (in production as well) 2014-05-07 08:24:15 +10:00
Sam
692f099807 Remove uneeded hack 2014-05-07 08:24:15 +10:00
Jeff Atwood
19867c147b minor copyedit 2014-05-06 14:47:18 -07:00
Robin Ward
9e719e49da Only show a few topic links in the gutter and allow the user to expand 
them.
 2014-05-06 14:11:17 -04:00
Jeff Atwood
3d2cb17719 who needs friends anyway? 2014-05-06 01:19:02 -07:00
Jeff Atwood
2cbebd85c6 clarify that global notice for urgent/emergency 2014-05-05 15:02:10 -07:00
Neil Lalonde
a15714899e Better forgot password message 2014-05-05 13:48:11 -04: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
b6dd0cfb7d FEATURE: add a link to PMs in the post shown to users when their message has been hidden 2014-05-02 22:54:03 +02:00
Jeff Atwood
80e9e74df9 drop the "in", Omit Needless Words 2014-05-02 13:52:01 -07:00
Jeff Atwood
ee08ace63a can't stop, won't stop, don't stop. ONW 2014-05-02 13:11:57 -07:00
Jeff Atwood
585997f97e I really need to stop editing this. 1 word less! 2014-05-02 12:28:29 -07:00
Neil Lalonde
cb2bcb89ff Update translations 2014-05-02 14:01:27 -04:00
Neil Lalonde
014bfc0512 Use 10k most common passwords instead of 5k 2014-05-02 12:01:21 -04:00
Neil Lalonde
df538f63d9 Add Hebrew 2014-05-01 11:00:53 -04:00
Jeff Atwood
a8b1cb66af omit needless words 2014-04-30 22:07:08 -07:00
Jeff Atwood
9f16bc9048 digest footer copyedit 2014-04-30 16:21:18 -07:00
Jeff Atwood
0fa7aec74a minor copyedits on faq and digest 2014-04-30 16:20:23 -07: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
Jeff Atwood
4b83a6f0a0 minor copyedits on flagging 2014-04-30 02:03:13 -07:00
Jeff Atwood
7006f47488 copyedit to explain reply rule 2014-04-30 01:22:31 -07:00
Jeff Atwood
f13e9e58e8 change "Log In" to "Sign In" 
because
http://www.designcult.org/2011/08/why-do-we-call-in-logging-in.html
 2014-04-30 01:10:32 -07:00
Jeff Atwood
dd1ebff956 more accurate description of newuser_max_replies 2014-04-29 13:19:07 -07:00
Jeff Atwood
4442ae1c8a apparently that's not markdown-ified 2014-04-29 12:56:16 -07:00
Robin Ward
f50039b48b Support 404 routes in the Ember App 2014-04-29 15:29:13 -04:00
Neil Lalonde
f61f29439e Track the ip address where user was registered 2014-04-29 14:37:56 -04:00
Régis Hanol
4371374ba6 FEATURE: support for enabling all upload file types 
BUGFIX: authorized extensions is now case insensitive
 2014-04-29 19:12:35 +02:00
Sam
0fc4c47927 Merge pull request #2295 from vikhyat/badge-system 
Titleable badges
 2014-04-29 11:26:51 +10:00
Vikhyat Korrapati
b4e037dfb2 Allow badges to be marked as "titleable". 2014-04-28 10:30:38 +05:30
Jeff Atwood
c6d9829092 It's these COLONS! HE HATES THESE COLONS! 
https://www.youtube.com/watch?v=Tcwz8-EfFYE
 2014-04-27 01:35:39 -07:00
Neil Lalonde
1156c57cf6 Update translations 2014-04-25 10:17:20 -04: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
Neil Lalonde
0f4014eef1 Update translations 2014-04-24 10:53:04 -04:00
Régis Hanol
d1b96d0e8b Merge pull request #2290 from vikhyat/badge-system 
Incrementally load users in the badge page
 2014-04-24 12:14:41 +02:00
Vikhyat Korrapati
0357370b0d Use the user-badge component in the admin user badges page. 2014-04-24 14:48:30 +05:30
Régis Hanol
3036490d05 Merge pull request #2260 from riking/download_blacklist 
Add site setting for domains to never download images from
 2014-04-24 11:13:03 +02:00
Jeff Atwood
3dedb0ce05 better S3 bucket name guidance 2014-04-24 00:13:15 -07:00
Jeff Atwood
d094fc91d7 minor digest copyedit 2014-04-23 23:14:26 -07:00
riking
b309deef11 Add site setting for domains to never download images from 2014-04-23 22:24:35 -07:00
Neil Lalonde
51cc39cad6 Add comments to the top of client.en.yml and server.en.yml about Transifex stuff 2014-04-23 16:47:20 -04:00
Jeff Atwood
387ac342ce slightly improve disk space limit reached message 2014-04-23 11:31:01 -07:00
Régis Hanol
de53385ed2 display the copy & paste images hint to FF users too 2014-04-23 18:49:54 +02: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
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
4aaedb82d0 FEATURE: alllow unicorn master to fork sidekiqs, keep alive coming 2014-04-23 11:03:36 +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
Robin Ward
4eb5474858 Add a SiteSetting to configure how many topics are in the email digest. 2014-04-21 17:49:10 -04:00
Jeff Atwood
fa4c21c28f better first boot register admin account help 2014-04-21 11:36:35 -07:00
Jeff Atwood
a24d910470 improve test email error message 2014-04-21 10:46:09 -07:00
Jeff Atwood
ef018db2e6 minor digest email copyedits 2014-04-21 10:36:33 -07:00
Jeff Atwood
a8157efdfe copyedits on editor entry errors 2014-04-21 10:15:13 -07:00
Robin Ward
b9ca124756 Support for /my/preferences to automatically redirect to the logged in 
user.
 2014-04-21 11:52:11 -04:00
Jeff Atwood
7e3dd43e9a missed a pin copy 2014-04-20 22:52:26 -07:00
Jeff Atwood
1ee039f786 fix pin message copy 2014-04-20 22:45:48 -07: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
Vikhyat Korrapati
27b62df48b Change "awarded" to "granted". 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
4eb7579d04 Notification copy. 2014-04-18 04:04:24 +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
Neil Lalonde
87e5e4b8d0 Use a real link to docker manager in new version email 2014-04-17 14:36:26 -04:00
Robin Ward
b3ed8b6a32 Use query params for sortable table headings 2014-04-17 10:52:57 -04:00
Sam
87f37b3ee9 Merge pull request #2271 from vikhyat/badge-system 
Badge system updates
 2014-04-17 16:22:41 +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
Neil Lalonde
abdfc2c7c1 Update translations 2014-04-16 10:42:21 -04:00
Vikhyat Korrapati
acfcf0b64e Add /badges route that lists all defined badges. 2014-04-16 18:42:06 +05:30
Jeff Atwood
aca35f805e missed some other languages on assets topic 2014-04-15 22:12:28 -07:00
Jeff Atwood
fad31b6d9e More helpful assets topic explanation 2014-04-15 22:07:19 -07:00
Jeff Atwood
8114588c06 minor copyedit on auto image downloading 2014-04-15 21:52:40 -07:00
Sam
b7caa33841 Site setting to allow mods to create categories 2014-04-15 16:42:45 +10:00
Sam
e5f41b8a21 FEATURE: whitelist and blacklist selectors for embeds 2014-04-15 14:07:30 +10:00
Régis Hanol
2505d18aa9 FEATURE: support email attachments 2014-04-14 22:55:57 +02: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
Neil Lalonde
31043275d3 Update translations from Transifex 2014-04-14 11:53:25 -04: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
20f324ec76 minor keyboard shortcut copyedit 2014-04-13 14:54:02 -07:00
Neil Lalonde
b7203c125e Merge pull request #2226 from CirnoKaster/patch-2 
client.zh_TW.yml: adding lines under filters.new
 2014-04-11 13:50:54 -04:00
Neil Lalonde
6b0cae8910 Update translations 2014-04-11 11:53:02 -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
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
Neil Lalonde
2e3ba1d5dc Update ru translations from Transifex 2014-04-10 15:45:58 -04: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
Jeff Atwood
bc56bc62a6 better auto-close example text 2014-04-10 12:25:02 -07:00
Jeff Atwood
605e60b016 copyedit on pins 2014-04-10 09:50:53 -07:00
Robin Ward
caa2564b83 Start up the Job scheduler after all the other initializers have loaded. 
We do this so that plugins can register scheduled jobs.
 2014-04-10 12:41:13 -04:00
Sam
97269fc918 FEATURE: education panel on pinning at bottom of topics 2014-04-10 15:53:58 +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
f8964bf453 Remove unused SiteSetting 2014-04-09 16:18:31 -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
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
riking
1540a3d5e5 Allow changing ownwership of posts by admins 2014-04-08 01:47:42 -07:00
Jeff Atwood
150081bf27 die, colon! DIEEEEEEeeeEEeee 2014-04-08 00:12:00 -07: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
Jeff Atwood
2e42b595f4 clean up "from the web" uploader copy a bit 2014-04-07 22:11:49 -07:00
Benedikt Lang
999c959dad Sync client.de.yml between transifex and github. 
Every string was checked for the most up-to-date version.
While merging both versions, transifex was used as reference for
newlines and deleted/missing translations.
 2014-04-07 17:46:39 +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
Robin Ward
c82313595d Minor text change 2014-04-05 15:10:46 -04:00
Neil Lalonde
30b23a2450 FIX: notify_about_flags_after description said it sends to moderators. It actually sends to contact_email. 2014-04-04 15:24:00 -04:00
CirnoKaster
6e8d4625c0 adding lines under filters.new 
adding filters.new.lower_title_with_count and lower_title
 2014-04-04 17:23:22 +08: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
Sam
d064dd241f BUGFIX: reload site settings on rails reload in dev 2014-04-03 10:39:30 +11: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
50fb048b99 Interface for expanding OP contents 2014-04-02 10:26:46 -04:00
Sam
bd7d1e62f6 BUGFIX: we need to precompile plugins.css ... otherwise there be dragons 2014-04-02 11:58:02 +11:00
Neil Lalonde
e86d3e5ce2 Revert "Change 5k passwords -> 10k passwords in locale files" 2014-04-01 15:39:31 -04: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
Régis Hanol
682b0c4883 typo 
thanks @Naatan
 2014-03-31 18:23:42 +02:00
Régis Hanol
7e33834afe FEATURE: create hyperlinked images from the image insertion dialog 2014-03-31 18:19:16 +02:00
Benjamin Kampmann
2815e98e6d Make autohighighting for all Code-Blocks a SiteSetting 2014-03-31 09:44:35 +02: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
57051e896d Change 5k passwords -> 10k passwords in locale files 2014-03-29 14:06:09 -07:00
Jeff Atwood
32e398d484 omit needless words 2014-03-28 13:58:40 -07:00
Jeff Atwood
239d73c897 improve version update email 2014-03-28 13:35:09 -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
Régis Hanol
622448fc9c Merge pull request #2184 from Onaldanm/translate-fr-updates 
French Translations Updates
 2014-03-28 15:07:02 +01:00
Régis Hanol
f311d88d7b Merge pull request #2195 from fantasticfears/locale 
update zh_CN locale
 2014-03-28 15:06:14 +01:00
Erick Guan
dda643a1bf update zh_cn translation 2014-03-28 17:09:42 +00:00
Sam
e23e92647e Merge pull request #2170 from Mikulas/czech-140324 
update czech localization
 2014-03-28 10:21:20 +11:00
slainer68
6fb323fd71 Delete enable_local_account_create option as it is not used anywhere. 
JS fixture
 2014-03-27 00:55:06 +01:00
Jorge Manrubia
bd1047a579 Restore locale entry I shouldn't have removed 2014-03-26 23:20:19 +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
Mikulas
c30a9365e4 add localization to group administration 2014-03-26 13:45:58 +01:00
Onaldanm
750745ba5f French Translations Updates 
Updates client and server
Fix wrong "active" in privacy.html
Use same same terms between faq/tos/privacy page.
 2014-03-26 11:24:58 +01:00
Mikulas
a9c20b0341 fix notification keys in czech localization 2014-03-25 15:38:43 +01:00
Mikulas
d7226d512f update czech localization 2014-03-25 15:38:39 +01:00
Régis Hanol
c10e44c0cf Merge pull request #2171 from Mikulas/patch-missing-localization 
add localization to post multiselect
 2014-03-25 14:35:36 +01:00
Jeff Atwood
a1b501c3fb was supposed to say "dismiss unread" 2014-03-25 00:45:27 -07:00
Sam
9cf23223eb BUGFIX: proxy_set_header is weird 
in particular no inheritance IF proxy_set_header is specified in child
 2014-03-25 17:06:15 +11:00
Sam
3830f41e5f BUGFIX: attachments bust under multisite 2014-03-25 10:37:31 +11:00
Sam
14f7551f2b Fix visual bug 2014-03-25 09:45:21 +11:00
Régis Hanol
0def4747da FEATURE: send the backup/restore logs when operation fails 2014-03-24 19:34:16 +01:00
Mikulas
fffe3dee6e add localization to multiselect popup 2014-03-24 18:23:29 +01:00
Jeff Atwood
6715786630 minor login install hint copyedit 2014-03-24 00:33:02 -07:00
Jeff Atwood
bb8dbde0ad meta "See this guide to learn more" links 2014-03-24 00:30:22 -07:00
Sam
039e65c3eb improve copy 2014-03-24 18:11:12 +11:00
Sam
7e7c4efcc0 FEATURE: on initial boot hint users on how to get admin 2014-03-24 18:03:39 +11:00
Sam
c27c87911e FEATURE: refactor notice code, add optional global notice. 
Set the global_notice site setting to notify users of a critical event.
 2014-03-24 16:51:48 +11:00
Sam
a974dddec2 Merge pull request #2076 from riking/clean-site-settings 
Clean up site_settings.yml
 2014-03-24 09:56:45 +11:00
Jeff Atwood
ad71490deb omit needless words 2014-03-23 00:13:29 -07:00
Erick Guan
c7ffd111dc Update client.zh_CN.yml 
I have to say it's not a pleasure experience to update locale file. It seems Transifex doesn't sync  properly.
 2014-03-22 20:42:54 +08:00
Jeff Atwood
cd28b3a21b clarify this is an incoming-only email 2014-03-21 23:43:46 -07:00
Jeff Atwood
2a6849b387 add additional reply via email help text example 2014-03-21 23:41:33 -07:00
riking
7237eb5e00 Shuffle around the order of site settings 
The goal of this is twofold:
 - Make the more commonly changed settings higher
 - Find groups for more uncategorized settings

Additionally, the SEO category was deleted, its contents folded into Security and Spam.
 2014-03-21 19:03:29 -07:00
riking
f75a7f8832 Clean up site_settings.yml 
- Hide several variables that the client does not use
 - Use concise default syntax when possible
 2014-03-21 18:01:39 -07:00
Jeff Atwood
84a7d75828 clarity: change flag "Notify" to "Private message" 2014-03-21 13:02:27 -07:00
Jeff Atwood
256186c836 Merge pull request #2162 from archon432/master 
'Topics' are capitalized
 2014-03-21 12:15:41 -07:00
Neil Lalonde
e7ae0bba5f Update pt_BR translations from Transifex. Thanks, translators 2014-03-21 14:00:46 -04:00
Sam
28ffb3025c Merge pull request #2150 from vikhyat/badge-system 
Interface for granting/revoking badges from admin user page
 2014-03-21 17:56:08 +11:00
Jeff Atwood
c37b08908d Omitted is too fancypants. Say "hidden" instead 2014-03-20 23:25:20 -07:00
Vikhyat Korrapati
dcaa069bb5 Log badge grant/revoke to the staff actions log. 2014-03-21 11:10:07 +05:30
Vikhyat Korrapati
0f9ea25010 Interface for granting/revoking badges from admin user page. 2014-03-21 11:09:19 +05:30
Sam
31ce05b5ae Merge pull request #2157 from Aselox/master 
Updated Italian Translation + added Italian poll locales
 2014-03-21 16:19:13 +11:00
Robin Ward
b0a130db86 Precompile break_string 2014-03-20 14:50:34 -04:00
Archon
02965515e9 Update client.id.yml 2014-03-19 21:02:15 +01:00
Archon
57945c30f6 Update client.en.yml 2014-03-19 21:01:22 +01:00
Robin Ward
d3f1eb395d Updated import for TypePad 2014-03-19 15:02:49 -04:00
Aselox
62d0ae4a30 Update server.it.yml 2014-03-19 16:51:46 +01:00
Aselox
e34b18fcc8 Update client.it.yml 2014-03-19 16:49:53 +01:00
Sam
b7f2a3e512 VIM helper 2014-03-19 12:08:00 +11:00
Robin Ward
84e608079b Ability to customize the logo in digest emails 2014-03-18 15:56:17 -04:00
Robin Ward
d0edfe2179 Better error messages if the "Send Test Email" button fails. 2014-03-18 15:26:36 -04:00
Robin Ward
3cf0adaed0 Merge pull request #2139 from riking/s3-backup-warning 
Add s3_backup_config_warning
 2014-03-18 14:41:42 -04:00
Régis Hanol
a627a062de Merge pull request #2135 from Onaldanm/poll-badge-fr 
Translation: Badges, poll and french updates
 2014-03-18 17:41:06 +01:00
Sander Datema
580a55ec03 Dutch translation updated 2014-03-18 11:47:50 +01:00
Sander Datema
5c0b6eaac1 Dutch translation updated 2014-03-18 11:46:47 +01:00
Sam
76c7d42027 require rbtrace in development cause it is handy 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
riking
ffd4f367e3 Add s3_backup_config_warning 
Note that only one of the two warnings can be shown, because they are checked in the same method.
 2014-03-17 12:56:59 -07:00
Jeff Atwood
2cff3c20f7 clarify invite copy 2014-03-17 12:07:21 -07:00
Onaldanm
134af37cbd Badges, poll and french Translation 
New Badges system
New string in the poll plugin + change the term "poll option"
Re-add some empty strings (like notifications.title)
And updates
 2014-03-17 11:21:47 +01:00
Régis Hanol
2d49374357 Merge pull request #2130 from nbalonso/spanish-translation 
updated spanish translation
 2014-03-17 09:31:17 +01:00
Aselox
9a8dff1d32 Update server.it.yml 2014-03-17 00:26:45 +01:00
Aselox
3f4ad3a29d Update client.it.yml 2014-03-17 00:25:29 +01:00
Sam
fe63db7953 Merge pull request #2115 from vikhyat/badge-system 
Initial badge system implementation
 2014-03-17 10:06:37 +11:00
Noel B. A
6e667476a0 updated spanish translation 2014-03-15 21:47:55 +03:00
Jeff Atwood
2d0dba0869 omit needless words 2014-03-15 00:32:00 -07:00
Jeff Atwood
dcbf412957 improve invite friends email cues 2014-03-14 17:35:28 -07:00
Jeff Atwood
2967b1e06c put top before categories 2014-03-14 16:03:07 -07:00
Jeff Atwood
3f858801a3 omit needless words from welcome email header 2014-03-14 13:31:19 -07:00