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
4b269de724
correct: http://meta.discourse.org/t/cant-save-adding-a-group-permission-to-a-category/8537
...
can not save category after adding a new custom group
2013-07-23 10:10:36 +10:00
Sam
0acc96c94e
work around for http://meta.discourse.org/t/activerecord-statementinvalid-exception-raised-in-models-user-action-rb/7275/4
2013-07-23 09:48:18 +10:00
Sam
ea7684fb32
Merge pull request #1226 from stephankaag/rails4_updates
...
Some Rails4 updates
2013-07-22 15:03:37 -07:00
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
3e7b418ea8
First Try: Include Post History (context) in Notification Emails
2013-07-22 15:06:37 -04: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
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
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
Sam
9e4b0df7ff
69 specs fail in rails 4 now ...not too bad
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
Régis Hanol
33977252c9
rollback to previous s3 syntax (ie. subdomains)
2013-07-20 11:30:36 +02: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
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
Sam
c2be81a76e
Merge pull request #1199 from ZogStriP/uploads
...
adds the `max_attachment_size_kb` setting
2013-07-16 23:03:42 -07: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
Robin Ward
75282576b9
Merge pull request #1195 from initforthe/post-analyser-backtrace-fix
...
Post analyser backtrace fix
2013-07-16 07:34:54 -07:00
Sam
e9d37f395f
hmm I totally missed that it was already there
2013-07-16 21:06:04 +10:00
Sam
06bd9e3234
allow login required screen to be customized
2013-07-16 20:49:04 +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
Régis Hanol
5ce05ff5cb
adds the max_attachment_size_kb setting
...
so that we can specify a different max upload size for attachments and images.
2013-07-16 02:01:36 +02:00
Tom Russell
96065a1499
Prevent backtrace in PostAnalyser
2013-07-15 11:15:04 +01:00
Régis Hanol
6f2ce93ab2
FIX: create an upload when FastImage throws an exception
...
FastImage might throw an exception when it isn't able to recognize a
file as being an image (ie. happens when users changes the extension
manually)
Also improved upload specs a lot
2013-07-13 23:42:19 +02:00
Robin Ward
7fd8bb75d9
Merge pull request #1177 from ZogStriP/attachments
...
Attachments
2013-07-11 06:49:20 -07:00
Sam
1aef6de4b0
automatically approve invited users on forum where moderators must approve (keep in mind only moderators can invite)
...
speed up specs a touch
allow invite controller to accept an email in absence of user (cleans up API)
2013-07-11 11:22:00 +10:00
Régis Hanol
ac41e94619
refactor optimized_image a bit
2013-07-10 22:59:54 +02:00
Régis Hanol
27ab5f471c
support arbitrary attachments
2013-07-10 22:59:53 +02:00
Neil Lalonde
8814f9ed05
Fix a case when a staff user views a topic with a deleted post by a nuked user; might be a temporary solution until we decide what to do with nuked records
2013-07-10 16:52:47 -04:00
Neil Lalonde
0e3e5bf533
Add relative_date_duration site setting
2013-07-10 12:38:43 -04:00
Robin Ward
cc47616cdb
Merge pull request #1157 from abbat/email-custom-headers
...
Add custom headers for email messages
2013-07-10 07:12:51 -07:00
Robin Ward
b7327942af
Add deleted_by to Trashable tables
2013-07-09 15:46:36 -04:00
Neil Lalonde
ba7a4e9845
Merge pull request #1165 from novemberkilo/feature/log-trust-level-boosts
...
Log all changes of user trust level by an admin
2013-07-09 12:16:08 -07:00
Neil Lalonde
3c38062802
Check for updates: edge cases when the message on the dashboard doesn't make sense.
2013-07-09 14:01:08 -04:00
Anton Batenev
b0dbb0ea13
And add tests for empty string & null
2013-07-09 20:19:10 +04:00
Robin Ward
5cda0e556c
Merge pull request #1111 from jamesaanderson/flash-video-onebox
...
Add flash video onebox support
2013-07-09 06:55:56 -07:00
Robin Ward
f9d1fcb169
Merge pull request #1140 from stephankaag/code_refactoring
...
Refactor code that raises deprecating warnings in Rails 4
2013-07-09 06:48:48 -07:00
Sam
8f892da890
move bookmark to end
2013-07-09 18:16:17 +10:00
Neil Lalonde
806bd98f99
Update category's topic_count immediately when trashing or recovering a topic; this ensures that a category can be deleted without waiting for the category_stats job to run.
2013-07-08 15:23:20 -04:00
Neil Lalonde
9b0f63627b
Add blocked users count to dashboard
2013-07-08 12:44:13 -04:00
Stephan Kaag
2abfd38aee
Refactor code that raises deprecating warnings in Rails 4
2013-07-08 18:35:11 +02:00
James A. Anderson & Jalil Mohammed
d51a3cf50f
Add flash video onebox as disabled setting by default
2013-07-08 06:37:44 -07:00
