Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,604 Commits 180 Branches 498 Tags 916 MiB
Commit Graph

1981 Commits

Author SHA1 Message Date
Robin Ward fd1d376975 Merge pull request #1235 from stephankaag/remove_all 
Remove some calls to `all`
 2013-07-22 12:26:00 -07:00
Robin Ward 0ad93e436c Merge pull request #1232 from sir-pinecone/fix-group-member-removal 
Fix for autocomplete delete action removing only the last item
 2013-07-22 12:22:14 -07:00
Robin Ward 4aa8f718d0 Merge pull request #1236 from jbruni/pt_BR 
Brazilian Portuguese translation of "static" files (FAQ, TOS and Privacy)
 2013-07-22 12:18:34 -07:00
Robin Ward 3e7b418ea8 First Try: Include Post History (context) in Notification Emails 2013-07-22 15:06:37 -04:00
J. Bruni e257cfc56c Merge branch 'master' into pt_BR 2013-07-22 16:00:09 -03:00
J. Bruni 1c78b485d3 Brazilian Portuguese translation (FAQ) - improvements and corrections 2013-07-22 15:46:26 -03:00
J. Bruni 701eac17c7 Brazilian Portuguese translation (Terms of Service) 2013-07-22 15:45:40 -03:00
Stephan Kaag 0e3b8fbb24 Remove some calls to `all`. They are not required, and Rails4 raises warnings about them. 2013-07-22 20:44:11 +02:00
Robin Ward 112b9f9c2a FIX: The previous flag reason was selected when opening the modal. 2013-07-22 12:05:13 -04:00
Robin Ward e73c809836 FIX: Reply as new Topic wasn't clearing drafts 2013-07-22 11:42:22 -04:00
Neil Lalonde 52acbec647 Load pagedown_custom.js a bit later so it can use translations 2013-07-22 11:01:15 -04:00
Robin Ward 0c4e3d5233 Merge pull request #1221 from jbruni/patch-1 
Update faq.en.html.erb (only fixed a comma position)
 2013-07-22 07:35:00 -07:00
Robin Ward a71e4d5216 Merge pull request #1219 from bolandrm/fix_graphical_error_admin_dash 
Fix Graphical Error on Admin Dashboard
 2013-07-22 07:33:08 -07:00
Robin Ward ed745c3fdd Merge pull request #1222 from ZogStriP/fix-s3-related-issues 
Fix s3 related issues
 2013-07-22 07:30:41 -07:00
Robin Ward 0f1533f41d Merge pull request #1229 from ZogStriP/close-lightbox-when-using-back-button 
FIX: lightbox is not closed when using the back button
 2013-07-22 07:29:53 -07:00
Robin Ward 80a0943f54 Merge pull request #1228 from ZogStriP/fix-thumbnailing-with-cdn-enabled 
FIX: thumbnailing isn't working with CDN enabled
 2013-07-22 07:22:59 -07:00
Robin Ward 8b181e0803 Merge pull request #1230 from ZogStriP/add-newuser-max-attachments-setting 
add newuser-max-attachments setting
 2013-07-22 07:22:23 -07:00
Robin Ward ceb36a62c8 Merge pull request #1231 from jbruni/patch-2 
Update tos.en.html.erb
 2013-07-22 07:21:41 -07: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
Michael Campagnaro e471ffd07b Fix for autocomplete delete action removing only the last item 2013-07-21 22:37:01 -04: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
Régis Hanol 2986798ba7 add newuser-max-attachments setting 2013-07-22 02:39:17 +02:00
Régis Hanol 418d8c7377 FIX: lightbox is not closed when using the back button 2013-07-22 01:21:43 +02:00
Régis Hanol 649ab85740 FIX: thumbnailing wasn't working with CDN enabled 2013-07-22 00:37:23 +02:00
J. Bruni af8ea2d87d Brazilian Portuguese translation (Privacy) 2013-07-20 18:57:07 -03:00
J. Bruni d38caed7fb Brazilian Portuguese translation (FAQ) 2013-07-20 18:56:45 -03:00
Régis Hanol 33977252c9 rollback to previous s3 syntax (ie. subdomains) 2013-07-20 11:30:36 +02:00
J Bruni d474944043 Update fq.en.html.erb (only fixed a comma position) 
you love pull requests, and I care about details
 2013-07-20 04:24:00 -03:00
Sam cacbcaeb7e blank responses led to an undefined on the user screen 2013-07-19 17:21:51 +10:00
Ryan Boland f6963a05c4 fix graphical error 2013-07-18 23:26:04 -04: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 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 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
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