Commit graph

12691 commits

Author SHA1 Message Date
Robin Ward
514a45b0c1 SECURITY: Don't whitelist codepen as it is a potential vector for abuse 2015-01-21 13:57:28 -05:00
Neil Lalonde
0a24c3cb5f Merge pull request #3118 from techAPJ/update-translations
Update Translations
2015-01-21 12:57:30 -05:00
Arpit Jalan
a144e61440 Update Translations 2015-01-21 22:58:30 +05:30
Robin Ward
48c7e20d80 DRY up the displaying of topic categories. Should not be duplicated. 2015-01-21 12:20:39 -05:00
Robin Ward
df8880a71a FIX: (for IE9) if console.log doesn't exist, make it an noop. 2015-01-21 11:53:41 -05:00
Jeff Atwood
1ed34be1b9 make topic list pin color consistent with lock 2015-01-21 03:15:56 -08:00
Régis Hanol
eecc573fbc FIX: don't break import when raw can't be preprocessed (vBulletin importer) 2015-01-21 09:36:46 +01:00
Jeff Atwood
e5cad726fd further tweaks to get post selection OK on mobile 2015-01-20 22:51:15 -08:00
Jeff Atwood
c4ddc5b983 quick mobile css fix for post selection buttons 2015-01-20 17:28:06 -08:00
Jeff Atwood
aa423212a0 make topic list bookmark color consistent with lock 2015-01-20 16:39:11 -08:00
Robin Ward
614ad4daa7 UX: Formatting on search categories looked weird 2015-01-20 17:51:12 -05:00
Robin Ward
7cc96bdac5 FIX: v8 issue with regexp 2015-01-20 17:29:59 -05:00
Robin Ward
649dfd8d23 Revert "Convert html.js to ES6 module format"
This reverts commit 60523d8e02.
2015-01-20 16:13:42 -05:00
Robin Ward
60523d8e02 Convert html.js to ES6 module format 2015-01-20 16:07:29 -05:00
Robin Ward
2a6657bf53 Merge pull request #3090 from ojab/master
`bundle update rbtrace` for mri-2.2.0 compatibility
2015-01-20 15:21:56 -05:00
Robin Ward
e3b4d12e46 Merge pull request #3110 from riking/notification_lanaguage
FIX: Respect user locale for reply notifications
2015-01-20 15:17:18 -05:00
Robin Ward
350554e198 UX: Change category badge style to use stripes 2015-01-20 14:56:06 -05:00
Robin Ward
f3c9310e12 Merge pull request #3117 from techAPJ/patch-1
FEATURE: rate limit invites for non-staff users
2015-01-20 10:45:00 -05:00
Neil Lalonde
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
Arpit Jalan
5e751ce90a FEATURE: 🎁 rate limit invites for non-staff users 2015-01-20 01:12:24 +05:30
Neil Lalonde
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
Régis Hanol
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
Alex Williams
23fe0cfb4e Fix spelling in contact_email_missing message. 2015-01-19 10:52:02 -05:00
Régis Hanol
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
Régis Hanol
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
Arpit Jalan
7687c95e7b UX: add file size in CSV export notification 2015-01-19 19:21:53 +05:30
Jeff Atwood
0baee98ef7 Merge pull request #3114 from techAPJ/patch-1
Simplify utf-8 conversion
2015-01-19 01:56:40 -08:00
Arpit Jalan
5287669116 💄 simplify utf-8 conversion 2015-01-19 15:21:39 +05:30
Jeff Atwood
dae39b5b71 missed closing paren 2015-01-19 01:29:02 -08:00
Jeff Atwood
4cb6606e8c block some more dumb trackback spam from logging 2015-01-19 01:19:34 -08:00
Jeff Atwood
90ff92e008 don't show self-bookmark avatar in user stream 2015-01-19 01:08:39 -08:00
Jeff Atwood
3f7fa46af7 remove unnecessary site header title height 2015-01-19 00:44:23 -08:00
Jeff Atwood
3d0e59942c IE9 doesn't support console.log 2015-01-19 00:33:51 -08:00
Jeff Atwood
d0a32b28b9 remove max_stars_per_day site setting 2015-01-19 00:07:26 -08:00
Jeff Atwood
8fe2dd9186 copy improvement on invites 2015-01-19 00:03:22 -08:00
Jeff Atwood
d3ebb9e711 Merge pull request #3112 from techAPJ/patch-1
FIX: convert UTF8 charset to UTF-8
2015-01-18 22:56:44 -08:00
Jeff Atwood
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
Ed Gibbs
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
Arpit Jalan
fad9ca7b36 FIX: convert UTF8 charset to UTF-8 2015-01-19 10:09:17 +05:30
Régis Hanol
4fd1fdeb01 Merge pull request #3108 from fantasticfears/patch-10
Fix guidelines_topic anchor point
2015-01-18 09:28:42 +01:00
riking
03fd275b45 FIX: Respect user locale for reply notifications 2015-01-17 23:17:50 -08:00
Erick Guan
eedb977c58 Fix guidelines_topic anchor point 2015-01-17 21:45:36 +08:00
Régis Hanol
5d711db45d Merge pull request #3103 from riking/log_username_changes
Log username changes
2015-01-17 11:47:37 +01:00
riking
1ab0d6bd82 FEATURE: Log username changes by staff
Also fix the tests for changing username
2015-01-17 02:26:12 -08:00
Jeff Atwood
db5f2ae88c Fix relative URLs in plain text emails 2015-01-17 02:08:03 -08:00
Jeff Atwood
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
Jeff Atwood
1591068226 add commented out SSL section to nginx config 2015-01-17 01:26:21 -08:00
Jeff Atwood
a2e77d8bf4 better regex JS err suppression for Logster 2015-01-16 23:30:06 -08:00
Jeff Atwood
18215f90d0 more flexible regex to block empty JS Logster errors 2015-01-16 17:36:18 -08:00
Jeff Atwood
77ae0b4f7f block empty JS errors from Logster 2015-01-16 17:28:50 -08:00