IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-29 20:24:05 -06:00
Code Issues Packages Projects Releases Wiki Activity
8,215 Commits 220 Branches 500 Tags 902 MiB
fad868c78f
Commit Graph

2097 Commits

Author SHA1 Message Date
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
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