Commit graph

2722 commits

Author SHA1 Message Date
Robin Ward
ad6705cca7 Update Ember to latest master (RC5) 2013-06-10 10:14:42 -04:00
Robin Ward
7907f5066e Merge pull request #999 from netzpirat/update-german-translations
Update German translations
2013-06-10 07:00:55 -07:00
Robin Ward
9bc0dc3865 Merge pull request #1000 from Naiqus/patch-2
A few zh_CN translation updates for version 0.9.2.5
2013-06-10 06:59:50 -07:00
Naiqus
82168d2067 A few zh_CN translation updates for version 0.9.2.5
It is valid now.
2013-06-10 16:37:13 +03:00
Michael Kessler
561418304d Update German client-side translations. 2013-06-10 10:58:42 +02:00
Michael Kessler
080938660c Update German server-side translations. 2013-06-10 10:24:26 +02:00
Jeff Atwood
64fb6dbf79 add Mandrill note to email deliverability test 2013-06-10 00:14:47 -07:00
Jeff Atwood
b4a4774165 extend consumer email warning to yahoo & outlook 2013-06-10 00:08:06 -07:00
Sam
77fac7ea41 Merge pull request #996 from PavelPenkov/admin_rake_task
Added admin:create rake task
2013-06-09 22:30:48 -07:00
Sam
9ab0990077 Merge pull request #998 from vipulnsward/remove_map
Some minor cleanups
2013-06-09 22:28:56 -07:00
Sam
ad0c1c60b9 Merge pull request #997 from chrishunt/update-commit-onebox
Update GitHub commit Onebox
2013-06-09 22:26:28 -07:00
Vipul A M
4f606ffd8e Some minor cleanups
1. Change map to keys
2. Remove overshadow
3. Remove var
2013-06-10 10:38:10 +05:30
Chris Hunt
15efecd536 Remove html rendering test for commit onebox
This is a very brittle test. We want to be able to change our markup
without breaking tests.
2013-06-09 21:32:13 -07:00
Chris Hunt
7bdb73bcb0 Update github commit onebox to match pr onebox 2013-06-09 21:31:48 -07:00
Pavel Penkov
cb3b79407d Added admin:create rake task 2013-06-10 05:56:51 +04:00
Sam
cbec9efc16 Merge branch 'master' of github.com:discourse/discourse 2013-06-10 09:48:51 +10:00
Sam
6a6496eedf Merge pull request #995 from novemberkilo/master
Refactoring Post model
2013-06-09 16:19:06 -07:00
Sam
2d14b54096 Merge pull request #988 from chrishunt/add-dynamic-favicon
Add 'dynamic favicon' setting
2013-06-09 16:13:54 -07:00
Sam
a144cea9a9 Merge pull request #991 from chrishunt/add-pull-request-onebox
Add onebox for GitHub pull requests
2013-06-09 16:13:13 -07:00
Sam
ba600113b0 Merge branch 'master' of github.com:discourse/discourse 2013-06-10 09:12:39 +10:00
Navin
3fdba0019b Extract callbacks and validations for Post
Move Post create callbacks to PostCreate
Extract Post validations
Move stripped_length_validator to lib/validators
2013-06-09 20:47:04 +02:00
Robin Ward
26a81b30c2 When rebaking, update the links even if the cooked content didn't change. Someone
might be linking to us even if we don't have a link.
2013-06-08 21:53:33 -04:00
Chris Hunt
d741798d9c Add onebox for GitHub pull requests 2013-06-08 11:01:06 -07:00
Robin Ward
c2821bee91 Merge pull request #990 from sanderdatema/dutch_translation
Updated Dutch translation
2013-06-08 09:58:37 -07:00
Sander Datema
27d0b120fd Updated Dutch translation 2013-06-08 18:12:20 +02:00
Sam
26f378e022 Merge pull request #989 from chrishunt/redirect-when-cant-edit
Fix RestrictedUserRoute
2013-06-08 07:16:22 -07:00
Sam
9aa2cc2262 extra spec 2013-06-08 23:56:40 +10:00
Sam
1756f713d6 SECURITY HOLE, upgrade right away if you are using Secure Groups. 2013-06-08 23:52:06 +10:00
Chris Hunt
3bdfdd7c04 Redirect when can_edit === false or undefined 2013-06-07 22:09:51 -07:00
Chris Hunt
af1c14939e Add 'dynamic favicon' setting 2013-06-07 17:15:49 -07:00
Jeff Atwood
7a73afa117 three main pre-reqs 2013-06-07 17:00:01 -06:00
Jeff Atwood
3fbcea6b21 add link to official-ish install docs 2013-06-07 16:57:55 -06:00
Jeff Atwood
9477cdaffa Robin lurves him some MailCatcher 2013-06-07 16:54:09 -06:00
Sam
63c0c59114 Merge pull request #985 from avdi/clarify-jobs-dissection
Clarify job args dissection using destructuring assignment.
2013-06-07 15:44:34 -07:00
Robin Ward
eab38b5c34 JSHint fix :(
)
2013-06-07 18:08:08 -04:00
Robin Ward
b46b533e70 Create the composer view with the defaultContainer. This is in prep for redeploying
on RC5. Ideally we'll change how the composer is instantiated altogether but that will
have to wait for a future release.
2013-06-07 18:04:51 -04:00
Sam
a6f67d85eb also should have caught this earlier 2013-06-08 07:47:48 +10:00
Sam
1e725629cd no idea how this was even working 2013-06-08 07:45:45 +10:00
Robin Ward
f4d70b922d Merge pull request #986 from chrishunt/fix-local-onebox
Link to category slug instead of name in onebox
2013-06-07 14:23:53 -07:00
Robin Ward
b2a6755a48 Merge pull request #984 from Supermathie/moreentropy
More entropy for foreign titles
2013-06-07 14:23:26 -07:00
Robin Ward
fa4cfa1269 ScreenTrack refactor - removes logic from TopicView didInsertElement 2013-06-07 17:20:10 -04:00
Neil Lalonde
34e1f376f6 Add [PM] to subject of email notifications for private messages 2013-06-07 15:50:11 -04:00
Chris Hunt
1df5a50324 Link to category slug instead of name in onebox 2013-06-07 12:31:39 -07:00
Robin Ward
463be6fadf Merge pull request #982 from jd-erreape/add_scopes_to_roleable
Added role scopes to roleable
2013-06-07 12:08:26 -07:00
Robin Ward
cdc3a57a91 Merge pull request #983 from ZogStriP/fix-combobox-not-working-properly
FIX: combobox were not working properly
2013-06-07 12:08:04 -07:00
Michael Brown
f3fb10de03 settings: Update english description of entropy 2013-06-07 15:07:43 -04:00
Avdi Grimm
8cdd5d95fc Clarify job args dissection using destructuring assignment. 2013-06-07 15:02:21 -04:00
Michael Brown
bb77d2c38b More entropy for foreign titles
* Treat strings with non-ASCII characters as having more entropy
2013-06-07 14:47:07 -04:00
Régis Hanol
3f5c12ca1b FIX: combobox were not working properly 2013-06-07 20:45:31 +02:00
Neil Lalonde
169125e96d Fix a case where a random topic with null slug will be rendered instead of 404 2013-06-07 14:30:26 -04:00