github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-01 05:23:43 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
2,547 Commits 214 Branches 500 Tags 960 MiB
286e6f49bf
Commit Graph

618 Commits

Author SHA1 Message Date
Neil Lalonde
c790d653c9 Merge pull request #811 from emberjs-cn/update-zh-locales 
Updated the zh locales
 2013-05-03 07:43:47 -07:00
Tower He
fec26c1d29 Updated the zh locales 2013-05-03 20:21:50 +08:00
Sam
dcfa9db84b Merge pull request #805 from kubabrecka/cs_update41 
cs translation update
 2013-05-03 03:39:31 -07:00
Sam
92cf36b42d Merge pull request #808 from 9034725985/patch-1 
In client.en.yml, add a comma after a leading sorry
 2013-05-03 03:38:53 -07:00
Kushal
2648039a99 In client.en.yml, add a comma after a leading sorry 
Add a comma after the leading sorry to keep things consistent.
 2013-05-02 20:10:00 -05:00
Régis Hanol
3a0e41ab90 keep French l10n up to date 
🇫🇷
 2013-05-03 00:04:04 +02:00
Kuba Brecka
9dceef3fa6 cs translation update 2013-05-02 12:27:43 +02:00
Sam
cb9a89940a display admin/mod status on user page 2013-05-02 17:40:44 +10:00
Sam
e59ab32210 Merge pull request #800 from goodbrews/imgur-api-v3 
Update to Imgur API v3
 2013-05-01 21:52:00 -07:00
David Celis
6be26f5316 Update to Imgur API v3 
Version 2 of Imgur's API is deprecated. Their documentation for v2 is no
longer online, and applications can only be registered under version 3.
Version 3 of their API has a slightly different endpoint but, more
importantly, uses a Client ID/Secret pair instead of an API Key.

This PR updates Discourse to use the new version of Imgur's API.

Signed-off-by: David Celis <me@davidcel.is>
 2013-05-01 21:39:10 -07:00
Sam
3bf3b130cc Merge pull request #798 from kubabrecka/cs_update40 
cs translation update
 2013-05-01 16:35:04 -07:00
Sam
43c767fb0d Merge pull request #802 from ZogStriP/keep-french-l10n-up-to-date 
keep French l10n up to date
 2013-05-01 16:22:40 -07:00
Neil Lalonde
38ed86d0c5 Add reports for IncomingLinks on admin dashboard 2013-05-01 18:12:02 -04:00
Régis Hanol
2c1b75fc36 keep French l10n up to date 
🇫🇷
 2013-05-02 00:07:23 +02:00
Neil Lalonde
5f4dbd6ddc Use tos_url site setting in flag modal if it's set 2013-05-01 11:49:18 -04:00
Kuba Brecka
ed68a1ec81 cs translation update 2013-05-01 15:41:31 +02:00
Jeff Atwood
67372a8a0d simplify pinning message a bit 2013-04-30 22:52:35 -07:00
Sam
08ce46e7ed :s/POST/REPLY/g 2013-05-01 10:52:31 +10:00
Jeff Atwood
180c021940 normalize on "private message" vs "conversation" 2013-04-30 13:54:14 -07:00
Jeff Atwood
6d19db23bb too many pleases 2013-04-30 13:29:03 -07:00
Jeff Atwood
50349e84fe incorrect copy on Markdown linebreak setting 2013-04-29 15:12:12 -07:00
Neil Lalonde
442be64d5e Show an excerpt of a pinned topic's body in the topic list 2013-04-29 16:37:19 -04:00
Sander Datema
76e447ff8d Updates to Dutch translation 
Updated til commit 9e3b70c20e
 2013-04-28 15:42:21 +02:00
