Guo Xiang Tan
68bfecef8f
FIX: Broken categories controller specs.
2015-12-07 00:09:02 +08:00
Régis Hanol
4ed93eee06
Merge pull request #3912 from tgxworld/fix_category_logging
...
FIX: Admin logging should not log permissions if none has been set.
2015-12-06 10:06:49 +01:00
Guo Xiang Tan
8b6b3cf858
FIX: Admin logging should not log permissions if none has been set.
2015-12-06 15:29:13 +08:00
Arpit Jalan
ad98f270c9
FIX: preserve redirect URL when logging in via social logins
2015-12-05 15:08:42 +05:30
Sam
c82b33600a
FIX: serialize current user fields in standard user serializer
2015-12-05 17:50:03 +11:00
Robin Ward
d97b2382e6
Don't show placeholders on Android
2015-12-04 17:19:54 -05:00
Neil Lalonde
aa54006ad5
add div under poster avatar so people can add badges without a plugin
2015-12-04 16:49:08 -05:00
Robin Ward
420e362bdb
FIX: Issues with summaries and our Array
2015-12-04 16:36:16 -05:00
Robin Ward
63ba6c78af
FIX: Jump to previously loaded post was broken
2015-12-04 16:20:43 -05:00
Robin Ward
6d38640645
FIX: Remove console.log
2015-12-04 16:00:47 -05:00
Robin Ward
255a5be015
Revert "Cleaner implementation of postsWithPlaceholders and more tests."
...
This reverts commit 4c0670a109
2015-12-04 15:59:46 -05:00
Robin Ward
a51c91ac05
Revert "FIX: Errors with summary views and placeholders"
...
This reverts commit 5be3bf80eb
2015-12-04 15:59:39 -05:00
Neil Lalonde
6a9f288ab3
that TODO is done
2015-12-04 15:13:35 -05:00
Robin Ward
5be3bf80eb
FIX: Errors with summary views and placeholders
2015-12-04 15:10:13 -05:00
Robin Ward
4c0670a109
Cleaner implementation of postsWithPlaceholders and more tests.
2015-12-04 15:10:13 -05:00
Neil Lalonde
08e10c2a9d
FEATURE: Zoho importer
2015-12-04 15:06:46 -05:00
Robin Ward
80bdc7333c
UX: Show category description beside logo
2015-12-04 12:36:09 -05:00
Robin Ward
83be335c54
FIX: Firefox wasn't focusing on d-editor
2015-12-04 12:13:50 -05:00
Robin Ward
40c8d39137
FEATURE: Reply Placeholders in Stream
2015-12-04 10:02:58 -05:00
Robin Ward
1987a35daf
Update postream to use ES2015 syntax and decorators
2015-12-04 10:02:46 -05:00
Robin Ward
949f51ffe0
Remove ajax stubbing from post-stream tests
2015-12-04 10:02:37 -05:00
Jeff Atwood
80cf661075
add code of conduct to project
2015-12-04 03:14:50 -08:00
Arpit Jalan
dd8b773059
UX: use pastel blue background for topic education pop-ups
2015-12-04 09:19:55 +05:30
Arpit Jalan
076ed66e69
FIX: switch to iframe when embedding YouTube playlist
2015-12-04 08:16:22 +05:30
Sam
7917316f6f
FEATURE: display warning on top of composer for group mentions
...
If users attempt to mention a group that is "mentionable" display a warning
informing them that people will be notified.
2015-12-04 13:41:07 +11:00
Jeff Atwood
18c9d966a1
reverse order of unsubscribe link options
...
should be in order that we want the user to do it
2015-12-03 16:14:43 -08:00
Jeff Atwood
89d7c56fb2
email footer copy improvements
2015-12-03 16:00:24 -08:00
Jeff Atwood
d84fa69ade
minor copyedit on dismiss unread
2015-12-03 15:31:56 -08:00
Jeff Atwood
daada2b0d1
minor copyedits on flagging
2015-12-03 15:13:29 -08:00
Arpit Jalan
f38abbe279
FIX: onebox links should respect nofollow settings
2015-12-04 01:59:12 +05:30
Neil Lalonde
1b510447db
FIX: chrome 47 started showing square outline around avatar on user cards
2015-12-03 10:34:11 -05:00
Régis Hanol
72e7271687
FIX: '.intersect?' isn't available in older version of ruby
2015-12-02 17:25:01 +01:00
Régis Hanol
f4184aea33
FIX: properly re-compute # of voters in multiple-choice polls
2015-12-02 12:33:34 +01:00
Arpit Jalan
19f1314a3a
remove unused locale strings
2015-12-02 13:07:58 +05:30
Sam
7f60693b46
add missing filter
2015-12-02 16:16:19 +11:00
Sam
d3c9050e0f
improve copy
2015-12-02 15:57:50 +11:00
Sam
9899e8d4a5
FEATURE: First class messages to groups, you can select a group as a target of a message
2015-12-02 15:49:43 +11:00
Sam
fbffe28772
es6 migration and fixes
2015-12-02 11:15:22 +11:00
Neil Lalonde
ddd4500d7a
FIX: admin reports were broken
2015-12-01 18:31:30 -05:00
Sam
6577f3c1ed
Merge pull request #3909 from humzashah/reduced-time-operation
...
reused value of `Time.now` in a method
2015-12-02 09:01:22 +11:00
Sam
f66feb0ad0
Merge pull request #3847 from andyw8/prepare-for-separate-spec-helpers
...
Prepare for separate RSpec helper files
2015-12-02 08:59:52 +11:00
Syed Humza Shah
d0955e02d6
reused value of Time.now in a method
...
`Time.now` was being used to fetch the current time, twice in the
same line. This commit stores the time value in a variable and
reuses it instead of generating/fetching it for the second time.
Additionally, a guard clause in the same method is substituted by
an `if/else/end` block for clarity.
2015-12-01 21:06:37 +00:00
Andy Waite
3e50313fdc
Prepare for separation of RSpec helper files
...
Since rspec-rails 3, the default installation creates two helper files:
* `spec_helper.rb`
* `rails_helper.rb`
`spec_helper.rb` is intended as a way of running specs that do not
require Rails, whereas `rails_helper.rb` loads Rails (as Discourse's
current `spec_helper.rb` does).
For more information:
https://www.relishapp.com/rspec/rspec-rails/docs/upgrade#default-helper-files
In this commit, I've simply replaced all instances of `spec_helper` with
`rails_helper`, and renamed the original `spec_helper.rb`.
This brings the Discourse project closer to the standard usage of RSpec
in a Rails app.
At present, every spec relies on loading Rails, but there are likely
many that don't need to. In a future pull request, I hope to introduce a
separate, minimal `spec_helper.rb` which can be used in tests which
don't rely on Rails.
2015-12-01 20:39:42 +00:00
Robin Ward
c8de38c553
Ignore assertions.js for now.
2015-12-01 15:37:16 -05:00
Robin Ward
2006be41cf
Split up pretender a bit. It was getting unwieldly.
2015-12-01 15:31:15 -05:00
Régis Hanol
868079f2a8
remove tnation importer (we only want to keep generic importers)
2015-12-01 15:40:16 +01:00
Régis Hanol
26006f12a2
Increased 'error resistance' in base importer class
2015-12-01 15:38:21 +01:00
Régis Hanol
a8e69c2fd6
Merge pull request #3908 from gdpelican/topic-compat-for-action-summary
...
Allow compat with ActionSummary for topic model
2015-12-01 15:09:26 +01:00
James Kiesel
71d7a96fd1
Allow compat with ActionSummary for topic model
2015-12-01 22:07:52 +08:00
Régis Hanol
5b9594277a
skip most post validations for staged accounts
2015-12-01 10:40:23 +01:00
