Commit graph

8067 commits

Author SHA1 Message Date
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
Vikhyat Korrapati
56a7a68238 Don't run plugin gem tests. 2014-03-04 14:30:35 +05:30
Jeff Atwood
744eecfe9f add keyboard shortcuts to progress bar tooltips 2014-03-04 00:31:40 -08:00
Jeff Atwood
2b343a9d94 minor improvements to welcome message 2014-03-04 00:29:48 -08:00
Jeff Atwood
d976623303 clarify use_https setting 2014-03-03 23:50:10 -08:00
Jeff Atwood
8010ed3ba1 we don't use the term "nickname" use -> "username" 2014-03-03 23:30:43 -08:00
Sam
d969958b18 PERF: workaround aweful sass compiling perf with HUGE css files 2014-03-04 17:16:53 +11:00
Sam
f602c568e2 PERF: speed up css precompilation by caching 2014-03-04 16:55:23 +11:00
verg
7f440532a7 Jump to First Post instead of Reloading Topic 2014-03-03 19:09:42 -05:00
Robin Ward
28f84ef0e1 TEXT: Change to "Dismiss New" 2014-03-03 17:15:53 -05:00
Robin Ward
a2b0e2b50f BUGFIX: Fix ailing tests 2014-03-03 16:24:20 -05:00
Noel B. A
2fd49934e8 updated spanish translation
still there are a ton of things to do
2014-03-04 00:24:08 +03:00
Robin Ward
4b61d6af28 BUGFIX: new date was incorrect 2014-03-03 16:11:59 -05:00
Robin Ward
f9cd354a2c FEATURE: Button to reset new 2014-03-03 15:47:01 -05:00
Robin Ward
3abe84941f FEATURE: Add new_since column to UserStat so we can reset the "New"
date.
2014-03-03 15:47:00 -05:00
Sam
5c3f2feed4 BUGFIX: recovery code in case an unknown job is scheduled 2014-03-04 07:37:12 +11:00
Régis Hanol
a05606d1ff Merge pull request #2048 from awesomerobot/master
fixing an issue where a horiztonal scrollbar appears
2014-03-03 19:55:22 +01:00
Kris Aubuchon
3d39dd3137 fixing an issue where a horiztonal scrollbar appears 2014-03-03 13:53:07 -05:00
Robin Ward
02ea67eece BUGFIX: A MDTest was conflicting with BBCode support for upper case 2014-03-03 13:14:11 -05:00
Robin Ward
158487dfc2 FIX: Clean up next/prev rel links 2014-03-03 12:56:37 -05:00
Robin Ward
6143753fef Support uppercase bbcode too. 2014-03-03 11:59:57 -05:00