Régis Hanol
dca2fbcefc add meaningful error message on upload [fixes #773] 2013-04-27 20:26:17 +02:00
Neil Lalonde
bbf982984d Add TOS and Privacy Policy site settings that can link to external sites. 2013-04-26 18:46:36 -04:00
Sam
f0d3500ada Merge pull request #735 from kubabrecka/i18n_user_actions4 
move i18n of UserActions to JS-side and make sentences translatable (take 3)
 2013-04-25 15:53:17 -07:00
Sam
f8c6a47892 Merge pull request #770 from ZogStriP/keep-french-l10n-up-to-date 
keep French l10n up to date
 2013-04-25 15:52:41 -07:00
Jeff Atwood
4dbe25bfc2 very minor new user education copy tweaks 2013-04-25 15:42:03 -07:00
Neil Lalonde
159c9b10d5 Add a nag to admin dashboard if you haven't changed the title site setting from the default 'Discourse' 2013-04-25 17:53:31 -04:00
Régis Hanol
14a99eca12 keep French l10n up to date 2013-04-25 22:29:51 +02:00
Neil Lalonde
a62fbb1b95 Merge pull request #761 from kubabrecka/cs_update39 
cs translation update
 2013-04-24 12:03:55 -07:00
Neil Lalonde
db2de1eff0 Add contact_email to site settings 2013-04-24 11:15:47 -04:00
Kuba Brecka
9651bec37c cs translation update 2013-04-24 12:59:05 +02:00
Régis Hanol
4d6f6a8322 keep French l10n up to date 2013-04-24 02:09:36 +02:00
Neil Lalonde
72508d459b Use heat map on views column in topic lists 2013-04-23 15:06:13 -04:00
Neil Lalonde
06e5083950 Dashboard links to list of admins and moderators; Move a bunch of ember routes into one file: admin_users_list_routes.js 2013-04-23 12:07:58 -04:00
Neil Lalonde
fe1b979c65 Admin Dashboard: click numbers in Users per Trust Level table to see a list of the users 2013-04-23 10:41:40 -04:00
Jeff Atwood
1c41d46fa3 improve new user welcome message a bit 2013-04-22 16:42:39 -07:00
Neil Lalonde
7257d65082 Add warning to dashboard if using default logo or favicon 2013-04-22 15:38:48 -04:00
Neil Lalonde
439877bdb9 Show a warning if there are email jobs in the retry queue 2013-04-22 13:37:16 -04:00
Neil Lalonde
ae487e740c Add a dashboard warning when sidekiq queue has more than 100 jobs 2013-04-22 13:02:24 -04:00
Sam
cfc62dadff speed up tests 
add the ability to find the first notify private message
 2013-04-22 17:45:03 +10:00
Sander Datema
c04013c89b Updates to Dutch translation 2013-04-21 10:59:38 +02:00
Jeff Atwood
e661871aea Merge pull request #744 from ypxu/localized-help 
update locales on client for zh_CN and zh_TW
 2013-04-20 22:18:53 -07:00
Jeff Atwood
14432e5a1a Merge pull request #745 from kubabrecka/cs_update38 
cs translation update
 2013-04-20 22:18:18 -07:00
Régis Hanol
3743287f12 keep French l10n up to date 2013-04-20 23:14:02 +02:00
Kuba Brecka
ff18d287ab cs translation update 2013-04-20 18:28:17 +02:00
Yingpeng Xu
b2b9320706 update locales on client for zh_CN and zh_TW 2013-04-20 08:39:55 -07:00
Jeff Atwood
1d341b8ca5 drop "Admin" from "Admin Dashboard" 2013-04-19 22:37:02 -07:00
Jeff Atwood
024791a80e simplify admin user view a tad 2013-04-19 22:34:11 -07:00
Jeff Atwood
8c8784abb6 simplify user profile layout, bold labels 2013-04-19 15:06:35 -07:00
Jeff Atwood
d44b73c17a I said constructive criticism, YOU DOUBLE HITLERS 2013-04-19 12:24:22 -07:00
Jeff Atwood
0739e13cb0 copyedits on new user JIT education panel 2013-04-19 12:21:51 -07:00
Jeff Atwood
d3bde70677 better flag post action description 2013-04-19 11:15:56 -07:00
Sam
6ae212235c move persona a bit, still should be yanked out further 2013-04-19 10:34:39 +10:00
Sam
4cea92c4e9 work in progress add support for groups 2013-04-19 10:34:39 +10:00
Sam
a6170db443 change text to notify when you are notifying in the flag dialog 2013-04-19 10:34:06 +10:00
Kuba Brecka
002951fc31 cs translation update 2013-04-18 23:06:03 +02:00
Neil Lalonde
5cd6c85e8b Add bookmarks and favorites to dashboard stats 2013-04-18 14:27:22 -04:00
Neil Lalonde
5e643b5d49 Merge pull request #733 from sanderdatema/dutch_translation 
Updated Dutch translation
 2013-04-18 09:30:04 -07:00
Neil Lalonde
c07942763a Merge pull request #734 from kubabrecka/extract_title1 
extracting one more hardcoded title
 2013-04-18 09:29:30 -07:00
Neil Lalonde
4cec82f416 Merge pull request #731 from kubabrecka/extract_titles 
extracting some hardcoded title="..." strings
 2013-04-18 09:29:03 -07:00
Neil Lalonde
16efcbb4f0 Merge pull request #730 from kubabrecka/cs_update35 
cs translation update server side
 2013-04-18 09:25:10 -07:00
Neil Lalonde
fa6a2a110f Merge pull request #729 from kubabrecka/cs_update34 
cs translation update client side
 2013-04-18 09:24:55 -07:00
Kuba Brecka
d355e42d73 move i18n of UserActions to JS-side and make sentences translatable (take 3) 2013-04-18 12:08:13 +02:00
Kuba Brecka
38ea6cff62 extracting one more hardcoded title 2013-04-18 11:24:47 +02:00
Sander Datema
935c478484 Updated Dutch translation 
Both server and client side, except for TOS.
 2013-04-18 10:58:20 +02:00
Kuba Brecka
2901b5bbef extracting some hardcoded title="..." strings 2013-04-18 10:42:29 +02:00
Kuba Brecka
b8bbf7d3fa cs translation update 2013-04-18 10:13:00 +02:00
Kuba Brecka
bc4144c82b cs translation update 2013-04-18 10:03:10 +02:00
Yingpeng Xu
c48aa487e3 localize composer toggler help text for zh_CN and zh_TW 2013-04-18 02:44:59 -04:00
Jeff Atwood
474080a414 localize composer toggler help text 2013-04-17 23:14:58 -07:00
Jeff Atwood
107e774de8 simplify composer body placeholder text 2013-04-17 23:10:34 -07:00
Jeff Atwood
b64a4100fa change "visitor" trust level to "new user" 
I blame me for this mistake.. visitor means other stuff in practice. New
User is correct meaning.
 2013-04-17 16:11:24 -07:00
Jeff Atwood
3325c476f8 improve flag description to reflect notifications 2013-04-17 15:50:21 -07:00
Sam
b81da5ee66 Merge pull request #722 from ZogStriP/keep-french-l10n-up-to-date 
keep French l10n up to date
 2013-04-17 01:10:28 -07:00
Régis Hanol
7c1eb16aec keep French l10n up to date 2013-04-17 02:29:37 +02:00
Jeff Atwood
e671cf906c make one text for latest changes widget + taller 2013-04-16 16:35:28 -07:00
Neil Lalonde
9a7019e44f Add some icons to admin dashboard 2013-04-16 18:38:14 -04:00
Jeff Atwood
72be25c30a improve invite users action button 2013-04-16 14:53:06 -07:00
Jeff Atwood
77461cf1f7 improve category edit button copy 2013-04-16 14:25:36 -07:00
Neil Lalonde
3b6aeb14c7 Add subtype to topics to classify private messages 2013-04-16 16:56:18 -04:00
Neil Lalonde
2b5a2b5fce Add a refresh button to problems on dashboard, so you can check for problems again 2013-04-16 12:09:37 -04:00
Jeff Atwood
8e9b34d6cd remove "sent you a PM' text from the notify area 2013-04-15 17:38:39 -07:00
Jeff Atwood
bb586ec1a9 indicate use_ssl not implemented, experimental 2013-04-15 13:56:16 -07:00
Jeff Atwood
fb010727d1 user != person 2013-04-15 01:20:30 -07:00
Jeff Atwood
420bd37268 copyedits on notify flag options 2013-04-15 01:09:38 -07:00
Sander Datema
481a224ff9 Small edits to Dutch translation (client side) to make it sound more natural 2013-04-14 22:23:30 +02:00
Sander Datema
7965dadf7a Updated Dutch translation (client side) to latest Discourse version 2013-04-14 21:28:41 +02:00
Sander Datema
35971506fd Updated Dutch translation (client side) to latest Discourse version 2013-04-14 20:48:16 +02:00
Sander Datema
2af902f4d1 Merge branch 'master' of https://github.com/discourse/discourse into dutch_translation 2013-04-14 20:46:00 +02:00
Sander Datema
f47f880f8b Updated Dutch translation (client side) to latest Discourse version 2013-04-14 20:44:59 +02:00
Jeff Atwood
a1d7f24240 improve "override default" text in customize 2013-04-14 11:22:25 -07:00
Jeff Atwood
c4a0cf6517 Merge pull request #707 from tangramor/master 
Update the zh_CN and zh_TW translations to the latest en.yml
 2013-04-13 09:35:02 -07:00
tangramor
344a744f3a Updated zh_CN & zh_TW translations to the latest en.yml 2013-04-13 10:51:54 +08:00
Régis Hanol
efa9117f21 keep French l10n up to date 2013-04-13 02:16:02 +02:00
Sam
13adbf6f72 Merge pull request #702 from ZogStriP/keep-french-l10n-up-to-date-2013-04-11 
keep French l10n up to date
 2013-04-12 16:06:18 -07:00
Neil Lalonde
48d5cb02c2 Add email as a sharing option 2013-04-12 18:06:36 -04:00
Neil Lalonde
651cfba93f Add ability to destroy a user with 0 posts 2013-04-12 16:53:00 -04:00
Sam
e969eb14e8 added 2 new flag types: notify user and notify moderators 
fixed up messed up user navigation
refactored
 2013-04-12 17:55:45 +10:00
Régis Hanol
ed790384b0 keep French l10n up to date 2013-04-12 00:07:14 +02:00
Neil Lalonde
04ca4077a7 Merge pull request #697 from kubabrecka/quote_post_fix 
fix title of "quote post" button
 2013-04-11 10:59:42 -07:00
Neil Lalonde
7b76447e5e Change edit category modal submit button text to Save Category 2013-04-11 10:50:25 -04:00
Sam
5f30ea7463 Merge pull request #684 from ZogStriP/auto-replace-rules-in-titles 
auto replace rules in titles
 2013-04-10 21:12:20 -07:00
Kuba Brecka
11886e3e33 fix title of "quote post" button 2013-04-10 20:32:28 +02:00
Neil Lalonde
312c42ae98 Merge pull request #690 from kubabrecka/update_cs32 
cs translation update
 2013-04-10 11:02:26 -07:00
Neil Lalonde
fec86c624b Merge pull request #693 from ZogStriP/keep-french-l10n-up-to-date-2013-04-10 
keep French l10n up to date
 2013-04-10 09:47:02 -07:00
Neil Lalonde
5d46478e38 Add UI to delete an empty category 2013-04-10 12:08:23 -04:00
Régis Hanol
a7bdbd863e keep French l10n up to date 2013-04-10 15:48:59 +02:00
Kuba Brecka
1ca1b03109 cs translation update 2013-04-10 15:02:32 +02:00
Régis Hanol
c5cf8be864 auto replace rules in titles 2013-04-10 11:00:50 +02:00
Sam
e605e52181 localization 2013-04-10 15:55:33 +10:00
Jeff Atwood
249fa42fd2 better description for title_fancy_entities 2013-04-09 21:15:48 -07:00
Robin Ward
1ce7a40084 Revert "Merge pull request #677 from kubabrecka/localization_user_actions2" 
This reverts commit c3a426930b, reversing
changes made to 9f9072bd9d.
 2013-04-09 12:33:32 -04:00
Robin Ward
c3a426930b Merge pull request #677 from kubabrecka/localization_user_actions2 
move i18n of UserActions to JS-side and make sentences translatable
 2013-04-09 09:25:28 -07:00
Robin Ward
9f9072bd9d Merge pull request #673 from windyson2008/patch-2 
Update server.zh_CN.yml
 2013-04-09 09:22:59 -07:00
Robin Ward
bc75663e7b Merge pull request #680 from kubabrecka/cs_update31 
cs translation update
 2013-04-09 06:29:19 -07:00
Régis Hanol
a2967dbf6b keep French l10n up to date 2013-04-09 14:51:40 +02:00
Kuba Brecka
9e796e8acf cs translation update 2013-04-09 11:10:28 +02:00
Neil Lalonde
93f36cdf93 Show which category colors have already been used when creating/editing a category 2013-04-08 18:33:51 -04:00
Sam
1b73ab614e Merge pull request #674 from kubabrecka/cs_update30 
cs translation update
 2013-04-08 15:17:01 -07:00
Sam
2f14ef4a68 Merge pull request #675 from kubabrecka/en_tos_typofix 
English TOS typos
 2013-04-08 15:16:02 -07:00
Kuba Brecka
8d927418e8 move i18n of UserActions to JS-side and make sentences translatable 2013-04-08 22:54:08 +02:00
Robin Ward
75aeb9550f Convert a bunch of callbacks to promises 2013-04-08 16:51:03 -04:00
Kuba Brecka
b42570b61d English TOS typos 2013-04-08 22:31:44 +02:00
Kuba Brecka
9ee01948c3 cs translation update 2013-04-08 22:28:10 +02:00
Jonas Stendahl
21d3c96fca Updated swedish translations. 2013-04-08 11:03:55 +02:00
windyson2008
12a20f6547 Update server.zh_CN.yml 
1.Add tag
2.Fix transtration
 2013-04-08 11:22:51 +09:00
Régis Hanol
41b7f741d0 extract hard-coded strings 2013-04-07 18:14:50 +02:00
Robin Ward
ade4dd32de Merge pull request #665 from ZogStriP/keep-french-l10n-up-to-date-2013-04-05 
keep French l10n up to date
 2013-04-06 07:30:15 -07:00
Jeff Atwood
0d26c819a0 better post quote description 
blockquote? seriously?
 2013-04-06 03:13:24 -07:00
Jeff Atwood
b75454219f improve the category definition default copy 2013-04-06 00:52:21 -07:00
Régis Hanol
1793f3e3bb keep French l10n up to date 2013-04-05 23:17:57 +02:00
Robin Ward
72b4f41254 Can change TOS content via site content editor 2013-04-05 15:21:55 -04:00
Robin Ward
c41bdc8752 Merge pull request #662 from kubabrecka/en_typos 
fix some typos in English strings
 2013-04-05 08:20:52 -07:00
Kuba Brecka
6dff266930 cs translation update 2013-04-05 11:31:43 +02:00
Kuba Brecka
920e1dfd24 fix some typos in English strings 2013-04-05 11:31:06 +02:00
Kuba Brecka
5f4b66d1bd replace CRLF with LF 2013-04-05 11:05:03 +02:00
Jeff Atwood
efa99eb242 copyedits on Site Content editor help 2013-04-04 22:47:32 -07:00
Jeff Atwood
e7499adacc clarify language on enable_private_messages 2013-04-04 22:24:58 -07:00
Jeff Atwood
e3b6fc3ec0 trust ranges are 0-4, not 0-5 (moderators diff) 2013-04-04 22:19:13 -07:00
Sam
fe434710e1 Merge pull request #647 from windyson2008/patch-1 
Update client.zh_CN.yml
 2013-04-04 21:40:41 -07:00
Sam
162af29aae Merge pull request #653 from kubabrecka/cs_typos 
fix some typos in cs translation
 2013-04-04 21:36:31 -07:00
Sam
4fbf017272 get regular trust level going, self heal inconsistent topic timings 2013-04-05 15:30:28 +11:00
Robin Ward
fa1ba6791b Work in Progress: Content Editing in Admin Section 2013-04-04 17:26:22 -04:00
Neil Lalonde
66bc48a0e3 Give magic wands to all moderators 2013-04-04 16:14:55 -04:00
Kuba Brecka
53bcf99f57 fix some typos in cs translation 2013-04-04 16:57:54 +02:00
Jeff Atwood
cb9370b00c clarify that read tab is in order that you read 2013-04-04 02:06:31 -07:00
windyson2008
d8b6ecef74 Update client.zh_CN.yml 
1,Add tag
2,Fix translation
 2013-04-04 13:20:45 +09:00
Sam
86cf7b1524 trust level 0 is highlighted in light gray as opposed to having special semantics around account age. 2013-04-04 12:24:23 +11:00