github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-03 04:03:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
21,931 Commits 214 Branches 500 Tags 960 MiB
34223dca4e
Commit Graph

21931 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Atwood
34223dca4e minor CSS fix for custom user fields on user cards 2017-02-16 01:45:20 -08:00
Jeff Atwood
311b983c59 minor copyedit 2017-02-16 01:31:21 -08:00
Neil Lalonde
3e4dd513c9 show that password is optional on label 2017-02-15 19:59:16 -05:00
Jeff Atwood
0aaf20181c copyedit on unique password chars 2017-02-15 16:24:12 -08:00
Jeff Atwood
10a4063095 copyedits 2017-02-15 16:17:13 -08:00
Jeff Atwood
f831e92c42 copyedit to improved invite page 2017-02-15 16:11:34 -08:00
Sam Saffron
040e10a627 reduce duplication 2017-02-15 17:27:10 -05:00
Neil Lalonde
4b28bfaa15 Merge pull request #4710 from ento/fix-s3-config-check 
FIX: admin dashboard shouldn't complain when using IAM profile for S3 access
 2017-02-15 17:02:07 -05:00
Neil Lalonde
d0fbb27f3e FEATURE: new invite acceptance page, where username can be chosen and password can be set 2017-02-15 16:51:57 -05:00
Sam
3818c196e0 remove disallowed params 2017-02-15 16:47:14 -05:00
Sam
023bd0e9e7 FEATURE: allow client side of topic list to accept custom params 
- Also normalize API version to use a version comparison function instead of float
 2017-02-15 16:14:43 -05:00
Sam
74d4209d24 FEATURE: allow plugins to register custom topic list filters 2017-02-15 15:25:43 -05:00
Sam
9c51e3e8e7 amend preloader api to supply topic list 2017-02-15 12:04:02 -05:00
Sam
2c59ffeb2c FIX: token rotation not accounting for overlapping tokens correctly 
also... freeze_time has no block form, correct all usages and specs
 2017-02-15 10:58:18 -05:00
Marica Odagaki
a9a585f66a Use && and || consistently so that there's less chance of copy paste errors in the future 2017-02-15 00:25:49 -08:00
Marica Odagaki
22e3db703e Mention s3_use_iam_profile in problem messages 2017-02-15 00:25:49 -08:00
Marica Odagaki
3bb1b98b0e FIX: admin dashboard shouldn't complain when using iam profile for s3 access 
Previous code wasn't working as intended because it was parsed as

    (bad_keys = (access_key or secret_key)) and !use_iam_profile

because of Ruby's operator precedence: `=` binds more eagerly than `and`.

http://ruby-doc.org/core-2.3.1/doc/syntax/precedence_rdoc.html

See also: https://github.com/bbatsov/ruby-style-guide#no-and-or-or
 2017-02-15 00:22:14 -08:00
Marica Odagaki
af9c97ec43 Add failing tests 2017-02-15 00:05:58 -08:00
Marica Odagaki
2c1279b740 Fix typo to be more consistent with other test descriptions 2017-02-15 00:04:10 -08:00
Neil Lalonde
c085e8f85f Version bump to v1.8.0.beta6 2017-02-14 17:40:44 -05:00
Sam
8409f42352 Add outlet for injecting custom tags 2017-02-14 17:40:13 -05:00
Sam
f2099c3811 adjust API 2017-02-14 16:32:33 -05:00
Sam
89d5e8ab4b FEATURE: allow plugins to preload data in topic list 2017-02-14 16:29:06 -05:00
Sam
21e21b9882 Merge pull request #4708 from discourse/phantonjs-timeout 
Increase Qunit tests timeout on Docker tests
 2017-02-14 14:48:22 -05:00
Rafael dos Santos Silva
6a271a7695 Increase Qunit tests timeout on Docker tests 2017-02-14 16:09:14 -02:00
Sam
dacfdd4dc8 use chars as opposed to split 2017-02-14 09:40:15 -05:00
Sam
5346cd3514 correct the test 2017-02-14 09:34:39 -05:00
Sam
c52784f9d2 FIX: race condition when marking tokens as seen 
- in rare conditions can lead to users being logged off
 2017-02-14 09:34:09 -05:00
