Commit Graph

8714 Commits

Author SHA1 Message Date
Arpit Jalan
725861f344 FIX: move draft cleanup to the dedicated method and add test 2015-06-03 14:35:54 +05:30
Sam Saffron
89b475e538 FEATURE: clean up microdata breadcrumb
* do not include any breadcrumb for uncategorized
* do not include the work "Categories" as a breadcrumb
2015-06-03 18:17:45 +10:00
Arpit Jalan
acf6c27c65 UX: show category badge underneath title in user stream 2015-06-03 12:35:11 +05:30
Robin Ward
34acb805a4 FIX: When navigating back to the user's profile page items were missing 2015-06-02 21:30:36 -04:00
Robin Ward
42f2cd83db Run cleanDOM even when swapping out models 2015-06-02 21:13:11 -04:00
Jeff Atwood
1c0610427d UX: remove dark background on expanded replies 2015-06-02 14:42:34 -07:00
Robin Ward
92cddfa598 Basic support for server side plugin outlets 2015-06-02 14:28:12 -04:00
Robin Ward
f3ff435a62 FIX: Incorrect logo showing up on home page after focus 2015-06-02 12:36:23 -04:00
Robin Ward
f28719fd85 FIX: Incorrect capitalization. No idea how it didn't fail! 2015-06-02 12:02:48 -04:00
Régis Hanol
9d4c53c882 FIX: custom emoji autocomplete 2015-06-02 17:48:19 +02:00
Neil Lalonde
8449896f3d more bullet category vertical alignment fussing 2015-06-02 10:50:33 -04:00
Jeff Atwood
fa963e8f38 Revert "Revert "FIX: new task to delete old drafts weekly""
This reverts commit c987a1d571.
2015-06-02 04:26:01 -07:00
Sam Saffron
c987a1d571 Revert "FIX: new task to delete old drafts weekly"
This reverts commit fcaed7a00d.
2015-06-02 20:30:06 +10:00
Sam Saffron
0fd1974838 FIX: leaving around useless drafts after posting 2015-06-02 20:28:33 +10:00
Sam Saffron
d459cb95dc FIX: when advancing draft sequence remove old drafts 2015-06-02 20:28:33 +10:00
Jeff Atwood
afafa30989 Merge pull request #3514 from techAPJ/patch-1
FIX: new task to delete old drafts weekly
2015-06-01 20:21:05 -07:00
Arpit Jalan
fcaed7a00d FIX: new task to delete old drafts weekly 2015-06-02 08:39:27 +05:30
awesomerobot
93de39f1da a few color variable fixes for the topic map 2015-06-01 21:13:37 -04:00
Régis Hanol
64e73e98fb FIX: allow the cooked_post_processor to download external uploads 2015-06-01 20:08:41 +02:00
Robin Ward
72f7c26514 UX: Close user card right away when navigating to a user. 2015-06-01 12:40:53 -04:00
Robin Ward
b2a7411620 FIX: decorateCooked was not being applied to embedded posts 2015-06-01 11:58:50 -04:00
Régis Hanol
81a699e2b0 better support for mixed content 2015-06-01 17:49:58 +02:00
Sam
b2b4af213c UX: clean up title for user avatar hover in header 2015-06-01 17:08:19 +10:00
Sam
9910dc041f Merge pull request #3513 from techAPJ/patch-3
UX: show meaningful tooltip for user menu
2015-06-01 16:55:59 +10:00
Jeff Atwood
5f273f1dc8 missing line from previous commit (?) 2015-05-31 23:32:01 -07:00
Jeff Atwood
d6af1169fc remove extra "posts" text from similar topic panel 2015-05-31 23:31:29 -07:00
Jeff Atwood
728a530d2d remove extra "posts" text from digest 2015-05-31 23:13:00 -07:00
Sam
739a6ff721 FIX: show category in subject not checking for category 2015-06-01 15:43:16 +10:00
Sam
c1a18f91ef FEATURE: Add parent category link to nojs view 2015-06-01 15:25:57 +10:00
Arpit Jalan
2f9662e562 UX: show meaningful tooltip for user menu 2015-06-01 10:23:49 +05:30
Sam Saffron
7942b28780 FIX: Emoji aliases not autocompleted 2015-06-01 12:33:42 +10:00
Sam Saffron
83559bbf45 posts read may enter concurrently, retry 2015-06-01 11:55:07 +10:00
Sam Saffron
9787cb07aa FIX: when missing a static topic we were returning an error 2015-06-01 11:40:52 +10:00
Sam Saffron
97f03e699d FIX: mixed local s3 store missing avatars 2015-06-01 11:17:42 +10:00
Neil Lalonde
7430da0ec4 FIX: unread counts with 2 digits were wrapping in hamburger menu 2015-05-30 14:39:41 -04:00
Neil Lalonde
fbcc8045ec FIX: hanging lowercase characters were cut off in bar style category badges 2015-05-30 14:39:05 -04:00
Robin Ward
e30f62552e FIX: Arrows had inverted visibility settings 2015-05-30 11:03:50 -04:00
Sam
fc2a08731a FIX: sso_not_approved_url not working correctly 2015-05-30 13:19:07 +10:00
Robin Ward
ea80488fef Merge pull request #3510 from riking/patch-5
FEATURE: Add plugin-outlet to top of static pages
2015-05-29 14:17:04 -04:00
Régis Hanol
80a108e3cf FIX: don't break user avatars route 2015-05-29 19:19:41 +02:00
Neil Lalonde
5f3451a3ea another fix for bullet category badges to prevent wrapping with unread counts on long category names 2015-05-29 12:59:00 -04:00
Régis Hanol
acafa491b2 user avatar urls/templates refactor 2015-05-29 18:51:17 +02:00
Régis Hanol
0483f05154 make sure we pass in the user_id when creating avatar thumbnails 2015-05-29 18:11:19 +02:00
Régis Hanol
fe4f8b1519 download largest gravatar image 2015-05-29 18:11:15 +02:00
Neil Lalonde
80ee30003a FIX: bullet style category badges for long category names 2015-05-29 12:08:52 -04:00
Régis Hanol
766b054e6c FIX: hack was actually messing with other browsers 2015-05-29 17:31:21 +02:00
Régis Hanol
61d85206ee FIX: optimize uploaded images using lossy but very fast compression 2015-05-29 15:57:24 +02:00
Régis Hanol
14a9a98c5b FIX: need to reload the file once optimized 2015-05-29 13:02:05 +02:00
Régis Hanol
555b5cb055 FIX: optimized images were *not* optimized... (:fired:) 2015-05-29 10:58:27 +02:00
Régis Hanol
cb025a65e0 FIX: make sure we also save the user_avatar.custom_upload_id 2015-05-29 10:21:41 +02:00
Régis Hanol
95fb32f3e5 FIX: use provided avatar_template instead of always computing it 2015-05-29 10:19:51 +02:00
Régis Hanol
c3227b69fa FIX: proper support for pixel ratios up to 3 2015-05-29 09:57:54 +02:00
Sam
77c7bad61f FIX: not unbinding uploadTarget correctly 2015-05-29 16:03:52 +10:00
Jeff Atwood
346768921e UX: remove grey on "n replies" under post 2015-05-28 22:22:09 -07:00
Sam
05cb4b7660 Bump cold mapping down so it maintains old readability 2015-05-29 15:19:28 +10:00
riking
043b011523 FEATURE: Add plugin-outlet to top of static pages
Please enter the commit message for your changes. Lines starting
2015-05-28 19:21:13 -07:00
awesomerobot
bf7ec5dc5a improving the font-rendering issue caused by css transitions in safari 2015-05-28 22:02:09 -04:00
Robin Ward
fe18bdbcfb FIX: Progress bar wasn't showing percentage after 2nd post was made 2015-05-28 14:58:14 -04:00
Robin Ward
f87fc98411 FIX: User stream was cached and not reloading 2015-05-28 13:51:04 -04:00
Robin Ward
e52ed66069 FIX: Show the "Needs Approval" menu item if items need approval
Previously it would not show up if the feature was disabled. However if
posts needed approval the icon would show up and it would be confusing.
2015-05-28 11:53:59 -04:00
Robin Ward
d9e2a685b2 FIX: Allow HTML in site setting descriptions. 2015-05-28 11:35:02 -04:00
Régis Hanol
6e8be12816 Merge pull request #3507 from techAPJ/patch-1
FIX: attachment links in topic map were giving 404
2015-05-28 12:35:57 +02:00
Arpit Jalan
5813cfd95b FIX: attachment links in topic map were giving 404 2015-05-28 16:03:01 +05:30
Régis Hanol
5145fabfbf Merge pull request #3506 from cpradio/fix-reply-to-topic-shortcut
FIX: Reply to Topic shortcut no longer needs the Reply Topic Button to be available
2015-05-28 12:04:28 +02:00
Sam
9d113bd536 FIX: no link tracking on any expanded posts 2015-05-28 16:38:58 +10:00
Sam
bddbf70697 FIX: order post_actions by date 2015-05-28 16:16:36 +10:00
Sam
1e4c7dfbe7 FIX: invalid plan generation when % in query on badge definition UI 2015-05-28 16:06:22 +10:00
Sam
bb3fb37650 FIX: when uploading same file was pasted into multiple composers 2015-05-28 15:08:54 +10:00
cpradio
bb5d27429f FIX: Reply to Topic shortcut no longer needs the Reply Topic Button to be available 2015-05-27 22:23:21 -04:00
Régis Hanol
e101396ea1 FEATURE: add support for device pixel ratio = 3 2015-05-28 01:48:07 +02:00
Régis Hanol
8e7bfd0f29 FIX: automatically growing uploads tree 2015-05-28 01:03:24 +02:00
Neil Lalonde
ea8cf1a208 FIX: topic auto-close uses the client's time zone 2015-05-27 18:01:46 -04:00
Robin Ward
23eadc3fb1 The entire qunit suite runs without any deprecations 2015-05-27 15:07:09 -04:00
Robin Ward
c22cc2bf03 FIX: Reset expanding of first post when entering a topic. 2015-05-27 14:49:04 -04:00
Neil Lalonde
89031b9186 FIX: uploads when deployed to a subfolder 2015-05-27 14:43:14 -04:00
Robin Ward
1434e46ed2 FIX: Excon was wrapping our ReadOnly exception
This was preventing the crawling of many topic links
2015-05-27 14:29:52 -04:00
Robin Ward
5890dae64c FIX: Inappropriate error message when you couldn't access a topic 2015-05-27 13:54:11 -04:00
Jeff Atwood
8c9cee6fe3 UX: coldmap now progressively dimmer primary color 2015-05-27 00:36:16 -07:00
Jeff Atwood
decccb9ae8 a bit less grey on the edit history dialog 2015-05-26 22:54:38 -07:00
Sam
02fa7448ca FEATURE: custom url to redirect to on account pending approval for sso 2015-05-27 14:06:45 +10:00
Sam
24102f2636 FIX: apply s3 cdn to client side assets 2015-05-27 12:59:51 +10:00
Sam
a988cd5abe FIX: redirect to CDN avatar for s3 avatars 2015-05-27 12:02:57 +10:00
Sam
0a2a248acc should be using site setting not global 2015-05-27 11:17:46 +10:00
Sam
918034aa7b remove less useful error reporting 2015-05-27 11:17:28 +10:00
Régis Hanol
992154533f remove debugging letfovers 2015-05-26 20:08:19 +02:00
Neil Lalonde
364437da28 FIX: subfolder support for page refresh when assets have changed 2015-05-26 13:13:09 -04:00
Robin Ward
d0741f752f FIX: If a date translation is missing, don't raise an exception 2015-05-26 11:59:47 -04:00
Robin Ward
d36916ccf5 UX: Highlight the OP of a warning 2015-05-26 11:25:13 -04:00
Robin Ward
7af723c0ed OOPS, remove console.log :fired: 2015-05-26 11:15:53 -04:00
Robin Ward
bea5df0104 UX: Show domains even on local links in the topic map with titles 2015-05-26 11:13:33 -04:00
Régis Hanol
a5d93c6705 FIX: undefined method 'max_file_size_kb' 2015-05-26 16:39:41 +02:00
Régis Hanol
b974e192eb Merge pull request #3500 from fantasticfears/user-card
FIX: rare user card exception
2015-05-26 16:09:40 +02:00
Régis Hanol
7b03c7dbc4 Merge pull request #3504 from techAPJ/patch-4
FIX: add missing translation keys
2015-05-26 16:08:39 +02:00
Régis Hanol
85d4d3223c FIX: crop avatars on the server instead of the client
FIX: support for dots in S3 bucket names
2015-05-26 15:54:25 +02:00
Arpit Jalan
d21944a0b6 FIX: add missing translation keys 2015-05-26 19:11:37 +05:30
Paul Kaplan
bbe200e3cf Fix missing bracket in name selector in url anchor jumping 2015-05-26 07:49:45 -05:00
Régis Hanol
033c2e7140 FIX: respect the allow_animated_avatars site setting 2015-05-26 12:22:02 +02:00
Régis Hanol
a797f7c664 FIX: properly handle images when using 's3_cdn_url' 2015-05-26 11:47:33 +02:00
Sam
147ea002f7 FIX: allow handling for avatars that are not in the set of "resized sizes" 2015-05-26 15:41:50 +10:00
Sam
eeda367e70 FIX: should be able to serve optimized image from local if its ... local... 2015-05-26 12:32:52 +10:00
Neil Lalonde
b9c7e3b74a FIX: categories page counts were very wrong for categories with sub-categories 2015-05-25 17:42:16 -04:00
Neil Lalonde
eaa1afeaf5 remove Google OpenID auth, since Google doesn't support it anymore 2015-05-25 15:13:44 -04:00
Robin Ward
3437513025 FIX: Back button mobile from user activity stream 2015-05-25 13:40:46 -04:00
Robin Ward
ee129edf25 FIX: mentions were not working in PMs 2015-05-25 13:15:00 -04:00
Robin Ward
78abf85087 FIX: IE9 issues with latest discourse 2015-05-25 12:32:42 -04:00
Régis Hanol
bb0c2813ac FEATURE: generate (avatar) thumbnails in a background task
FIX: keep the "uploading..." indicator until the server replies via the MessageBus
FIX: text was disapearing when uploading an avatar

