codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-24 16:18:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
17698 commits 7 branches 179 tags 87 MiB
Commit graph

17698 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Saffron
d0dd517f27 FEATURE: blank global settings should not shadow 
Due to https://github.com/docker/docker/issues/9298 it is a huge pain
to remove ENV vars when composing images, allow us to simply treat "blank"
as a ENV var that is not being shadowed. In general we always supply a
value to ENV vars we are shadowing.
 2016-02-10 11:54:40 +11:00
Régis Hanol
8944d62aa6 add validator for the 'reply_by_email_enabled' site setting 2016-02-09 23:35:40 +01:00
Régis Hanol
13983c2f80 rever wiki background color, just change the default color 2016-02-09 23:06:08 +01:00
Arpit Jalan
e5aecdf09f Update Translations 2016-02-09 20:24:03 +05:30
Régis Hanol
f3ec2ac61e Merge pull request #3822 from fantasticfears/routes 
FIX: Add user id in the admin user routes
 2016-02-09 15:41:28 +01:00
Erick Guan
35142847ba FIX: Prepend the user id before username in admin user routes 2016-02-09 15:14:13 +01:00
Jeff Atwood
b2ffaa0822 Merge pull request #4002 from pra85/patch-1 
Fix a typo
 2016-02-09 02:10:35 -08:00
Prayag Verma
af582a8ba9 Fix a typo 
Misspelled `Atlassian` as `Atlassan`
 2016-02-09 15:17:24 +05:30
Arpit Jalan
82a75c00c0 UX: change 'Visit Topic' to 'Visit Message' for message notification email 2016-02-09 13:39:10 +05:30
Sam
3df2ee3431 UX: allow for an optional toolbar in composer in mobile 
Allows preview of text, emoji, quoting, whisper
 2016-02-09 17:10:41 +11:00
Jeff Atwood
1a1dcb59f9 this period bothered me and it had to go 2016-02-08 15:37:49 -08:00
Régis Hanol
460665895c properly name purge emails/email logs site settings 2016-02-08 22:18:52 +01:00
Neil Lalonde
49e55652bd Add eye-catching disclaimer to Zoho importer, which was abandoned before a successful import was completed 2016-02-08 15:31:21 -05:00
Régis Hanol
ac863bab91 FEATURE: new 'suppress_email_logs_after_days' site setting 2016-02-08 18:47:35 +01:00
Régis Hanol
1beb6070aa update email_reply_trimmer to latest version 2016-02-08 18:29:49 +01:00
Jeff Atwood
2ca1449f17 Merge pull request #4001 from techAPJ/search-page 
FEATURE: add 'New Topic' button on full page search view
 2016-02-08 01:57:44 -08:00
Jeff Atwood
c47b4ceffd Merge pull request #3963 from scossar/post-avatar-table 
FIX: avatar and username should be side-by-side in post-notification email
 2016-02-08 01:57:20 -08:00
Arpit Jalan
796a0db98b FEATURE: add 'New Topic' button on full page search view 2016-02-08 09:09:14 +05:30
Sam Saffron
b9e8732018 UX: tweak autocomplete to limit hijacking 
- Stop eating up back arrow when you hit @
- Clicking anywhere closes autocomplete
- Forward arrow no longer issues autocompletion, instead functions as right arrow
 2016-02-08 10:51:59 +11:00
Sam Saffron
38983bc977 oops 2016-02-08 09:53:47 +11:00
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