Commit Graph

1962 Commits

Author SHA1 Message Date
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
Jeff Atwood 93bced5a5e remove login-specific info 2014-03-14 10:21:33 -07:00
Vikhyat Korrapati 9b26c8584e Initial badge system implementation. 2014-03-14 21:49:26 +05:30
Onaldanm 761dccbe73 French Translation
Big update translation from Transifex

Changelog:
- topic = sujet
- Uniformisation des termes
2014-03-14 16:12:11 +01:00
Jeff Atwood a07062644c improve new version emails 2014-03-13 16:22:31 -07:00
Régis Hanol 50cc7dedb0 Merge pull request #2098 from nbalonso/spanish-translation
updated spanish translation
2014-03-13 11:00:04 +01:00
Régis Hanol 582a30ed4a Merge pull request #2113 from blang/feat_locale_de
German translation updated (client)
2014-03-13 10:59:31 +01:00
Jeff Atwood aea608c81c simplify version number display a bit 2014-03-12 17:13:39 -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
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
Benedikt Lang b7315cfc05 German translation updated (client) 2014-03-12 14:18:13 +01:00
riking c29c15a7a3 Switch from MMM D to D MMM to separate from year
Additionally, in German, the format is 'D. MMM'.
2014-03-11 03:28:13 -07:00
Régis Hanol b42a19184e FEATURE: top is now by default in the top menu 2014-03-10 21:21:16 +01:00
Robin Ward 9929560c40 FIX: Suggested Topics had a hardcoded 5 and was ignoring the
SiteSetting
2014-03-10 15:36:45 -04:00
Noel B. A 2d9aae80be updated spanish translation 2014-03-10 17:55:47 +03:00
Jeff Atwood ef854d459b few more quick new user tips tweaks 2014-03-10 00:52:36 -07:00
Jeff Atwood 9abc2217ee improve quick tips PM all new user copy 2014-03-10 00:43:30 -07:00
Sam e68e106be7 UI: we only intended to add the word "new" for new topics 2014-03-10 13:40:49 +11:00
Sam 57626a3930 Merge pull request #2064 from staryume/patch-5
Update client.zh_TW.yml
2014-03-10 10:30:48 +11:00
Sam 766c8f8f64 Merge pull request #2075 from riking/second-person
Standardize on second person on preferences page
2014-03-10 10:29:23 +11:00
Mikulas 3fb4e36766 update czech localization
Contributors: marmat, OukiDouki, Mirek2, zoul, MikulasDite
2014-03-08 23:53:36 +01:00
riking 3f7f272550 Standardize on second person on preferences page 2014-03-07 15:26:33 -08:00
Robin Ward 055b367e2b Add link counts to `alt` tags of their badges. 2014-03-07 14:43:29 -05:00
Régis Hanol be8128b0c2 force refresh when the 'top_menu' setting changes 2014-03-07 19:07:53 +01: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
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
riking d0dbc26281 Change BACKUP_ROUTE_FORMAT to support pretty-name backups 2014-03-06 20:59:10 -08:00
riking ccd3e635d2 Refresh the site after updating certain site settings 2014-03-06 20:24:23 -08:00
staryume 21d561bc3a Update client.zh_TW.yml
Minor fixes for the chinese translations
2014-03-06 20:17:57 +09:00
CirnoKaster 334ae44fb7 fix translate mistake
Line 626
minor change : favourite > starred
2014-03-06 15:02:55 +08:00
Régis Hanol ca12ea42a7 FEATURE: only redirect new users to top page for a limited period
That period is defined by the `redirect_new_users_to_top_page_duration`
site setting and defaults to 7 days.
2014-03-05 22:11:01 +01:00
Robin Ward b0f3061113 It doesn't make sense to redirect when not logged in on a non-GET
request. We should report a failure then. They likely logged out or
in another tab or timed out.
2014-03-05 12:12:53 -05: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 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
Sam b4688fc4c5 Merge pull request #2046 from staryume/patch-4
Update client.zh_TW.yml for better Tradtional Chinese translations
2014-03-05 11:30:56 +11:00
Sam 4289c909b8 Merge pull request #2047 from jpsullivan/patch-2
Typo fix
2014-03-05 11:23:16 +11:00
Sam 3be310a0cb Merge pull request #2049 from nbalonso/spanish-translation
updated spanish translation
2014-03-05 11:22:16 +11:00
Jeff Atwood d5ec409434 add Transifex link to header of translation files 2014-03-04 14:35:23 -08: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
Jeff Atwood 744eecfe9f add keyboard shortcuts to progress bar tooltips 2014-03-04 00:31:40 -08:00
Jeff Atwood 2b343a9d94 minor improvements to welcome message 2014-03-04 00:29:48 -08:00
Jeff Atwood d976623303 clarify use_https setting 2014-03-03 23:50:10 -08:00
Jeff Atwood 8010ed3ba1 we don't use the term "nickname" use -> "username" 2014-03-03 23:30:43 -08:00
Robin Ward 28f84ef0e1 TEXT: Change to "Dismiss New" 2014-03-03 17:15:53 -05:00
Noel B. A 2fd49934e8 updated spanish translation
still there are a ton of things to do
2014-03-04 00:24:08 +03:00
Robin Ward f9cd354a2c FEATURE: Button to reset new 2014-03-03 15:47:01 -05:00
Josh Sullivan cf9b2f7c3b Typo fix
Just another simple typo fix
2014-03-03 11:19:17 -05:00
staryume 19b1d5890e Update client.zh_TW.yml
Change for better Traditional Chinese terms 

Admin > 管理員
Moderator > 版主
Posts > 帖子 (sometimes 發表 as a verb )
Topics > 討論話題 (主題 makes user confused with "Themes" ) 
Catogeries > 分類
Mute > 消音 (阻決 is weird )
2014-03-03 15:23:52 +09: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
Sam fb10cfdc1e Merge pull request #2025 from KiiPlatform/updated_japanese_locals
Updated Japanese locales
2014-03-03 10:49:04 +11:00
Sam 7004b3f3b9 Merge pull request #2037 from infogulch/abandon-button-text
Explicit button text in abandon dialog in all lang
2014-03-03 10:37:32 +11:00
staryume ae344e6cd8 Update client.zh_TW.yml
Major update of client.zh_TW.yml (eg. favourite > starred)
2014-03-03 01:38:19 +09:00
staryume 700ccf2ca9 Update client.zh_TW.yml
Major update for filling a lot of new Traditional Chinese translations and fixes eg. favorite > starred
2014-03-03 01:20:06 +09:00