Commit Graph

12671 Commits

Author SHA1 Message Date
dbf2f4efec Fix bug when sso_overrides_avatar is true but no avatar_url is passed
If a user has a current avatar, and sso_overrides_avatar is true, but no avatar_url is
passed in the sso attributes, the current code errors, as it tries to parse a nil
as a URL. It seems to me valid that a third party system may not pass an avatar_url in
some cases (e.g. avatars may not be mandatory, so not all users may have them)

This might warrant a discussion about what should happen in this case; maybe the current
avatar in discourse should be removed? This branch merely stops the login process erroring.
2015-01-28 16:01:39 +00:00
4c0129ccdd PERF: slow user pages in admin. add an index for trust level 3 calculations, and memoize query results 2015-01-19 15:30:16 -05:00
7412ff4da7 FIX: suspended users are logged out when they are suspended. Show a reason for suspension when they try to log in. 2015-01-19 12:37:02 -05:00
ed714794fc Merge pull request #3116 from malexw/site-email-spelling
Fix spelling in contact_email_missing message.
2015-01-19 18:29:53 +01:00
23fe0cfb4e Fix spelling in contact_email_missing message. 2015-01-19 10:52:02 -05:00
2ae3ebc88b Merge pull request #3115 from techAPJ/patch-2
UX: add file size in CSV export notification
2015-01-19 15:22:11 +01:00
6c4d852011 Improve vBulletin importer
- FEATURE: TopicCreator now supports 'pinned_at' parameter
- FIX: 🐛 FIX TopicQuerySQL to support pinned topic older than 2010
- FIX: 🐛 Properly remove all HTML Entities from Usernames/Titles/Category Names/Groups in vBulletin importer
- FIX: 🐛 Properly handle specific vBulletin BBCode (quotes/mentions)
- FIX: 🐛 Make sure we generate a username from the name of the user instead of a fake email
- FEATURE: Allow for custom timezone in vBulletin importer
- FEATURE: Support for profile pictures/background in vBulletin importer
- FIX: 🐛 merge the categories tree to only 2 levels in vBulletin importer
2015-01-19 15:00:55 +01:00
7687c95e7b UX: add file size in CSV export notification 2015-01-19 19:21:53 +05:30
0baee98ef7 Merge pull request #3114 from techAPJ/patch-1
Simplify utf-8 conversion
2015-01-19 01:56:40 -08:00
5287669116 💄 simplify utf-8 conversion 2015-01-19 15:21:39 +05:30
dae39b5b71 missed closing paren 2015-01-19 01:29:02 -08:00
4cb6606e8c block some more dumb trackback spam from logging 2015-01-19 01:19:34 -08:00
90ff92e008 don't show self-bookmark avatar in user stream 2015-01-19 01:08:39 -08:00
3f7fa46af7 remove unnecessary site header title height 2015-01-19 00:44:23 -08:00
3d0e59942c IE9 doesn't support console.log 2015-01-19 00:33:51 -08:00
d0a32b28b9 remove max_stars_per_day site setting 2015-01-19 00:07:26 -08:00
8fe2dd9186 copy improvement on invites 2015-01-19 00:03:22 -08:00
d3ebb9e711 Merge pull request #3112 from techAPJ/patch-1
FIX: convert UTF8 charset to UTF-8
2015-01-18 22:56:44 -08:00
214ed2f1f0 Merge pull request #3113 from edgibbs/move_vagrant_box_to_discourse_url
FIX: Move vagrant box to discourse hosting
2015-01-18 22:14:02 -08:00
d818fa4d60 Move vagrant box to discourse hosting
This change just moves the Vagrant box to the discourse account at
Atlas.
2015-01-18 21:59:36 -08:00
fad9ca7b36 FIX: convert UTF8 charset to UTF-8 2015-01-19 10:09:17 +05:30
4fd1fdeb01 Merge pull request #3108 from fantasticfears/patch-10
Fix guidelines_topic anchor point
2015-01-18 09:28:42 +01:00
eedb977c58 Fix guidelines_topic anchor point 2015-01-17 21:45:36 +08:00
5d711db45d Merge pull request #3103 from riking/log_username_changes
Log username changes
2015-01-17 11:47:37 +01:00
1ab0d6bd82 FEATURE: Log username changes by staff
Also fix the tests for changing username
2015-01-17 02:26:12 -08:00
db5f2ae88c Fix relative URLs in plain text emails 2015-01-17 02:08:03 -08:00
7aad487d4c Merge pull request #3093 from edgibbs/update_vagrant_box
FIX: Update vagrant box for ruby and phantomjs versions
2015-01-17 01:43:21 -08:00
1591068226 add commented out SSL section to nginx config 2015-01-17 01:26:21 -08:00
a2e77d8bf4 better regex JS err suppression for Logster 2015-01-16 23:30:06 -08:00
18215f90d0 more flexible regex to block empty JS Logster errors 2015-01-16 17:36:18 -08:00
77ae0b4f7f block empty JS errors from Logster 2015-01-16 17:28:50 -08:00
37d73ec488 Support customizing the composer below the textarea 2015-01-16 12:52:40 -05:00
24b282e5e9 clicking expanded post date also jumps to post 2015-01-16 03:06:19 -08:00
7a86abd105 Merge pull request #3084 from jmay/group-managers
table & model changes for group managers with permission to edit members
2015-01-16 12:02:38 +01:00
2b877e4fc4 post expansion arrow CSS cleanup 2015-01-16 02:24:49 -08:00
d890248963 normalize post expansion arrow on right 2015-01-16 01:56:36 -08:00
992ad7991b UX: change private category to lock glyph 2015-01-15 14:07:21 -08:00
987504c6ab Rename no_js layout to no_ember
While *sometimes* `no_js` was used for visitors without js (for example
disabling it on your browser) it was also used for some pages that were
disabled to JS capable browsers, including the 404 page.

Even worse, sometimes it was used on pages that *had* Javascript, such
as our `/activate-account` route. It has been renamed to `no_ember` to
indicate what it really is, a layout for the site that doesn't load our
Ember.js application.
2015-01-15 15:56:53 -05:00
e4e239c159 Add some safety when rendering a dropdown button to make sure it has
content.
2015-01-15 15:43:37 -05:00
4a11bb5227 FIX: on topic page, don't try to render post counts for a deleted user 2015-01-15 15:39:34 -05:00
dc801bb442 Merge pull request #3102 from techAPJ/patch-2
Add username and date-time in exported file name
2015-01-15 15:35:06 -05:00
505fa9f1cf FIX: 🐛 Saving the same custom field array twice would raise an error 2015-01-15 15:31:50 -05:00
3ab2f105b4 switch no_js view back to old layout 2015-01-15 12:29:37 -08:00
91e0c0e034 copyedit on disable emails 2015-01-15 12:17:28 -08:00
c619aed8f9 💄 add username and date-time in exported file name 2015-01-16 01:39:46 +05:30
9c977a08cd FIX: 🐛 supress the category badge even when refreshing 2015-01-15 14:59:51 -05:00
a2b284a0a4 table & model changes for group managers with permission to edit membership 2015-01-15 11:44:42 -08:00
20d2908c50 FEATURE: add a global notice whenever emails are disabled (disable_emails site setting) 2015-01-15 19:32:19 +01:00
6c4c542ae3 FIX: Triggering a refresh while subcategory lists was broken.
It would then list all categories isntead of the subcategory you were
viewing at that time.
2015-01-15 13:01:35 -05:00
b4e5937850 FIX: 🐛 ensure emoji are case insensitive 2015-01-15 19:00:55 +01:00