Sam
8feb94e13f FIX: password validator was being too strict 2017-02-14 09:18:04 -05:00
Régis Hanol
dba16b57cb Merge pull request #4707 from discourse/revert-4699-rfc-signature 
Revert "use RFC-complient signature separator dash-dash-space"
 2017-02-14 14:58:30 +01:00
Régis Hanol
d88562e72b Revert "use RFC-complient signature separator dash-dash-space" 2017-02-14 14:58:08 +01:00
Neil Lalonde
53d8d126a4 Version bump to v1.8.0.beta5 2017-02-13 16:46:08 -05:00
Neil Lalonde
56233e9ec6 Update translations 2017-02-13 16:42:15 -05:00
Sam
783bac9ff7 less stubbing for better clarity and robustness 2017-02-13 14:34:15 -05:00
Sam
7652901b75 reduce mocking and stubbing in controller spec 2017-02-13 14:31:15 -05:00
Sam
0ab96a7691 FEATURE: add hidden setting for verbose auth token logging 
This is only needed to debug auth token issues, will result in lots
of logging
 2017-02-13 14:01:09 -05:00
Robin Ward
0e58e393a1 FIX: === and a better constant, thanks @ZogStriP 2017-02-13 13:14:19 -05:00
Robin Ward
9d4405d602 Don't add an empty class to the list elements in the hamburger 2017-02-13 11:28:10 -05:00
Sam
07b9c351a4 Merge pull request #4705 from vinothkannans/dev 
new: server plugin outlet for indexable robots.txt
 2017-02-13 11:18:51 -05:00
Robin Ward
c40d8d37dd Put an error in the console if the discourseEmbedUrl is relative 2017-02-13 11:18:24 -05:00
Robin Ward
e1d358ffbf FIX: Don't clear the login hint when the system user is saved 2017-02-13 10:54:20 -05:00
Rafael dos Santos Silva
87a2aa18ee Merge pull request #4703 from ndossougbete/ndossougbete-patch-1 
Use `natural` orientation for web app manifest.
 2017-02-13 13:28:38 -02:00
Vinoth Kannan
08c14dd689 new: server plugin outlet for indexable robots.txt 2017-02-13 17:31:10 +05:30
Jeff Atwood
13c7887210 Merge pull request #4704 from rimian/patch-2 
remove personal email from fixtures
 2017-02-12 19:50:45 -08:00
Rimian Perkins
432b08f296 remove personal email from fixtures 
I'm writing acceptance tests against the user fixture in my plugin. It would be a good idea to use a generic email address as I'd like to respect eviltrout's privacy :)
 2017-02-13 11:29:03 +11:00
Nicolas
1deec95ccb Use natural orientation for web app manifest. 
The `any` orientation forces the rotation even when the device's screen
 rotation is disabled. Using `natural` respects that and restores the
 expected behaviour.
 2017-02-12 18:04:06 +00:00
Jeff Atwood
22c83b0a20 Merge pull request #4700 from gsambrotta/replay-btn-position 
fix replay btn position on mobile and desktop
 2017-02-11 22:21:11 -08:00
Jeff Atwood
3ee7a9266c Merge pull request #4686 from tgxworld/group_is_visible_if_user_is_group_owner 
FIX: Show groups that user is owner of on groups page.
 2017-02-11 22:18:44 -08:00
Jeff Atwood
243d8e170d Merge pull request #4702 from vinothkannans/pr-welcome/57037 
'Article' to 'DiscussionForumPosting' schema type
 2017-02-11 22:17:34 -08:00
Vinoth Kannan
1b43c209eb 'Article' to 'DiscussionForumPosting' schema type 
topic => https://meta.discourse.org/t/invalid-article-schema/57037
Replacing '[Article](https://schema.org/Article)' schema type with '[DiscussionForumPosting](https://schema.org/DiscussionForumPosting)'
 2017-02-11 18:44:40 +05:30