github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 17:03:13 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
17,678 Commits 190 Branches 500 Tags 938 MiB
2998fe1ee5
Commit Graph

17678 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Saffron
b032c63773 FIX: properly defer authentication complete 2016-02-08 08:44:12 +11:00
Sam Saffron
b0567f9c62 FEATURE: automatically sync "move to inbox" / "archive" state on messages 2016-02-07 23:39:07 +11:00
Arpit Jalan
d456150bb2 Merge pull request #4000 from gschlager/website-fix 
FIX: Remove invalid 'http://' website from profiles
 2016-02-07 09:00:32 +05:30
Jeff Atwood
d81728f70d don't allow relative dates to wrap 2016-02-06 14:22:55 -08:00
Gerhard Schlager
9dba531567 FIX: Remove invalid 'http://' website from profiles 2016-02-06 22:30:24 +01:00
Régis Hanol
9a83100529 Merge pull request #3998 from cpradio/blockquote-on-profile-page 
Enable block quotes to be readable on the Profile About Me section
 2016-02-06 17:28:20 +01:00
cpradio
0270da5555 Enable block quotes to be readable on the Profile About Me section 2016-02-06 10:13:27 -05:00
Régis Hanol
4b834253ef Merge pull request #3978 from fantasticfears/discuz_x 
Updating Discuz import script (Most work done by zh99998)
 2016-02-06 11:11:55 +01:00
Régis Hanol
fb3c6d1084 Merge pull request #3987 from gschlager/phpbb3-importer 
Small changes to the phpBB3 importer
 2016-02-06 11:11:27 +01:00
Régis Hanol
54b0de8472 Merge pull request #3994 from tgxworld/fix_autocomplete 
FIX: Don't update autocomplete when removing the key.
 2016-02-06 11:10:54 +01:00
Régis Hanol
62cd6a4122 Merge pull request #3995 from devonestes/reducing-duplication-csv-export 
Reducing duplication and string allocation in Jobs::ExportCsvFile
 2016-02-06 11:10:21 +01:00
Régis Hanol
8db11aab62 Merge pull request #3996 from gschlager/i18n-datepicker 
UX: Use i18n for date picker
 2016-02-06 11:07:21 +01:00
Régis Hanol
edfe14b1f1 Merge pull request #3997 from gschlager/datepicker 
UX: Date Picker in user preferences was ugly
 2016-02-06 11:05:14 +01:00
Gerhard Schlager
8e135e460b UX: Date Picker in user preferences was ugly 2016-02-05 23:28:57 +01:00
Arpit Jalan
8a7868be07 FIX: validate user website 2016-02-06 02:19:48 +05:30
Gerhard Schlager
f7eb7f25bd UX: Use i18n for date picker 2016-02-05 21:49:21 +01:00
Gerhard Schlager
89add4a4a2 JsLocaleHelper should search for moment.js locale files 
moment.js uses a different naming conventions for locale files.
E.g. "zh-zn" instead of "zh_ZN" and "nb" instead of "nb_NO"

This change allows us to use the locale files without renaming which
makes future upgrades of moment.js a lot easier.
 2016-02-05 21:49:03 +01:00
Gerhard Schlager
8ced8350ba Upgrade moment.js to version 2.11.2 
In order to make future upgrades easier we don't rename the locale files anymore.
 2016-02-05 21:42:48 +01:00
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