Commit Graph

24000 Commits

Author SHA1 Message Date
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
Sam Saffron 93f2c97266 simplify spec 2017-07-22 22:49:04 -04:00
Sam Saffron 687fbf5f09 simplify spec 2017-07-22 22:47:16 -04:00
Sam Saffron b9757bd02e remove readonly column specs for now 2017-07-22 22:20:57 -04:00
Sam Saffron 7caf82f03c simplify spec 2017-07-22 22:01:11 -04:00
Régis Hanol 14436f2a33 Merge pull request #4986 from davidtaylorhq/stats-colour
Fix user stats colour for dark themes
2017-07-23 01:37:40 +02:00
David Taylor 2ddf365e3a Fix user stats colour for dark themes 2017-07-22 23:48:31 +01:00
Joffrey JAFFEUX f68e711fb2 FIX: makes emoji filter case insensitive 2017-07-22 22:48:22 +02:00
Jeff Atwood bc9270defb filetype comparison needs to be case insensitive 2017-07-22 13:18:15 -07:00
Joffrey JAFFEUX e2e0221dd7 FIX: make sure there are meaningful titles on the picker 2017-07-22 17:32:12 +02:00
Sam 8ef4d6d812 this was failing erratically 2017-07-21 17:14:06 -04:00
Sam 440b95a6f3 correctly return all v8 data as opposed to just one context 2017-07-21 16:37:19 -04:00
Robin Ward bc3a32385c FIX: Empty lines should be selected for block quotes 2017-07-21 16:32:29 -04:00
Sam bb1ac09ad7 amend to match latest api changes 2017-07-21 16:16:07 -04:00
Sam 9b4f5710e6 api cleanup for before / after rules 2017-07-21 16:12:11 -04:00
Joffrey JAFFEUX bb35d9fc07 FIX: do not restore scroll on successive click on the same first emoji 2017-07-21 21:42:23 +02:00
Robin Ward 2f8f2aa1dd FEATURE: Whitelists for inline oneboxing 2017-07-21 15:41:47 -04:00
Jeff Atwood 4c7b725e19 remove quote marks from search term result page 2017-07-21 12:35:30 -07:00
Rafael dos Santos Silva 89ef5d36a9 FIX: Explicit error when category description post is bad 2017-07-21 16:07:29 -03:00