Sam
|
9351a7bcb1
|
Merge pull request #1244 from stephankaag/rails4updates
Rails 4 updates
|
2013-07-24 14:16:32 -07:00 |
|
Stephan Kaag
|
f99acebdaa
|
Rails 4 updates
|
2013-07-24 21:09:18 +02:00 |
|
Neil Lalonde
|
e0b9117f15
|
Fix for emails with empty body
|
2013-07-24 15:07:51 -04:00 |
|
Robin Ward
|
2319a824f8
|
Special work to never include previous posts in parsed emails. Also a new attempt
to catch reply strings in different languages.
|
2013-07-24 14:22:32 -04:00 |
|
Sam
|
0a7bbb08e1
|
fix broken build
|
2013-07-24 17:24:55 +10:00 |
|
Sam
|
366cb13140
|
restyle all user notification emails to use a custom html template
|
2013-07-24 17:24:55 +10:00 |
|
Neil Lalonde
|
cf102be953
|
Allow deletion of a post belonging to a deleted topic, so that users can be destroyed
|
2013-07-23 11:50:58 -04:00 |
|
Robin Ward
|
adf7c9ad06
|
Merge pull request #1237 from stephankaag/improve_post_analyzing
Improve post analyzing
|
2013-07-23 07:07:49 -07:00 |
|
Sam
|
ef201e02d7
|
Merge pull request #1238 from ZogStriP/moar-bullets
change the pipe into a bullet in the lightbox overlay
|
2013-07-23 00:41:47 -07:00 |
|
Sam
|
4b735a5a09
|
Merge pull request #1239 from abbat/patch-1
Add russian stemmer for FTS
|
2013-07-23 00:39:00 -07:00 |
|
Sam
|
478ae6d6c7
|
correct bug where delete stub job would fail when attempting to delete stubs off deleted topics
skip deleting stubs if a post is actively flagged
|
2013-07-23 16:11:44 +10:00 |
|
Doug Alcorn
|
35a2bb7919
|
Parameterize the PBKDF2 algorithm in application config
http://meta.discourse.org/t/sso-between-discourse-and-xmpp/8567/5
|
2013-07-22 21:36:01 -04:00 |
|
Sam
|
7b1f9928e4
|
staff can change trust levels
|
2013-07-23 09:13:48 +10:00 |
|
Anton Batenev
|
4a6a4db241
|
Add russian stemmer for FTS
|
2013-07-23 02:05:18 +04:00 |
|
Sam
|
ea7684fb32
|
Merge pull request #1226 from stephankaag/rails4_updates
Some Rails4 updates
|
2013-07-22 15:03:37 -07:00 |
|
Régis Hanol
|
dbf6fb0232
|
change the pipe into a bullet in the lightbox overlay
|
2013-07-22 22:41:08 +02:00 |
|
Stephan Kaag
|
ad2b667504
|
Remove dead code
|
2013-07-22 22:16:46 +02:00 |
|
Robin Ward
|
5398553628
|
Merge pull request #1234 from stephankaag/template_args
Determine template_args only once per instance
|
2013-07-22 12:20:23 -07:00 |
|
Robin Ward
|
3e7b418ea8
|
First Try: Include Post History (context) in Notification Emails
|
2013-07-22 15:06:37 -04:00 |
|
Stephan Kaag
|
ea51f0fe04
|
Determine template_args only once per instance
|
2013-07-22 20:20:41 +02:00 |
|
Stephan Kaag
|
b19f631b3a
|
Some Rails4 updates
|
2013-07-22 19:01:22 +02: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
|
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 |
|
Neil Lalonde
|
e7fec0c405
|
Exporter: add ordering for more tables without id column
|
2013-07-22 09:49:17 -04: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 |
|
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
|
31bb08bcdd
|
added an option to bypass auto tracking of topics on post creation
|
2013-07-22 15:07:20 +10:00 |
|
Régis Hanol
|
2986798ba7
|
add newuser-max-attachments setting
|
2013-07-22 02:39:17 +02:00 |
|
Régis Hanol
|
649ab85740
|
FIX: thumbnailing wasn't working with CDN enabled
|
2013-07-22 00:37:23 +02: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 |
|
Régis Hanol
|
33977252c9
|
rollback to previous s3 syntax (ie. subdomains)
|
2013-07-20 11:30:36 +02:00 |
|
Robin Ward
|
147a239b28
|
Prefer unread topics in the same category
|
2013-07-18 14:47:59 -04:00 |
|
Robin Ward
|
19f3a8d640
|
Each user activity filter has its own URL now.
|
2013-07-17 15:42:31 -04: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
|
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 |
|
Sam
|
81616a46ba
|
db consistency check for mismatching topic_ids in user_actions
fix up post mover so it remaps user actions as well
move specs for post mover into post_mover_spec
|
2013-07-17 16:40:56 +10:00 |
|
Régis Hanol
|
5c27dd175a
|
make sure we handle both s3 url formats
|
2013-07-17 00:32:09 +02:00 |
|
Régis Hanol
|
7ae2fe304d
|
renamed s3 to s3_store
|
2013-07-17 00:27:52 +02:00 |
|
Régis Hanol
|
f40cad0f4b
|
changed s3 urls to using the folder convention
|
2013-07-17 00:27:52 +02:00 |
|
Régis Hanol
|
3136638b4b
|
FIX: CDN doesn't work with S3
|
2013-07-16 22:16:33 +02:00 |
|
Stephan Kaag
|
6067736562
|
Refactor topic_query.rb for better readability
- Available options are defined and validated
- Internal methods are now protected
- Renamed some variables to be more consistent
|
2013-07-16 21:20:18 +02:00 |
|
Sam
|
c49731a91b
|
fix failing server side quote localisation change
|
2013-07-16 17:48:48 +10:00 |
|
Sam
|
ff7d9cac38
|
fix non localized said: in quotes
|
2013-07-16 17:22:54 +10:00 |
|
Sam
|
352ac9e60c
|
Finalize read only and post only categories, finished off UI work
|
2013-07-16 15:46:11 +10:00 |
|
Sam
|
ecf17cfebb
|
work in progress, add fidelity to category group permissions (full, create posts, readonly)
|
2013-07-16 15:46:11 +10:00 |
|
Robin Ward
|
e83cd9d111
|
FIX: If you don't have permission to onebox a post, just show the link instead of crashing out
|
2013-07-15 15:10:05 -04:00 |
|
premprakash
|
8c5e0e7550
|
Adding Portuguese-Brazil language
|
2013-07-15 14:45:16 -03:00 |
|
Robin Ward
|
ed60f24502
|
Merge pull request #1194 from ZogStriP/uploads
[Upload] Great deal of renaming
|
2013-07-15 07:06:18 -07:00 |
|
Robin Ward
|
19e0feac75
|
Merge pull request #1185 from novemberkilo/master
Reduce complexity of TopicView
|
2013-07-15 07:05:41 -07:00 |
|