PERF: always use a region for S3 (defaults to 'us-east-1')
FEATURE: ApplyCDN middleware when using S3
FIX: use the same pattern to store files on S3 and locally
PERF: keep a local cache of uploads when generating thumbnails
FEATURE: migrate_to_s3 rake task
2015-05-25 17:59:00 +02:00
Erick Guan
54adf72582 FIX: rare user card exception
- trigger the shown logic in user card view
- some tweaks to user card show logic
2015-05-25 22:37:00 +08:00
Erick Guan
5ad878ca40 FIX: add missing username properties to usercard 2015-05-25 01:32:11 +08:00
Jeff Atwood
815e17b17b missed a spot for lightened onebox colors 2015-05-24 03:45:30 -07:00
Sam
bcaed90744 fix missing rtl stylesheets 2015-05-23 15:25:05 +10:00
Jeff Atwood
2f850510d7 fix cat page alignment for new/unread badges 2015-05-22 16:14:47 -07:00
Jeff Atwood
025d310c9c lighten onebox backgrounds 2015-05-22 15:05:46 -07:00
Jeff Atwood
a2b76a670f reduce darkness of @name mentions in quotes 2015-05-22 14:40:39 -07:00
Jeff Atwood
2bd0fcb9fd UX: use lighter grey for code blocks too 2015-05-22 13:49:40 -07:00
Régis Hanol
41cd438f0b FIX: 'clean up uploads' job
Only 1 query was needed.
2015-05-22 20:28:52 +02:00
Jeff Atwood
8a63596cbd use arrows glyph instead of "vs" in compare dialog 2015-05-22 03:03:04 -07:00
Jeff Atwood
4b1eaa567e add missing .title bgcolor 2015-05-22 02:31:27 -07:00
Jeff Atwood
42a8e742f8 UX: switch to lighter grey for all quotes 2015-05-22 02:11:18 -07:00
Jeff Atwood
9e74f232e0 clean up topic summary / map CSS a bit 2015-05-22 01:28:34 -07:00
Jeff Atwood
83e404fce9 fix btn alignment in "post on which topic?" dialog 2015-05-22 01:08:31 -07:00
Sam
fe46d1dd3b PERF: avoid cookies for all static, public, cached forever assets 2015-05-22 16:15:46 +10:00
Sam
ada7b4a4e8 FIX: guard against concurrent loading of deferred assets 2015-05-22 15:07:04 +10:00
Sam
96dbeb8608 fix stylesheet cache to recover if file is on disk 2015-05-22 11:22:12 +10:00
Jeff Atwood
b12eaf39c0 slightly lighter topic map 2015-05-21 17:03:18 -07:00
Jeff Atwood
f5c9246168 try topic map borders 2015-05-21 16:40:39 -07:00
Jeff Atwood
664add01f9 try lighter topic map background 2015-05-21 16:18:41 -07:00
Jeff Atwood
e7fc5abe5b UX: larger numbers for topic summary, 2015-05-21 15:54:38 -07:00
Jeff Atwood
ffc6a206e6 UX: add headings to topic summary 2015-05-21 15:30:10 -07:00
Robin Ward
b0238dc0ce Some vars are consts 2015-05-21 16:16:27 -04:00
Robin Ward
381784ea62 FIX: Display proper error on badge create 2015-05-21 16:06:21 -04:00
Neil Lalonde
91588bed8b FIX: some admin actions redirect to wrong path when deployed to subdirectory 2015-05-21 15:03:00 -04:00
Robin Ward
1a4a2f5fc0 FIX: Group validation errors were not being displayed 2015-05-21 14:57:45 -04:00
Robin Ward
0ed1c8011c FIX: About page error when login_required 2015-05-21 14:37:49 -04:00
Régis Hanol
358f5cacf9 Merge pull request #3495 from techAPJ/patch-2
FIX: send category-id if present when deleting category
2015-05-21 11:00:16 +02:00
Régis Hanol
664d2e11d7 Merge pull request #3494 from fantasticfears/esc-user-card
FIX: press ESC can close user card
2015-05-21 10:58:26 +02:00
Sam
a0090a4585 fix incorrect handling of date on "globally enabled" stylesheet. 2015-05-21 17:23:54 +10:00
Sam
44fc8e42dc nginx is stripping ETags, just use last modified instead 2015-05-21 17:05:22 +10:00
Sam
4fbfc6ddbc PERF: missing caching on CSS and Site Customizations 2015-05-21 16:09:23 +10:00
Erick Guan
7d8cf2eb3d FIX: press ESC can close user card 2015-05-21 13:54:34 +08:00
Arpit Jalan
836c7b4251 FIX: send category-id if present when deleting category 2015-05-21 11:15:08 +05:30
Régis Hanol
b7f8680618 fix build (:fired:) 2015-05-20 17:51:33 +02:00
Régis Hanol
bcd98c8f0f FIX: API can provide a URL to create an upload 2015-05-20 17:38:06 +02:00
Régis Hanol
c91634c09a FIX: support for async uploads of emojis 2015-05-20 16:45:48 +02:00
Régis Hanol
566b267981 FIX: cropAvatar 2015-05-20 16:45:48 +02:00
Régis Hanol
8d967d9065 FEATURE: move all uploads to a single endpoint + defer upload creation in a background thread 2015-05-20 16:45:48 +02:00
Robin Ward
7d23826cee FIX: Keep around the page when redirecting 2015-05-20 10:16:17 -04:00
Régis Hanol
7d3b7a5657 fix the build 2015-05-20 15:32:31 +02:00
Régis Hanol
b44488b618 FIX: keep to old attachment route 2015-05-20 14:55:42 +02:00
Jeff Atwood
0bd6d79459 finalize color scheme for mobile progress bar 2015-05-20 01:25:36 -07:00
Jeff Atwood
643f770996 add new color scheme to mobile progress bar 2015-05-20 01:07:16 -07:00
Jeff Atwood
d7692ba6fd add width and style to mobile category borders 2015-05-20 00:46:37 -07:00
Sam
e5888cf090 PERF: avoid preloading json in cases where it is not needed
(uploads / avatars / non GET requests)
2015-05-20 17:12:16 +10:00
Sam
45bdd23689 FEATURE: support user local switching to RTL correctly
FEATURE: support RTL in multisite
2015-05-20 15:56:54 +10:00
Sam
8013b6a511 FIX: clean html before sending it to jquery for collapsing 2015-05-20 14:42:54 +10:00
Sam
14ab9c45b6 Merge pull request #3470 from ahuling13/expired-nonce-return-status
In the case of an expired nonce, return a 400 status code instead of 500
2015-05-20 12:08:17 +10:00
Sam
d1d703718a Merge pull request #3476 from paulkaplan/sso-distrust-email
Add SSO setting to not trust emails automatically
2015-05-20 12:07:14 +10:00
riking
d112f39031 Change extension back to .dcstyle.json 2015-05-19 18:35:16 -07:00
awesomerobot
0ba88d2355 changing color of progress bar 2015-05-19 21:19:28 -04:00
Sam
bd63699d63 FIX: rescue even more errors in case avatar has issues downloading 2015-05-20 10:43:53 +10:00
Jeff Atwood
cf90550cf1 remove tiger striping from category page 2015-05-19 16:48:27 -07:00
Jeff Atwood
c29fce142a remove tiger striping from mobile categories page 2015-05-19 16:28:01 -07:00
Jeff Atwood
7c5c4166db fix mobile issue with alternate login button 2015-05-19 16:23:26 -07:00
Robin Ward
4c373be190 FIX: Broken link on admin dashboard 2015-05-19 13:13:31 -04:00
Andrew Huling
e44ddff9bb Change the expired nonce return status code from 400 to 419. 2015-05-19 13:13:14 -04:00
Robin Ward
20cd5b8c0b FIX: Don't reset scrolling when subcategory_list is enabled 2015-05-19 12:56:04 -04:00
Robin Ward
0a35b20933 Convert Discourse.ScrollTop to ES6 2015-05-19 12:51:03 -04:00
Robin Ward
8f0cd18d4b Only show delete user button on post approvals for TL0 2015-05-19 12:19:25 -04:00
Paul Kaplan
1c34341f31 Replace site setting with a payload attribute 2015-05-19 11:16:02 -05:00
Robin Ward
f496982e79 UX: Always show reply as new topic if the user can. 2015-05-19 12:13:30 -04:00
Robin Ward
1f95ef31cc Remove deprecations in TopicProgressController 2015-05-19 12:10:18 -04:00
Robin Ward
c18bc59808 Increase limit on user fields 2015-05-19 11:34:54 -04:00
Neil Lalonde
e5fd50aa1e FIX: delete my own account button was always disabled 2015-05-19 11:23:04 -04:00
Robin Ward
4e0d7683ab Better error messages on admin for granting moderation
Also fixes up Ember deprecations.
2015-05-19 10:56:32 -04:00
Régis Hanol
9ded21e4c6 FIX: consistent and future-proof upload storage pattern 2015-05-19 12:31:12 +02:00
Arpit Jalan
c2510e610d UX: fix blockquote in firefox 2015-05-19 15:10:19 +05:30
Sam
15a59dcde7 EXTENSIBILITY: topic-after-cooked plugin outlet 2015-05-19 15:34:54 +10:00
Sam
8002c46c21 FEATURE: g b to take you to your bookmarks 2015-05-19 15:34:16 +10:00
Sam
f26fef4340 silence ar not found 2015-05-19 09:32:27 +10:00
Erick Guan
4ac40145d8 user card animation when there is an active user card 2015-05-19 00:19:06 +08:00
Régis Hanol
3f7d693786 Merge pull request #3454 from fantasticfears/group-page
FIX: show user card on group page and fix styles
2015-05-18 14:28:43 +02:00
Régis Hanol
b2f50c154a Merge pull request #3486 from techAPJ/patch-2
FIX: handle user export failure when post is not linked to a topic
2015-05-18 09:21:58 +02:00
Arpit Jalan
c5a57a9f94 UX: add space between location icon and text 2015-05-18 12:13:42 +05:30
Arpit Jalan
b3314ea801 FIX: handle user export failure when post is not linked to a topic 2015-05-18 09:07:12 +05:30
Erick Guan
3be1098cc5 FIX: also inline category badge styles to digest email 2015-05-18 00:45:26 +08:00
Régis Hanol
ac74f2a1d3 Merge pull request #3483 from techAPJ/patch-1
FIX: show meaningful error message in case of site setting error
2015-05-17 11:11:13 +02:00
Arpit Jalan
ac13238127 UX: do not show last post label in user card if user never posted 2015-05-17 14:37:26 +05:30
Arpit Jalan
e287046d32 FIX: show meaningful error message in case of site setting error 2015-05-17 14:15:27 +05:30
riking
d0b61ed23e Filter files to only plain-text 2015-05-16 21:19:00 -07:00
riking
30abc91a5c this just in: drag events are very broken 2015-05-16 21:04:57 -07:00
riking
fbc06d044f Use .dcstylejson instead of .dcstyle.json 2015-05-16 20:41:35 -07:00
riking
291d9fc65e FEATURE: Import customizations from a JSON file 2015-05-16 20:24:19 -07:00
riking
1e53c179a3 FEATURE: Export customizations as JSON files 2015-05-16 20:24:13 -07:00
Arpit Jalan
896ea8e177 FIX: trim leading/trailing spaces from invite email 2015-05-16 15:21:31 +05:30
Ryan Fox
14d2b76354 Merge branch 'master' into fix-by-external
Conflicts:
	app/controllers/users_controller.rb
2015-05-15 19:54:11 -04:00
Paul Kaplan
b8a43e153c Use session controller to prevent inactive SSO users 2015-05-15 12:15:06 -05:00
Paul Kaplan
4c26c4d9bc Add a SiteSetting to not trust sso emails by default 2015-05-15 12:15:06 -05:00
Robin Ward
94ca9ed11f FIX: Rate limits weren't being showing for action summary errors 2015-05-15 12:16:05 -04:00
Robin Ward
5148c48170 FIX: Image uploading component was missing a class 2015-05-15 11:12:41 -04:00
Robin Ward
0362c50698 Remove deprecations from edit-category and add skeleton acceptance test 2015-05-15 11:12:41 -04:00
Régis Hanol
764f9b42fe Merge pull request #3458 from Qasem-h/Bosnian
Add Bosnian langage for discourse
2015-05-15 14:34:16 +02:00