Commit graph

1613 commits

Author SHA1 Message Date
Kuba Brecka
5f4b66d1bd replace CRLF with LF 2013-04-05 11:05:03 +02:00
Sam
5273657537 a method called "adding_user_record" is annoying me. 5 lines of code replaced with 2 2013-04-05 17:53:39 +11:00
Sam
ea8d69fbd6 fix my broken test 2013-04-05 17:47:54 +11:00
Sam
a2cca2540e some minimal site settings diags
fix issue where days_visited was totally out of sync
2013-04-05 17:47:54 +11:00
Sam
a7f92ec0c1 topic reply count resync for each new post 2013-04-05 17:47:54 +11: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
bf8e756175 Merge pull request #637 from wojciechka/master
Putting rootURL in JavaScript using Discourse::base_uri and erb
2013-04-04 21:42:54 -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
27776287f4 Merge pull request #654 from ZogStriP/consistent-behavior-regarding-file-uploads
consistent behavior regarding file uploads
2013-04-04 21:36:17 -07:00
Sam
4fbf017272 get regular trust level going, self heal inconsistent topic timings 2013-04-05 15:30:28 +11:00
Régis Hanol
82bd92dd46 consistent behavior regarding file uploads 2013-04-05 01:07:31 +02:00
Jeff Atwood
6aaa0ffe5e add max-width to all img in onebox-result-body 2013-04-04 15:20:11 -07:00
Robin Ward
fa1ba6791b Work in Progress: Content Editing in Admin Section 2013-04-04 17:26:22 -04:00
Neil Lalonde
bd0e98aec2 Fix for when category description has html. Could be better. 2013-04-04 17:16:30 -04:00
Neil Lalonde
d974aea536 Underline links in the detected problems messages on admin dashboard 2013-04-04 16:16:58 -04:00
Neil Lalonde
66bc48a0e3 Give magic wands to all moderators 2013-04-04 16:14:55 -04:00
Neil Lalonde
4096c6bdc2 Use a font-awesome icon in category search field instead of the default hideous one 2013-04-04 12:46:38 -04:00
Neil Lalonde
a4a09dc242 Fix styling of category select when editing a topic title 2013-04-04 11:34:07 -04:00
Kuba Brecka
53bcf99f57 fix some typos in cs translation 2013-04-04 16:57:54 +02:00
Neil Lalonde
3e0ef018ab Use temp variable for .chosen().next() 2013-04-04 10:44:11 -04:00
Wojciech Kocjan
a875b1c44a Store base URI in Discourse.BaseUri and use it in all places where rootURL was previously used 2013-04-04 11:16:38 +02:00
Jeff Atwood
02c6f0f631 make ban the actual icon-circle-ban, and danger 2013-04-04 02:09:27 -07:00
Jeff Atwood
cb9370b00c clarify that read tab is in order that you read 2013-04-04 02:06:31 -07:00
Jeff Atwood
9eec973fc4 screwed up the magicks a bit. 2013-04-04 01:56:35 -07:00
Jeff Atwood
90d979d88d add moderator MAGGICCCKKSSSSSsssSSss 2013-04-04 01:52:47 -07:00
windyson2008
d8b6ecef74 Update client.zh_CN.yml
1,Add tag
2,Fix translation
2013-04-04 13:20:45 +09:00
Michael Scott Shappe
668bf4e86e The wrong version actually got moved to this branch when I tried to clean some things up. This version should be correct :-) 2013-04-03 22:36:17 -05:00
Sam
e61a28f3e1 utc vs non utc is a subtle issue, tests were failing for a few hours every day cause of this 2013-04-04 13:29:54 +11: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
Sam
9068fdae99 Merge pull request #643 from ZogStriP/fix-accessing-a-topic-with-a-page-parameter
FIX: accessing a topic with a 'page' parameter
2013-04-03 16:42:30 -07:00
Sam
e344424d56 Merge pull request #640 from kubabrecka/cs_update28
cs translation update
2013-04-03 16:41:15 -07:00
Sam
4871454705 Merge pull request #639 from ZogStriP/cleaner-login-modal-when-there-is-no-login-button
cleaner login modal when there is no login button [fixes #638]
2013-04-03 16:40:39 -07:00
Régis Hanol
7105349f1f FIX: accessing a topic with a 'page' parameter 2013-04-04 00:12:27 +02:00
Michael Scott Shappe
ab8c1b7129 Instructions for creating an OS X native development environment
Probably not 100% complete yet, but covers enough to pass all specs.

NOTE: requires either libXML2 2.7.6 or the separately submitted fix to
pretty_text_spec.rb
2013-04-03 17:08:07 -05:00
Neil Lalonde
68e9a727b8 Merge branch 'categories' 2013-04-03 17:50:42 -04:00
Neil Lalonde
5871b01323 Show descriptions in category combobox 2013-04-03 17:46:51 -04:00
Régis Hanol
aca7fa01bb cleaner login modal when there is no login button [fixes #638] 2013-04-03 23:28:42 +02:00
Kuba Brecka
317b884943 cs translation update 2013-04-03 23:22:35 +02:00
Robin Ward
5beaf61ac0 Removes extra comma 2013-04-03 16:33:25 -04:00
Robin Ward
5ec41d454c Converted a bunch of ajax calls to use promises 2013-04-03 16:24:42 -04:00
Robin Ward
33f349a1e6 Show all Hot rankings at once with a toggle button 2013-04-03 15:25:18 -04:00
Neil Lalonde
bb18b6cb9b Dashboard: split out private messages from topic and post counts; re-enable report_spec because I think I fixed it... 2013-04-03 13:26:09 -04:00
Robin Ward
738789f336 Admins can't lock themselves out of a site by setting approval. 2013-04-03 12:23:28 -04:00
Robin Ward
459c7e3d59 Include pinned on Categories page 2013-04-03 11:45:53 -04:00
Robin Ward
ac0bc1bb30 Including your avatar if you've posted is confusing. Let's remove it for now. 2013-04-03 11:29:50 -04:00
Robin Ward
59e4e77190 Merge pull request #634 from wojciechka/master
Allow handling of back/forward buttons in browser when running with prefix (i.e. as /discourse)
2013-04-03 08:11:53 -07:00
Robin Ward
2b9514a311 Merge pull request #627 from kubabrecka/translatable_flags_and_likes
make post actions (likes, flags) translatable as whole sentences
2013-04-03 08:09:13 -07:00