Commit Graph

3571 Commits

Author SHA1 Message Date
Robin Ward
ceb36a62c8 Merge pull request #1231 from jbruni/patch-2
Update tos.en.html.erb
2013-07-22 07:21:41 -07:00
Neil Lalonde
e7fec0c405 Exporter: add ordering for more tables without id column 2013-07-22 09:49:17 -04:00
Sam
3eb953cebe message bus to use latest 2013-07-22 18:35:02 +10:00
Sam
239d8b6795 fix spec 2013-07-22 18:04:20 +10:00
Sam
1f3c5cb656 allow end user to recover a post they delete
automatically delete stubs after 1 day
2013-07-22 17:48:47 +10:00
Jeff Atwood
d68f30c09d flatten and simplify default category badge styles 2013-07-22 00:11:34 -07:00
Jeff Atwood
5bb2090b81 fix way too tall line-height for user titles 2013-07-21 23:54:10 -07:00
Sam
58e7c3e1f3 push some work out of AR callbacks into PostCreator, add a couple of helpers for post and topic creation in test
fix it so the auto_track false marks topics as new
2013-07-22 15:07:20 +10:00
Sam
0ec1438b9a correct auto track param parsing for WordPress 2013-07-22 15:07:20 +10:00
Sam
acba0ea41e add auto track to permitted params 2013-07-22 15:07:20 +10:00
Sam
31bb08bcdd added an option to bypass auto tracking of topics on post creation 2013-07-22 15:07:20 +10:00
Sam
9e4b0df7ff 69 specs fail in rails 4 now ...not too bad 2013-07-22 15:07:20 +10:00
J Bruni
695d2abdbc Update tos.en.html.erb
Substituted literal "Wordpress" (as seen at http://en.wordpress.com/tos/) by company domain tag
2013-07-21 23:20:39 -03:00
Jeff Atwood
33e3f123b4 Merge pull request #1224 from Supermathie/sysadmin-docs
Awesome documentation updates
2013-07-21 00:58:39 -07:00
Michael Brown
ddabc476bf Awesome documentation updates 2013-07-21 03:43:54 -04:00
Sam
e7e00601c6 ok, we now dual boot rails 4 and rails 3 ... to run in rails 4 mode: RAILS4=1 bundle exec thin start 2013-07-21 10:56:48 +10:00
Jeff Atwood
857813271f slight clarification about install having higher reqs 2013-07-19 14:13:47 -07:00
Sam
cacbcaeb7e blank responses led to an undefined on the user screen 2013-07-19 17:21:51 +10:00
Sam
58eec31351 sample ubuntu upstart config file 2013-07-19 15:23:55 +10:00
Sam
08550bf625 Merge pull request #1217 from ZogStriP/fix-click-tracking-on-attachments
FIX: click tracking on attachments wasn't working
2013-07-18 21:59:36 -07:00
Régis Hanol
8406a4230c FIX: click tracking on attachments wasn't working 2013-07-19 01:27:09 +02:00
Robin Ward
7a6f1b5aff Color moderator actions on user stream 2013-07-18 17:24:51 -04:00
Robin Ward
257ddf5fc9 FIX: Private message link on messages view did not work. Removed a lot of duplication. 2013-07-18 17:07:05 -04:00
Robin Ward
7d4b089cd1 FIX: Suggested Topics were sometimes disappearing 2013-07-18 16:09:03 -04:00
Robin Ward
419cbc7701 FIX: Double load on back button 2013-07-18 15:40:06 -04:00
Robin Ward
147a239b28 Prefer unread topics in the same category 2013-07-18 14:47:59 -04:00
Robin Ward
751b757c1d FIX: Some failing specs 2013-07-18 12:26:38 -04:00
Robin Ward
e3bbb2c8bb Never render an avatar img if we know the username is invalid. 2013-07-18 12:03:09 -04:00
Robin Ward
910c88c48e FIX: Private Message button wasn't populating username 2013-07-18 10:43:38 -04:00
Robin Ward
a03259fce7 Merge pull request #1214 from nverba/patch-3
Fix some typos.
2013-07-18 07:08:17 -07:00
Robin Ward
cf801cc176 Merge pull request #1216 from prem-prakash/pt_br_translation
updating pt_BR translations
2013-07-18 07:08:01 -07:00
Jeff Atwood
8531fbab28 better link to features category of meta 2013-07-18 00:40:28 -07:00
Jeff Atwood
906aca0576 add references to try.discourse for repros 2013-07-18 00:38:23 -07:00
Jeff Atwood
193cb3d47b move squash up, remove changelog ref, etc. 2013-07-18 00:36:52 -07:00
Prem Prakash
713735f4c8 updating pt_BR translations 2013-07-18 00:09:54 -03:00
Sam
ad72f96a59 recommend latest redis 2013-07-18 09:11:20 +10:00
Robin Ward
a97c093434 FIX: Don't transition to when viewing a user. Just render it. 2013-07-17 18:13:43 -04:00
Robin Ward
3761ccb018 FIX: Sometimes the total post count could be incorrect 2013-07-17 16:50:20 -04:00
Robin Ward
19f3a8d640 Each user activity filter has its own URL now. 2013-07-17 15:42:31 -04:00
nverba
a61c194e58 Fix some errors. 2013-07-17 15:53:33 +01:00
Robin Ward
3238e0caa4 JSHINT 2013-07-17 10:31:27 -04:00
Robin Ward
86c884aa29 FIX: Only show undelete button when the topic is deleted 2013-07-17 10:21:47 -04:00
Robin Ward
50238d71c8 Merge pull request #1213 from novemberkilo/emoji_update
Update emojis from latest gemoji
2013-07-17 07:02:06 -07:00
Robin Ward
5a5e9d0fd1 Merge pull request #1206 from BrentleyJones/fixed_modals
FIX: Modal dialogs now truly center and work at all screen sizes (mobile), now with working Bootbox
2013-07-17 06:59:48 -07:00
Robin Ward
e2ff064aa3 Merge pull request #1198 from prem-prakash/master
Adding Portuguese Brazilian translations
2013-07-17 06:59:31 -07:00
Robin Ward
b7651474c7 Merge pull request #1205 from nverba/patch-2
Updated HEROKU.md squashed
2013-07-17 06:58:25 -07:00
Robin Ward
2d466d72ca Merge pull request #1207 from stephankaag/refactor_topic_query
Refactor topic_query.rb for better readability
2013-07-17 06:55:54 -07:00
Robin Ward
6839869170 Merge pull request #1211 from zsj950618/master
Add some  translation of Simplified Chinese
2013-07-17 06:53:07 -07:00
Robin Ward
75e636f5a5 FIX: Invalid YAML 2013-07-17 09:51:03 -04:00
Junki Cho
b4cae0f5d3 Korean language pack 2013-07-17 09:36:50 -04:00