github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-30 09:03:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
23,850 Commits 214 Branches 500 Tags 960 MiB
ff5a7e8945
Commit Graph

23850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Régis Hanol
640ced004d FIX: wasn't unfreezing time in email processor spec 2017-07-24 11:01:53 +02:00
Régis Hanol
d792e81372 don't pollute test suite with warning message from readonly Redis 2017-07-24 10:22:32 +02:00
Guo Xiang Tan
1b0750d7ef Merge pull request #4983 from tgxworld/group_owners_can_invite_users_to_groups 
Group owners can invite users to groups
 2017-07-24 16:21:19 +09:00
Guo Xiang Tan
fa09a02201 Fix specs. 2017-07-24 15:56:08 +09:00
Guo Xiang Tan
25448b70e4 Fix specs. 2017-07-24 15:52:56 +09:00
Guo Xiang Tan
c12edda766 Use Timecop.freeze instead of Timecop.travel. 2017-07-24 15:40:57 +09:00
Guo Xiang Tan
86dbd76191 Fix random spec failure due to ordering. 2017-07-24 15:25:07 +09:00
Guo Xiang Tan
7f1e74a272 Not sure how this spec actually worked in the past. 2017-07-24 14:13:23 +09:00
Guo Xiang Tan
381a2a55be Clear the cache after each test otherwise we are leaking state. 2017-07-24 11:41:37 +09:00
Guo Xiang Tan
6593f0355f FIX: Exclude www in topic map links. 
https://meta.discourse.org/t/topic-popular-links-panel-domain-extraction-doesnt-handle-country-tlds/60156/38?u=tgxworld
 2017-07-24 10:14:33 +09:00
Guo Xiang Tan
887c3b66f5 Revert "UX: Don't try to figure out root domain." 
This reverts commit 7690cc6ca5.
 2017-07-24 09:40:57 +09:00
Jeff Atwood
9e0381396f adjust markdown for account required message 2017-07-23 12:49:39 -07:00
Régis Hanol
65ab5f58fe FIX: keep newlines between paragraphs when quoting a post 2017-07-23 15:25:28 +02:00