Commit graph

6934 commits

Author SHA1 Message Date
Robin Ward
e2ea148e38 FEATURE: Allow customHTML helper to resolve to a template if it
exists.
2014-03-06 13:32:32 -05:00
Régis Hanol
11d91328ab Merge pull request #2056 from vikhyat/pm-likes
Don't suppress like notifications in private messages
2014-03-06 14:53:27 +01:00
Vikhyat Korrapati
944246f4af Add test to ensure creation of like notification in a PM. 2014-03-06 19:07:26 +05:30
Régis Hanol
ac99947979 BUGFIX: topic specs were dependent on Time.now
which would fail when DST was around
2014-03-06 12:44:52 +01:00
Régis Hanol
aeafca6649 Merge pull request #2061 from nschonni/use-loops-for-bbcode
Use for loop to shrink bbcode
2014-03-06 11:12:42 +01:00
Régis Hanol
909edadc1f Merge pull request #2063 from CirnoKaster/patch-1
fix translate mistake
2014-03-06 11:11:54 +01:00
CirnoKaster
334ae44fb7 fix translate mistake
Line 626
minor change : favourite > starred
2014-03-06 15:02:55 +08:00
Nick Schonning
978c120279 Use for loop to shrink bbcode
Dry out the long set of similar selectors
2014-03-06 01:45:31 -05:00
Jeff Atwood
cf90f0815f Merge pull request #2060 from nschonni/remove-units-for-zero-values
Remove units for zero values
2014-03-05 22:21:58 -08:00
Nick Schonning
4f1a517490 Remove units for zero values
Units are ignored for zero values in CSS except for a few edge cases.
2014-03-06 01:14:51 -05:00
Jeff Atwood
15c46af838 Merge pull request #2059 from nschonni/remove-empty-rules
Remove empty SCSS rules
2014-03-05 22:07:40 -08:00
Nick Schonning
f43072135d Remove empty SCSS rules 2014-03-06 01:02:00 -05:00
Jeff Atwood
bf6d645c38 Merge pull request #2058 from awesomerobot/master
modifying user profile to better support image backgrounds
2014-03-05 20:59:00 -08:00
Kris Aubuchon
699692168d modifying user profile to better support image backgrounds 2014-03-05 23:22:24 -05:00
Jeff Atwood
c747e10c7f Merge pull request #2057 from awesomerobot/master
adding basic :focus style in for buttons in Firefox
2014-03-05 19:32:10 -08:00
Kris Aubuchon
899a5a87cd adding basic :focus style in for buttons in Firefox 2014-03-05 22:18:42 -05:00
Robin Ward
2b0151afe9 BUGFIX: Editing a category would break categories for the current user
session.
2014-03-05 17:33:14 -05:00
Régis Hanol
ca12ea42a7 FEATURE: only redirect new users to top page for a limited period
That period is defined by the `redirect_new_users_to_top_page_duration`
site setting and defaults to 7 days.
2014-03-05 22:11:01 +01:00
Robin Ward
b0f3061113 It doesn't make sense to redirect when not logged in on a non-GET
request. We should report a failure then. They likely logged out or
in another tab or timed out.
2014-03-05 12:12:53 -05:00
Régis Hanol
2a99f1b15e BUGFIX: HOME/END keyboard shortcuts on non-topic pages
This make sure both HOME/END keyboard shortcuts are only applied when viewing a topic
2014-03-05 16:08:45 +01:00
Régis Hanol
bce4130d39 Merge pull request #2036 from ArmedGuy/profile-backgrounds
FEATURE: Profile Backgrounds
2014-03-05 16:00:49 +01:00
Johan Jatko
98c479c3c4 FEATURE: Profile Backgrounds
Shares a modified codebase with avatars called "user_image"
2014-03-05 15:10:44 +01:00
Régis Hanol
aadf807054 Merge pull request #2055 from ligthyear/allow-html-in-poll-options
Allow poll options to contain rendered code
2014-03-05 10:48:03 +01:00
Régis Hanol
386b1589f2 Bump the JS test suite timeout to 2 minutes
So that it can run properly on my 3-year old MBA
2014-03-05 10:45:57 +01:00
Benjamin Kampmann
a2512ecf74 Allow poll options to contain rendered code by not escaping it. 2014-03-05 10:45:49 +01:00
Sam
edf86a207b fix build 2014-03-05 14:26:42 +11:00
Sam
adb6541635 FEATURE: mailing list mode always available 2014-03-05 14:21:53 +11:00
Sam
69b498da24 Merge pull request #2034 from birarda/custom_username_length
allow for custom username length via site setting
2014-03-05 12:06:23 +11:00
Stephen Birarda
4a2dab9c5e allow for custom min_username_length
change constant in user to be global range and not default
2014-03-04 16:37:05 -08:00
Sam
ea553202f0 Merge pull request #2033 from birarda/master
add option to override user attributes from SSO payload
2014-03-05 11:33:32 +11:00
Sam
b4688fc4c5 Merge pull request #2046 from staryume/patch-4
Update client.zh_TW.yml for better Tradtional Chinese translations
2014-03-05 11:30:56 +11:00
Sam
eb3a535c38 Merge pull request #2038 from fantasticfears/poster_expansion
poster_expansion will only slide down now.
2014-03-05 11:27:03 +11:00
Sam
4289c909b8 Merge pull request #2047 from jpsullivan/patch-2
Typo fix
2014-03-05 11:23:16 +11:00
Sam
24356cd807 Merge pull request #2050 from verg/unify_scroll_to_first_post
Scroll to Top of Topic instead of Reloading
2014-03-05 11:22:54 +11:00
Sam
3be310a0cb Merge pull request #2049 from nbalonso/spanish-translation
updated spanish translation
2014-03-05 11:22:16 +11:00
Sam
73e6ee151a Merge pull request #2053 from vikhyat/travis-plugins
Add plugin specs to travis
2014-03-05 11:21:00 +11:00
Sam
b0fc834e09 Merge pull request #2054 from ligthyear/fix-broken-cats
BugFix: email-in on categories wasn't null-ed properly
2014-03-05 11:16:20 +11:00
Benjamin Kampmann
bf77c84095 BugFix: email-in on categories wasn't null-ed properly
Causing a problem if two categories got saved with an empty string because the corresponding Database constraint on the index would complain about dublicate values
2014-03-05 00:42:05 +01:00
Jeff Atwood
d5ec409434 add Transifex link to header of translation files 2014-03-04 14:35:23 -08:00
Robin Ward
88772cce5a Version bump to v0.9.8.9 2014-03-04 14:54:52 -05:00
Jeff Atwood
1920f44fdf massive update to admin quick start guide 2014-03-04 11:52:19 -08:00
Robin Ward
aa3f7f764d You can only reuse email tokens within 24 hours. 2014-03-04 14:03:04 -05:00
Vikhyat Korrapati
d67a33bed9 Add plugin specs to travis. 2014-03-05 00:17:34 +05:30
Robin Ward
15c9c90533 When links have thousands of clicks, display them like 3.3K 2014-03-04 13:44:53 -05:00
Robin Ward
e276045112 TRIVIAL: Change some variables to self 2014-03-04 13:09:11 -05:00
Robin Ward
90a1cb5bec Change email token expiry to 24 hours instead of 1 week 2014-03-04 13:02:48 -05:00
Stephen Birarda
c3eb2025d8 add option to override user attributes from SSO payload
add an external_username attribute for username from SSO payload

repair the field name in SingleSignOnRecord migration

move setting of external_username for sso to controller

add settings toggle to override username/email from SSO payload

fix changing of external username after override toggle

complete tests and logic for sso override

add some extra context to username override option

add external_email and external_name to single sign on record

add setting for name override from SSO payload

complete override with stored external_email and external_name

add missing checks to tests

remove an unneeded describe block

break up a monster method for single sign on

fixes for sso attribute override after failed tests
2014-03-04 09:52:21 -08:00
Robin Ward
5e6764e9c9 FIX: Remove update, should fix issue with broken specs 2014-03-04 12:47:14 -05:00
Régis Hanol
9f2b48014c Update the members of the Core Discourse Team 2014-03-04 16:48:06 +01:00
Régis Hanol
23aa478473 Merge pull request #2052 from vikhyat/plugin-tests
Don't run plugin gem tests
2014-03-04 11:48:40 +01:00