Arpit Jalan
|
d89d279416
|
Update UserEmail primary key sequence when performing bulk import.
|
2017-07-25 19:15:22 +05:30 |
|
Jakub Macina
|
2d45b3fc6d
|
Add infinite loading to full page search.
|
2017-07-25 15:33:25 +02:00 |
|
Régis Hanol
|
5166b5460a
|
Merge pull request #4994 from LeoMcA/unrecognized-error-email
add link to /about page in email rejection messages
|
2017-07-25 12:42:37 +02:00 |
|
Leo McArdle
|
e4fa6a4c92
|
add link to /about page in email rejection messages
|
2017-07-25 11:26:29 +01:00 |
|
Joffrey JAFFEUX
|
8556d3c27f
|
FIX: emoji-picker do not reload all everything when changing diversity
|
2017-07-25 12:23:38 +02:00 |
|
Joffrey JAFFEUX
|
22c5fb20b4
|
FIX: emoji-picker broken and skipped specs
|
2017-07-25 12:23:38 +02:00 |
|
Régis Hanol
|
c7c93e7159
|
FEATURE: new 'strip image metadata' site setting
|
2017-07-25 11:48:39 +02:00 |
|
Régis Hanol
|
933711a771
|
Merge pull request #4990 from quangbuule/add-charset-when-bulk-import-vbulletin
Add charset preference when bulk importing vBulletin
|
2017-07-25 09:57:21 +02:00 |
|
Guo Xiang Tan
|
6c0a29698b
|
Fix JS tests failing when running in RAILS_ENV=test.
Fixes the following error:
```
phantomjs /home/tgxworld/work/discourse/vendor/assets/javascripts/run-qunit.js http://localhost:60099/qunit
2017-07-25 16:27:41 +0900: Rack app error handling request { GET /stylesheets/desktop.css }
<Errno::ENOENT: No such file or directory @ rb_sysopen - /home/tgxworld/work/discourse/tmp/stylesheet-cache/desktop.css>
/home/tgxworld/work/discourse/app/controllers/stylesheets_controller.rb:65:in `write'
/home/tgxworld/work/discourse/app/controllers/stylesheets_controller.rb:65:in `show_resource'
/home/tgxworld/work/discourse/app/controllers/stylesheets_controller.rb:9:in `show'
```
|
2017-07-25 16:31:31 +09:00 |
|
Guo Xiang Tan
|
8a362a1c3c
|
Reset ActiveRecord cache after dropping columns.
|
2017-07-25 15:36:30 +09:00 |
|
Guo Xiang Tan
|
dd932217ca
|
Fix docker tests not loading plugins.
|
2017-07-25 15:27:09 +09:00 |
|
Jeff Atwood
|
ff5a7e8945
|
Merge pull request #4992 from awesomerobot/master
mildly lighter @mention
|
2017-07-24 19:53:48 -07:00 |
|
awesomerobot
|
3905d6bc0d
|
mildly lighter @mention
|
2017-07-24 22:26:14 -04:00 |
|
Jeff Atwood
|
df653a2350
|
Merge pull request #4991 from awesomerobot/master
fixing @mention color
|
2017-07-24 18:33:00 -07:00 |
|
awesomerobot
|
3dd79b3b3a
|
fixing @mention color
|
2017-07-24 21:11:14 -04:00 |
|
Guo Xiang Tan
|
4cd9822611
|
Remove warnings in ColumnDropper.mark_readonly test.
|
2017-07-25 09:38:55 +09:00 |
|
Quangbuu Le
|
d6d123a268
|
Add charset preference when bulk importing vBulletin
|
2017-07-25 07:25:28 +07:00 |
|
Benjamin Elijah Griffin
|
4f77ca72a3
|
Stop Rails from escaping the HTML in this description.
|
2017-07-24 17:15:15 -07:00 |
|
Guo Xiang Tan
|
be3c9bca0b
|
Remove comment that is no longer relevant.
|
2017-07-25 08:58:40 +09:00 |
|
Sam
|
4da98cdcfe
|
FIX: allow bbcode to be unquoted for default
|
2017-07-24 18:36:17 -04:00 |
|
Sam
|
04eac9f14a
|
lets attempt to get these specs working!
|
2017-07-24 18:35:20 -04:00 |
|
Sam
|
f67e715ef1
|
comment out specs that break others
will check in a fixed spec tomorrow
|
2017-07-24 17:28:24 -04:00 |
|
Sam
|
f97fb7b70c
|
tighten time to stop schedueler
|
2017-07-24 15:19:54 -04:00 |
|
Sam
|
0c47153808
|
clean up stop semantics
|
2017-07-24 15:17:48 -04:00 |
|
Sam
|
c08a7aee8f
|
clean up skipped tests
tighter connection handling in scheduler
|
2017-07-24 15:06:24 -04:00 |
|
Sam
|
66ef7976ea
|
FIX: don't re-scheduler correctly scheduled daily tasks
|
2017-07-24 14:30:43 -04:00 |
|
Neil Lalonde
|
25097deb39
|
FIX: saving profile preferences removes name in account preferences
|
2017-07-24 13:13:50 -04:00 |
|
Sam
|
80bb127cd3
|
use time zone for extra safety
|
2017-07-24 13:08:17 -04:00 |
|
Sam
|
7ebb9874a8
|
freeze time in spec
|
2017-07-24 13:00:15 -04:00 |
|
Sam
|
40abcfc2f5
|
FIX: smart quote edge case with quotes
|
2017-07-24 12:21:49 -04:00 |
|
Sam Saffron
|
045a2abcec
|
FEATURE: remove the timecop gem
We should only have one way of mocking time, misuse of timecop
was causing build stability issues
|
2017-07-24 12:11:10 -04:00 |
|
Robin Ward
|
40174962e2
|
Merge branch 'awesomerobot-master'
|
2017-07-24 12:04:53 -04:00 |
|
Robin Ward
|
5dd56a41d9
|
Merge branch 'master' into master
|
2017-07-24 12:01:48 -04:00 |
|
Neil Lalonde
|
b5a375c70a
|
FIX: oops, real fix for change email instructions
|
2017-07-24 11:15:55 -04:00 |
|
Neil Lalonde
|
1f1d84c378
|
FIX: wrong position for change email instructions
|
2017-07-24 11:14:36 -04:00 |
|
Guo Xiang Tan
|
d940166a89
|
Re-enable skipped Scheduler::ScheduleInfo test.
|
2017-07-25 00:03:03 +09:00 |
|
Guo Xiang Tan
|
8ee31d3c85
|
Re-enable skip tests for Email::Styles.
|
2017-07-24 23:16:54 +09:00 |
|
Guo Xiang Tan
|
e82efc7b03
|
Fix SiteSetingExtension specs to coerce int to string.
|
2017-07-24 22:54:42 +09:00 |
|
Guo Xiang Tan
|
0ab0c82f11
|
Reenable skipped Email::Receiver spec.
|
2017-07-24 22:27:24 +09:00 |
|
Régis Hanol
|
4dbe0280fb
|
Merge pull request #4987 from quangbuule/fix-vbulletin-bulk-import
FIX: vBulletin bulk importer: emails and stats
|
2017-07-24 14:55:11 +02:00 |
|
Quangbuu Le
|
5bba959cd5
|
FIX: vBulletin bulk importer: emails and stats
|
2017-07-24 19:49:22 +07:00 |
|
Guo Xiang Tan
|
6b17178533
|
Validate uniquness of api_key.
|
2017-07-24 21:46:08 +09:00 |
|
Régis Hanol
|
57d6a5dc9c
|
FIX: vBulletin bulk importer
|
2017-07-24 14:22:00 +02:00 |
|
Joffrey JAFFEUX
|
d9696c98c3
|
FIX: broken spec
|
2017-07-24 13:59:36 +02:00 |
|
Guo Xiang Tan
|
54b508dda3
|
Add back test to ensure user can't edit name after SiteSetting.username_change_period.
|
2017-07-24 20:47:34 +09:00 |
|
Arpit Jalan
|
ed5d322196
|
FIX: handle existing users in imports
|
2017-07-24 16:22:56 +05:30 |
|
Joffrey JAFFEUX
|
995d253030
|
FIX: improves efficiency
|
2017-07-24 12:42:54 +02:00 |
|
Guo Xiang Tan
|
d9c3ebe299
|
Reintroduce specs that wasn't causing random failures.
|
2017-07-24 19:32:38 +09:00 |
|
Régis Hanol
|
28a397398f
|
change the *correct* timeout value
|
2017-07-24 11:44:33 +02:00 |
|
Régis Hanol
|
2779fde565
|
increase js tests suite timeout to allow more time to travis-ci
|
2017-07-24 11:28:32 +02:00 |
|