Guo Xiang Tan
c2018ded5d
Revert "SECURITY: Upgrade Sprockets."
...
This reverts commit 1a0a364503
2016-02-19 15:55:44 +08:00
Guo Xiang Tan
4858187b0e
UX: Don't display span if there is no count.
2016-02-19 15:55:43 +08:00
Guo Xiang Tan
afa4e58efd
Revert "SECURITY: Upgrade Sprockets."
...
This reverts commit 1a0a364503
2016-02-19 15:52:47 +08:00
Guo Xiang Tan
5e329898f6
UX: Don't display span if there is no count.
2016-02-19 15:33:07 +08:00
Sam
ecca7b69bb
Merge branch 'master' into vdom
2016-02-19 18:28:57 +11:00
Sam
665a87a32f
UX: revert full page search focus on magnifying glass click
2016-02-19 18:28:36 +11:00
Guo Xiang Tan
c756ddbc2e
Merge pull request #4019 from tgxworld/update_sprockets
...
SECURITY: Upgrade Sprockets.
2016-02-19 15:26:41 +08:00
Guo Xiang Tan
7a261e5e4f
UX: Hide close mobile navigation on click.
2016-02-19 15:22:41 +08:00
Sam
7bc1db5f27
Merge branch 'master' into vdom
2016-02-19 17:43:45 +11:00
Sam
f18f6dc31f
correct spec to stop checking for empty category suppression
2016-02-19 17:43:26 +11:00
Sam
8493057942
Merge branch 'master' into vdom
2016-02-19 17:09:28 +11:00
Sam
02002afd3f
clean up hack
2016-02-19 17:08:08 +11:00
Sam
f33cfb698c
Merge branch 'master' into vdom
2016-02-19 17:03:42 +11:00
Sam
c230c11707
FEATURE: stop removing empty categories users have access to from /categories page
...
This is particularly important for heirarchies of categories where a parent is empty
Also, if we hide the blank category, how are we going to create the first topic?
Old behavior was hacky.
2016-02-19 17:03:23 +11:00
Sam
29c2423daf
Merge branch 'master' into vdom
...
# Conflicts:
# app/assets/javascripts/discourse/views/post.js.es6
2016-02-19 14:09:31 +11:00
Sam
ab06f86fbe
FEATURE: allow users to control how many previous replies they get
...
- always means we always send previous replies with every email
- never means we do not
- "unless previously sent" ... is the default, in which we only email you each reply once
The default_email_previous_replies site setting can control this toggle
2016-02-19 13:57:07 +11:00
Sam
3de390c067
quote fields in case they are still in the db
2016-02-19 13:57:07 +11:00
Guo Xiang Tan
1a0a364503
SECURITY: Upgrade Sprockets.
...
* Advisory: CVE-2014-7819
* URL: https://groups.google.com/forum/#!topic/rubyonrails-security/doAVp0YaTqY
2016-02-19 10:10:25 +08:00
Régis Hanol
e204144a58
UsernameValidator error messages weren't matching the code
2016-02-18 23:19:14 +01:00
Robin Ward
e277b24671
Support for multiple emojis at once
2016-02-18 17:10:27 -05:00
Robin Ward
4d599612a2
Support for emoji poster icons
2016-02-18 17:03:18 -05:00
Robin Ward
6935925f10
Update Polls plugin to work with new Plugin API
2016-02-18 15:23:43 -05:00
Robin Ward
f6aa1ac37a
Migrate onToolbarCreate to the DiscourseAPI
2016-02-18 15:23:43 -05:00
Robin Ward
7b8e313dac
Remove unncessary CP
2016-02-18 15:23:43 -05:00
Hung Thinh
acad93f431
Create client.vi_VN.yml
...
Vietnamese file : translate for use
2016-02-19 02:26:01 +07:00
Neil Lalonde
283ff4c7f8
move code for bulk adding users to a group from controller to model
2016-02-18 14:03:08 -05:00
Régis Hanol
abc41c7d5b
FIX: sharing a post was broken
2016-02-18 19:28:00 +01:00
Régis Hanol
8a1a9f60a2
FIX: double click counters
2016-02-18 18:42:10 +01:00
Robin Ward
f77ec0b610
FIX: broken tests
2016-02-18 12:19:00 -05:00
Robin Ward
46e4768971
FIX: highlight.js is used, but for highlighting text, not code.
2016-02-18 12:19:00 -05:00
Robin Ward
849c99f83d
Remove Discourse.Mobile constants
2016-02-18 12:19:00 -05:00
Robin Ward
ef75f87c8b
Remove unused file
2016-02-18 12:19:00 -05:00
Régis Hanol
3b9223c5da
bump email_reply_trimmer to latest version
2016-02-18 16:56:45 +01:00
Sam
b9bcdb984a
Merge branch 'master' into vdom
2016-02-18 16:57:40 +11:00
Sam
f0e942f647
PERF: move 3 more option columns out of the user table
2016-02-18 16:57:22 +11:00
Sam
b11e6ec38e
Merge branch 'master' into vdom
2016-02-18 13:20:55 +11:00
Sam
f9c5cded6f
Correct live refresh routine for notifications
2016-02-18 13:20:22 +11:00
Robin Ward
c0a6e34610
API for extra post menu buttons and support for solved button
2016-02-17 15:56:30 -05:00
Robin Ward
98f4b3f8a9
FIX: Bad merge
2016-02-17 12:00:08 -05:00
Régis Hanol
52a6682690
FIX: don't create an EmailLog when we can't send a digest
2016-02-17 17:31:46 +01:00
Régis Hanol
532fb7ea9d
fix smoke tests
2016-02-17 11:57:06 +01:00
Régis Hanol
8893d711e0
FEATURE: new pop3 polling configuration admin dashboard check
2016-02-17 11:25:49 +01:00
Régis Hanol
2f926cfdd3
only drop users table columns if they exists
2016-02-17 11:02:44 +01:00
Sam
1e131a120c
Merge branch 'master' into vdom
2016-02-17 18:39:11 +11:00
Sam
8981ca41f0
correct acceptance test
2016-02-17 18:38:57 +11:00
Sam
a766f71881
Merge branch 'master' into vdom
2016-02-17 18:14:12 +11:00
Sam
a5c5ac12fb
correct spec
2016-02-17 18:13:57 +11:00
Sam
e8f76c335a
Merge branch 'master' into vdom
2016-02-17 18:10:12 +11:00
Sam
6912aa9fd9
Remove superflous columns from the users table
2016-02-17 18:08:25 +11:00
Sam
bbbb09a6fb
FEATURE: start tracking information about migrations that run
...
This commit adds a new tracking table that lets us know
- When a migration ran
- What version Discourse was at
- How long it took
- What version Rails was at
The built in tracking in Rails is very limited, does not track this info
2016-02-17 18:08:25 +11:00
