Commit graph

19000 commits

Author SHA1 Message Date
Régis Hanol
780c3ad755 Merge pull request #4008 from joebuhlig/master
Add tertiary color to email digests
2016-02-22 14:43:21 +01:00
Joe Buhlig
6763a9923a Added tertiary color to digest
Added hash to color in helper

Added anchor_color to topic and site name links

Styled the unsubscribe link
2016-02-22 07:02:21 -06:00
Arpit Jalan
c2caf90de6 FIX: RSS feed must have unique GUID 2016-02-22 18:28:09 +05:30
Régis Hanol
4d981cec53 FIX: don't try to optimize large PNGs (takes too much time) 2016-02-22 12:57:24 +01:00
Arpit Jalan
5f747a74a1 Update onebox version 2016-02-22 16:05:40 +05:30
Jeff Atwood
c9d19c9462 tighten up mobile profile image size 2016-02-22 02:18:34 -08:00
Jeff Atwood
2ab901bec4 adjust bad styling on mobile user page 2016-02-22 02:03:50 -08:00
Jeff Atwood
66fa836d88 we don't want a clear for notification options 2016-02-22 01:53:51 -08:00
Jeff Atwood
23063ea094 mobile needs different post body overflow handling 2016-02-22 01:40:28 -08:00
Jeff Atwood
6a6e3a6a3a FIX: add global hidden overflow on all topic bodies 2016-02-22 01:17:50 -08:00
Jeff Atwood
f6b1238d6c reduce maximum_backups default from 7 to 5 2016-02-22 00:56:26 -08:00
Guo Xiang Tan
3142eb76dc Revert "FIX: find_by_attribute method in Rails 4.5 is case insensitive."
This reverts commit 2af587005b.
2016-02-22 15:55:48 +08:00
Guo Xiang Tan
c852fb83d0 Upgrade Logster. 2016-02-22 15:18:25 +08:00
Sam
0af9e7b572 Merge branch 'master' into vdom 2016-02-22 12:25:07 +11:00
Sam
4c0a40f2b0 FIX: publish notification state when notifications are read
(this clears green and blue bubbles)
2016-02-22 12:24:51 +11:00
Sam
c404da248a Merge branch 'master' into vdom 2016-02-22 12:20:59 +11:00
Sam
d0337e7f5e FIX: clear notification bubble when notification is read 2016-02-22 12:20:41 +11:00
Sam
5a47199528 Merge pull request #3947 from khoa-le/update-locale-vietnamese
Add locale for Vietnamese
2016-02-22 11:41:37 +11:00
Régis Hanol
13e1bf849e Merge pull request #4023 from dandv/patch-1
Typo fix: "your sure"
2016-02-21 23:52:38 +01:00
Régis Hanol
87e72cb521 Merge pull request #4025 from gschlager/importer-name
Allow importers to set empty names
2016-02-21 23:52:15 +01:00
Régis Hanol
16629401fa Merge pull request #4024 from gschlager/username-suggester
FIX: Don't suggest invalid username
2016-02-21 23:51:54 +01:00
Gerhard Schlager
8a486d8cea Allow importers to set empty names 2016-02-21 23:35:47 +01:00
Gerhard Schlager
c4ec1d0fcf FIX: Don't suggest invalid username 2016-02-21 23:28:57 +01:00
Dan Dascalescu
5fdc0ebe8a Typo fix: "your sure" 2016-02-21 14:12:32 -08:00
Régis Hanol
dedbb59321 Merge pull request #4022 from gschlager/importer-patch
Don't try to import invalid websites
2016-02-21 22:47:23 +01:00
Gerhard Schlager
eb166e78b6 Don't try to import invalid websites 2016-02-21 17:38:04 +01:00
Guo Xiang Tan
ded9dc8734 Merge pull request #4021 from dandv/patch-1
Fix typo: are your sure
2016-02-21 22:09:11 +08:00
Dan Dascalescu
9aa3653e2f Fix typo: are your sure 2016-02-21 02:26:28 -08:00
Robin Ward
e848ea5a99 Depcreate PageTracker in favor of PluginAPI 2016-02-19 16:30:59 -05:00
Robin Ward
9b0b213ba2 FIX: Less safe API for icons 2016-02-19 16:03:26 -05:00
Neil Lalonde
e8d837269b FEATURE: pending flags reminder is sent as a group message to staff instead of sending an email to the contact email site setting. 2016-02-19 15:21:18 -05:00
Robin Ward
8b318f76a1 Expose decoration for plugins such as signatures 2016-02-19 14:46:29 -05:00
Robin Ward
f2f49a5e96 Ability to add text to a poster name icon 2016-02-19 14:22:36 -05:00
Jeff Atwood
6c684944c5 add link to mail-tester.com in test email 2016-02-19 09:19:36 -08:00
Neil Lalonde
97130463d6 FEATURE: show a new modal when suspended users try to log in 2016-02-19 12:19:20 -05:00
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