Commit Graph

1250 Commits

Author SHA1 Message Date
Sam
cd3f2a5973 Merge pull request #1401 from netzpirat/update-german-translations
Update german translations
2013-08-30 00:09:16 -07:00
Sam
b730b27c4f some soample counter methods 2013-08-30 16:44:34 +10:00
Neil Lalonde
82bc6b677f Add link in hamburger menu to switch between mobile and desktop views 2013-08-29 15:19:28 -04:00
Michael Kessler
53cc1a4730 Update German server-side translations. 2013-08-29 18:10:20 +02:00
Michael Kessler
f74e68eece Update German client-side translations. 2013-08-29 16:24:27 +02:00
Sam
b41fa4988a update rails 4
ensure you clear the tmp/cache folder on each bench (so results are correct, there is an incompat upgrade)
add facter gem which will be used to collect hardware data from the bencher
2013-08-29 21:23:00 +10:00
Sam
aaf41d227f fix secret_token init to always allow an override even if its too short 2013-08-29 15:27:59 +10:00
Jeff Atwood
eec77e7bea "moved" makes more sense in the notify 2013-08-28 16:31:57 -07:00
Sam
61281a3c81 invite only forums had very wonky logic, invited users were not being activated, invite_only forums were still registering users 2013-08-28 17:18:31 +10:00
Robin Ward
0f6c2060b8 Merge pull request #1388 from ofgeek/patch-2
Update client.zh_CN.yml
2013-08-27 06:56:20 -07:00
ofGEEK
79ddb162b6 Update client.zh_CN.yml 2013-08-27 15:33:26 +08:00
ofGEEK
85a948d5b4 Update client.zh_CN.yml 2013-08-27 15:21:20 +08:00
Sam
89ce39c902 Merge pull request #1386 from Andersos/patch-1
added quotes
2013-08-26 18:45:06 -07:00
Neil Lalonde
3708d47c87 Check daily if there are new users who need to be approved and send a pm to moderators 2013-08-26 16:16:27 -04:00
Anders Sandvik
7dc71a616b added quotes 2013-08-26 22:00:55 +02:00
Sam
818bf1355d PluginStore for plugin specific bits of storage
Amended plugin interfaces so they work with the vk sample
2013-08-26 12:59:17 +10:00
Sam
213ce33af2 Fixed all broken specs
Moved middleware config into authenticators
2013-08-26 12:59:17 +10:00
Sam
912d4b853b slowly going about ordering our middleware 2013-08-26 12:59:17 +10:00
Sam
075002a6d5 refactoring the plugin interfaces to allow for better extensible 2013-08-26 12:59:17 +10:00
Régis Hanol
32f717420d add max_image_height site setting 2013-08-26 00:24:24 +02:00
Robin Ward
b32e87c929 Merge pull request #1377 from ZogStriP/avatar-work
Improved specs for avatar + added a warning whenever the uploaded image is not a square
2013-08-25 07:30:34 -07:00
Robin Ward
89421088e5 Merge pull request #1379 from abbat/master
Russian translation (actual version)
2013-08-25 07:28:38 -07:00
Robin Ward
9e32baa357 Merge pull request #1375 from versvs/master
Added strings
2013-08-25 07:28:10 -07:00
Anton Batenev
bad2f7bb24 Russian translation (actual version) 2013-08-25 17:19:03 +04:00
Régis Hanol
4c788e75f0 add a warning whenever the uploaded image is not a square 2013-08-25 00:25:47 +02:00
Robin Ward
c0b051c9f6 Show Private Messages pill as a topic list rather than individual messages. 2013-08-24 16:58:16 -04:00
Régis Hanol
3b9e62e6b9 improved specs for avatar 2013-08-24 22:45:05 +02:00
versvs
50a49138a5 Added strings
Added some strings not yet existing in the "es" locale but already in use in the application.
2013-08-24 18:10:54 +02:00
Robin Ward
acf1124c0a Merge pull request #1370 from ofgeek/patch-2
Update client.zh_CN.yml
2013-08-24 08:31:19 -07:00
Jeff Atwood
fb037290ac clarify on invite friends 2013-08-23 23:12:24 -07:00
Neil Lalonde
6e79197519 Enum site settings can have translatable names in dropdown. Add setting for how often users get digest emails by default: default_digest_email_frequency. 2013-08-23 17:36:25 -04:00
Régis Hanol
43a8bff652 add a site setting for allowing animated avatars 2013-08-23 18:55:02 +02:00
Jeff Atwood
c409d91203 add "temporarily" to flagged content hidden 2013-08-23 00:07:08 -07:00
ofGEEK
1a58bfbdc9 Update client.zh_CN.yml 2013-08-23 09:52:10 +08:00
Neil Lalonde
25e0c3eac1 Log IP addresses with screened emails and urls 2013-08-22 19:04:35 -04:00
Jeff Atwood
32655e9dad digest email footer should say "unsubscribe" 2013-08-22 12:53:28 -07:00
Neil Lalonde
10bc24b514 Add a note to allow_uncategorized_topics description 2013-08-22 12:14:41 -04:00
John Paul Ashenfelter
cc2b0f1a5f took a stab at other translations with help from google 2013-08-21 16:29:05 -04:00
John Paul Ashenfelter
bd2006b270 updated english translation 2013-08-21 16:28:51 -04:00
Neil Lalonde
47add6da70 Log when a site customization is deleted 2013-08-21 12:33:24 -04:00
Neil Lalonde
a95303fcd8 Log site customization changes. Use a modal to show staff action log details for site customizations. 2013-08-21 12:33:24 -04:00
Régis Hanol
dcfe4f2061 remove useless text beneath avatar 2013-08-20 21:53:17 +02:00
Sam
b5b22f0f36 move secret token into redis to ease install 2013-08-20 17:17:19 +10:00
Neil Lalonde
1d030666d8 Log site setting changes and show in admin 2013-08-19 16:58:38 -04:00
Neil Lalonde
7eaedb84e1 Add notify_mods_when_user_blocked site setting to control whether moderators get a message when someone is automatically blocked 2013-08-19 12:00:48 -04:00
Robin Ward
103f204e36 Merge pull request #1354 from ofgeek/patch-2
Update client.zh_CN.yml
2013-08-19 07:35:36 -07:00
Anton Batenev
35442a0c79 Russian translation (actual version) 2013-08-19 12:26:02 +04:00
ofGEEK
59a252f535 Update client.zh_CN.yml 2013-08-19 10:53:05 +08:00
Sam
1d74cc60a1 don't try sending emails out in profile mode 2013-08-19 11:33:38 +10:00
Sam
b69d089d06 we need to decalre favcount to keep tests happy 2013-08-18 21:52:13 +10:00
Michael Kirk
4af8a9102e Authenticate with Discourse via OAuth2
See https://github.com/michaelkirk/discourse_oauth2_example for an
example of how you might integrate your existing oauth2 provider's
authentication via a Discourse plugin.
2013-08-17 21:45:20 -07:00
Régis Hanol
ea6e73076b change your avatar in a modal 2013-08-17 00:35:29 +02:00
Neil Lalonde
baff59d752 Send email to contact_email when a new version of Discourse is found. Disable with the new_version_emails setting. 2013-08-16 17:28:36 -04:00
Michael Brown
95c246e257 Add section for additional MIME in nginx 2013-08-16 11:49:50 -04:00
Neil Lalonde
b6285b85d2 Add reject option to pending users page 2013-08-16 11:42:43 -04:00
Jeff Atwood
946b02533b better copy for password change button 2013-08-15 22:25:26 -07:00
Sam
b52761c522 Merge pull request #1338 from ofgeek/patch-2
Update client.zh_CN.yml
2013-08-15 21:52:02 -07:00
ofGEEK
b2acf33a74 Update client.zh_CN.yml 2013-08-16 11:16:17 +08:00
ofGEEK
3a8fbdb9a8 Update client.zh_CN.yml 2013-08-16 11:13:50 +08:00
ofGEEK
490b057922 Update client.zh_CN.yml 2013-08-16 11:07:25 +08:00
Robin Ward
27fbd232d4 Merge pull request #1334 from ofgeek/patch-2
Completely update the zh_CN locale.
2013-08-15 08:33:38 -07:00
Robin Ward
9740d70c67 Merge pull request #1335 from meglio/links
Fix site settings link in Twitter config warning
2013-08-15 08:32:19 -07:00
Neil Lalonde
293361dcd3 Screened URLs list in admin 2013-08-15 10:52:26 -04:00
Anton Andriyevskyy
f74587bb84 Fix site settings link in Twitter config warning 2013-08-15 11:51:18 +03:00
ofGEEK
a6085125c5 Totally update zh_CN locale.
投诉 → 报告
登陆 → 登录
2013-08-15 11:53:00 +08:00
ofGEEK
fe85e9f739 Update client.zh_CN.yml 2013-08-15 11:42:20 +08:00
ofGEEK
22d26b471b Keep up with the en locale. 2013-08-15 11:38:54 +08:00
Sam
c2653b2915 Merge pull request #1309 from stephankaag/sidetiq
Replace Clockwork with Sidetiq
2013-08-14 16:51:04 -07:00
Neil Lalonde
9170166e93 Finish renaming blocked emails to screen emails 2013-08-14 16:45:30 -04:00
Neil Lalonde
86647f0a54 Add ScreenedUrl. Rename BlockedEmail to ScreenedEmail. 2013-08-14 16:08:23 -04:00
Stephan Kaag
a6b4b5dbf2 Replace Clockwork with Sidetiq 2013-08-14 21:39:40 +02:00
Neil Lalonde
bc0d4f1bfc Add a confirm modal to Delete All Posts button 2013-08-14 11:48:18 -04:00
Robin Ward
b71ffe9160 Merge pull request #1326 from sanderdatema/dutch_translation
Updated Dutch translation
2013-08-14 06:56:52 -07:00
Sander Datema
e0636fa914 Updated Dutch translation 2013-08-14 15:47:48 +02:00
Régis Hanol
3524b90d6a FIX: avatars in quotes/oneboxes
Avatars in quotes/oneboxes are still pointing to the old
`/users/:username/avatar(/:size)` route.
So, this adds back the old avatar route for the transition period.
2013-08-14 12:20:05 +02:00
Sam
019d52f4ac Merge pull request #1319 from adrianlang/patch-1
Fix typo in german translation
2013-08-14 01:11:10 -07:00
Adrian Lang
701090bf3e Fix typo in german translation 2013-08-13 21:36:57 +02:00
Robin Ward
9782d3777e Merge pull request #1314 from quickwango/patch-1
missing german translations
2013-08-13 07:39:33 -07:00
Phillip Schichtel
8a0e253b6f oops, that should not be there 2013-08-13 16:29:49 +02:00
Jeff Atwood
ce92d21d22 copyedit pass on admin descriptions 2013-08-13 02:00:01 -07:00
Jeff Atwood
6722a1fe22 some minor user deletion tweaks 2013-08-13 00:41:23 -07:00
Phillip Schichtel
18c304bda6 more translations 2013-08-12 21:32:04 +02:00
Phillip Schichtel
306a6eeb3c fixed indention 2013-08-12 21:23:35 +02:00
Neil Lalonde
b36c6d7b78 Users cannot change their own username after 3 days since registering. Site setting username_change_period allows you to change the number of days. 2013-08-12 14:55:09 -04:00
Neil Lalonde
879652f055 Add setting edit_history_visible_to_public to control whether post edits can be viewed by everyone. Uncheck it so only staff users can see edits. 2013-08-12 11:12:20 -04:00
Anton Batenev
8e8167b41e Russian translation (actual version) 2013-08-12 09:58:45 +04:00
Phillip Schichtel
7029261318 added the missing de.user.change translation 2013-08-12 00:20:29 +02:00
charlieshum
199d6a3fcc Update client.zh_TW.yml
update the translation by comparing with client.en.yml
2013-08-10 19:43:47 +08:00
Neil Lalonde
bb492eb8bf Add filtering to staff logs page 2013-08-09 16:59:05 -04:00
Robin Ward
652169daf6 Include a list of more new topics in the digest emails at the bottom 2013-08-09 14:43:02 -04:00
Neil Lalonde
90a3bcf6ff Add filter by action to staff logs page 2013-08-09 10:06:59 -04:00
Neil Lalonde
ce05b43c1d Fix delete user button on admin/user page so it's enabled at the right times, and update its title attribute to be more helpful 2013-08-08 12:54:38 -04:00
Adrian Lang
b6a133c6b1 Fix various errors in german translation 2013-08-08 11:26:01 +02:00
Neil Lalonde
b097d780d0 Tweaks to staff action logs page 2013-08-07 18:29:13 -04:00
Neil Lalonde
b0848db6de Oops, forgot to use i18n in some places 2013-08-07 16:46:23 -04:00
Neil Lalonde
5c8c52482a Add a way to view staff action logs in admin 2013-08-07 16:27:34 -04:00
Neil Lalonde
d2fb6ec53f Blocked Emails list in admin 2013-08-07 16:27:34 -04:00
Robin Ward
fe3a69c271 Private message emails now include the history 2013-08-07 13:03:45 -04:00
Michael Brown
08e41a707d Update documentation
* Change recommendation for install path to /var/www/discourse
* Fix instructions for redis-server installation
* Set yourself as system user during install
* Clarify some instructions
2013-08-07 00:06:40 -04:00
Robin Ward
1c3804934e Show the entire history of replies above a post when you expend "in reply to" 2013-08-06 17:43:10 -04:00