Commit Graph

17710 Commits

Author SHA1 Message Date
Erick Guan 4cb6d2b0ec Updating Discuz import script (Most work done by zh99998) 2016-02-05 20:45:08 +01:00
Régis Hanol ea0e63b150 FIX: handle cases where we only pass the notification type rather than the notification id when sending user email 2016-02-05 20:07:30 +01:00
Devon Estes 0aa59956fa Extract method refactoring in Jobs::ExportCsvFile
I was combing through some of the files with worse grades on Code Climate as a guide for places where I could jump in and help, and I saw this as one of the ones in need of some love. I reduced duplication in the #user_list_export method by extracting several methods that were common to both branches of the logic in that method.
2016-02-05 16:47:15 +01:00
Régis Hanol 91ec2c5171 fix eslint 2016-02-05 16:08:31 +01:00
Régis Hanol 56a16a0e89 we still need md5 2016-02-05 15:27:24 +01:00
Sam Saffron e3747f654b SECURITY: hoist blocks using guids, not md5 hashes 2016-02-06 01:02:48 +11:00
Guo Xiang Tan 726d81f83b FIX: Don't update autocomplete when removing the key. 2016-02-05 16:47:47 +08:00
Sam 0032047804 missing a bracket 2016-02-05 15:01:12 +11:00
Guo Xiang Tan 8560194abf Merge pull request #3973 from tgxworld/postgres_failover
FEATURE: AR adapter to failover to a replica DB server.
2016-02-05 11:27:40 +08:00
Guo Xiang Tan 74dc838f5f FIX: Add a lock to ensure only a single thread is running each time. 2016-02-05 10:47:47 +08:00
Sam 886273f158 FIX: when CDN assets are not in root path source maps fail 2016-02-05 13:05:47 +11:00
Guo Xiang Tan c532d7d1ae Internally `AR::Base.establish_connection` removes the current connection. 2016-02-05 08:51:50 +08:00
Guo Xiang Tan a08496bb1a Remove Concurrent::TimerTask which spawns a long lasting Thread. 2016-02-05 08:51:50 +08:00
Guo Xiang Tan 0058d09e35 Second attempt which removes any kind proxying. 2016-02-05 08:51:10 +08:00
Guo Xiang Tan 46589a1a0c FEATURE: AR adapter to failover to a replica DB server. 2016-02-05 08:51:10 +08:00
Sam 0ef141b2c3 FIX: skip jwt encoding for auth 2016-02-05 08:48:16 +11:00
Gerhard Schlager 15165440e5 Map :-) to :slightly_smiling: during phpBB3 import 2016-02-04 20:39:53 +01:00
Gerhard Schlager 9d96c6d435 Prepare settings file for Docker based phpBB3 importer 2016-02-04 20:39:53 +01:00
Neil Lalonde eb593f568f Version bump to v1.5.0.beta10 2016-02-04 13:44:29 -05:00
Neil Lalonde 71a87bea0c Update translations 2016-02-04 13:35:14 -05:00
Régis Hanol 2d170712d7 new 'private_email_time_window_seconds' site setting 2016-02-04 17:22:16 +01:00
Régis Hanol e8969b0c34 use bug-free version of email_reply_trimmer gem 2016-02-04 17:06:12 +01:00
Régis Hanol 5ee845fc5f update email_reply_trimmer to latest version 2016-02-04 16:39:57 +01:00
Régis Hanol 03938afc9b Merge pull request #3992 from techAPJ/report-filter
FEATURE: filter admin reports via user group
2016-02-04 11:21:14 +01:00
Guo Xiang Tan c0feea4629 Add tests for category hashtag. 2016-02-04 15:52:40 +08:00
Guo Xiang Tan 4cd07fbb29 Fix broken tests. 2016-02-04 15:24:49 +08:00
Guo Xiang Tan c99775ebdb FIX: PrettyText should return the valid slug. 2016-02-04 15:05:15 +08:00
Arpit Jalan eec8436cfe FEATURE: filter admin reports via user group 2016-02-04 11:23:49 +05:30
Guo Xiang Tan 04ba3eb053 Merge pull request #3990 from DukeofRealms/master
FIX: users.map should be results.map in xenforo import
2016-02-04 11:19:57 +08:00
Sam Saffron 209b022385 PERF: cut down on memory usage allowed to redis
This limits the amount of backlog message bus channels can have.
2016-02-04 13:58:38 +11:00
Neil Lalonde 19cdb38b20 Merge pull request #3988 from mcwumbly/quandora-importer
Add export/import scripts for Quandora
2016-02-03 15:20:21 -05:00
Régis Hanol 7d992cb4c5 FIX: sending emails to mailing list subscribers wasn't working 2016-02-03 19:27:58 +01:00
Neil Lalonde ccbbfbc24e FIX: /signup route will show sign up modal for private sites too if they allow registrations 2016-02-03 12:18:33 -05:00
Neil Lalonde 2ff4248c19 FIX: also show Sign Up button on front page of private sites that allow new registrations 2016-02-03 11:36:28 -05:00
Sam Saffron 3f67f91d27 need to allow for now scope 2016-02-04 00:19:08 +11:00
Sam Saffron 60ba9dcc5e PERF: fix N+1 on categories page 2016-02-03 23:59:15 +11:00
Régis Hanol d43a693654 Merge pull request #3991 from xfalcox/patch-4
FIX: Local onebox on subfolder installs
2016-02-03 11:23:29 +01:00
Sam Saffron e9c1f8171c more protection 2016-02-03 19:21:49 +11:00
Sam Saffron 835bedca67 add some protection so it works if currentUser is missing somehow 2016-02-03 19:04:23 +11:00
Sam Saffron bc75010b20 FEATURE: suggested messages for messages
FEATURE: clicking envelope takes you to inbox

Suggested messages works somewhat like suggested topics.

- New show up first (in either group inbox or inbox)
- Then unread (in either group inbox or inbox)
- Finally "related" which are messages with same participants as the current pm.
2016-02-03 18:50:05 +11:00
Rafael dos Santos Silva 2b32a5c48e Adds tests to subfolder internal oneboxing
Test if the local onebox engine works fine when using a sulbfolder install
2016-02-02 22:57:54 -02:00
Jeff Atwood 133fcef72c remove link for created on topic map 2016-02-02 16:20:14 -08:00
Jeff Atwood a3cd0ae8ae make PM usernames grey not link-blue 2016-02-02 16:17:14 -08:00
Neil Lalonde 0d611ed8cb FIX: group import/export bugs in category exporter 2016-02-02 16:06:19 -05:00
Robin Ward d41cbc5a30 FIX: Disable overrides in migrations
Site texts did not exist when this migration was created.
2016-02-02 11:49:57 -05:00
Arpit Jalan bcc0ed7c9c Update Translations 2016-02-02 15:24:01 +05:30
Régis Hanol cf4c256b17 FEATURE: new 'raw email' modal when listing rejected emails 2016-02-01 21:41:49 +01:00
Régis Hanol de58e58272 migration to fix email_logs not attached to a user 2016-02-01 19:37:10 +01:00
Régis Hanol 12051f79a8 FIX: don't send empty email notifications for small_actions 2016-02-01 19:12:10 +01:00
Régis Hanol 8608b5cbc1 FIX: don't poll the mailbox in development 2016-02-01 16:56:32 +01:00