2326d4ceb7
FIX: text node emitters should always take strings as parameters even if they
...
return JsonML.
2013-12-16 15:41:46 -05:00
341adc93a4
Allow categories with null position, which means sort them based on activity. Mix absolutely positioned (position is not null) categories with null position categories.
2013-12-16 15:13:57 -05:00
30d1801703
Merge pull request #1739 from vikhyat/uncategorized-topics
...
Don't show "uncategorized" in the category dropdown if allow_uncategorized_topics is false.
2013-12-16 10:57:45 -08:00
acf262b631
Support for "no subcategories"
2013-12-16 13:06:35 -05:00
206ef3dc08
add discourse_diff tests
2013-12-16 18:11:46 +01:00
8fff53775a
revision history: no hover state on buttons when disabled
2013-12-16 16:02:25 +01:00
fd749a9c6e
revision history: proper word-wrap in markdown view
2013-12-16 15:57:13 +01:00
c6fb60e0a0
FIX: S3 upload when using dots in bucket name
2013-12-16 11:44:59 +01:00
03e152ee21
Don't show "uncategorized" if allow_uncategorized_topics is false.
2013-12-15 15:56:06 +05:30
d93e4fc65d
add more info to rss feeds
2013-12-15 01:17:39 -08:00
1145e4bfd9
Fix topics_year, topics_month, topics_week for uncategorized category
2013-12-13 16:17:06 -05:00
49c3482464
Show topic and post counts by day/week/month/year on categories page
2013-12-13 15:37:45 -05:00
a7a7387da1
Automatically convert some quotes to blockquotes
2013-12-13 15:31:25 -05:00
1bbd1a94bb
Cold/Hot classes in Topic Map
2013-12-13 13:43:20 -05:00
06e9cbc6cb
FIX: Look up a url without the query string if it couldn't be found with it.
2013-12-13 12:56:20 -05:00
26e75c5ceb
Double reading speed estimate. People skim.
2013-12-13 12:23:20 -05:00
05a3c8090f
Merge pull request #1658 from salbertson/sa-refactor-users-controller-create
...
Refactor UsersController#create
2013-12-12 22:16:50 -08:00
96fdf72d5e
rails master compatability
2013-12-13 17:04:45 +11:00
8ccab6d140
Got rid of buggy yepnope spaghetti, however mobile detection really should be driven from the server.
2013-12-13 15:17:05 +11:00
6641230b7f
Merge pull request #1733 from voisintotoro/newmaster2
...
Updated French translation and fixed the fr_FR: to fr:
2013-12-12 15:02:05 -08:00
eadf5e9b02
Move columns around on wide categories page
2013-12-12 17:27:25 -05:00
cb7de5d2de
Updated French translation and fixed the fr_FR: to fr:
2013-12-12 23:17:43 +01:00
50bd05663c
Fix category ordering on categories page. I broke it.
2013-12-12 17:13:35 -05:00
ee5637d4ff
FIX: font-awesome issue on site settings buttons
2013-12-12 16:09:44 -05:00
9f9852a8dd
FIX: broken font-awesome icons on user activity pages
2013-12-12 16:07:34 -05:00
52cf27b0a6
FIX: layout problems on categories page
2013-12-12 15:52:36 -05:00
6fa2e68742
Show more than one topic per category on the wide categories page. Disable support for the 2-column categories page. The category_featured_topics site setting controls how many topics to show.
2013-12-12 15:52:30 -05:00
50c4e3707b
Merge pull request #1731 from chancancode/no_more_scoped_in_rails_4_1
...
✂️ scoped for Rails 4 compat
2013-12-12 12:38:57 -08:00
cf44b9e9d9
add image dimensions & size in lightbox
2013-12-12 17:39:20 +01:00
c7741c9622
FIX: absolute canonical link on topic pages
2013-12-12 17:24:00 +01:00
dd93407789
FIX: images should also be inlined in the cooked view
2013-12-12 16:57:56 +01:00
1457a3792d
that fix should have been in the emoji plugin
2013-12-12 16:42:27 +01:00
be835785f8
FIX: allow new user to post emojis
2013-12-12 15:05:18 +01:00
3c80ee0b8a
✂️ scoped for Rails 4 compat
2013-12-12 00:37:04 -08:00
06dd7ffe3c
better revision history
2013-12-12 03:41:34 +01:00
5171a23a9c
Re-apply with fixes: Stop using user agent to detect mobile devices. Use a media query and yepnope to load the appropriate css and customizations.
2013-12-11 11:19:22 -05:00
ed3d3ae1e1
Upgrade font-awesome to version 4
2013-12-11 10:31:09 -05:00
6853f37bee
Show estimated reading time near summarize button.
2013-12-10 13:47:36 -05:00
561961eff6
FIX: can grant titles to regular users. Guardian initializer needs current_user, not the target user.
2013-12-10 12:46:35 -05:00
b0e6475b07
FIX: Staff should be able to see PMs
2013-12-10 11:30:45 -05:00
2596f7dec2
Revert "Stop using user agent to detect mobile devices. Use a media query and yepnope to load the appropriate css and customizations."
2013-12-09 16:28:11 -05:00
ef432902ce
Missing percentage. CANADIAN SORRY!
2013-12-09 14:48:32 -05:00
744add9ece
FIX: Post count progress was a little off. Minor fix to hidden posts
2013-12-09 14:28:32 -05:00
5280e279f7
FIX: Merge conflict; "of" number in progress bar was incorrect.
2013-12-09 13:44:37 -05:00
ca5d4d5e54
Stop using user agent to detect mobile devices. Use a media query and yepnope to load the appropriate css and customizations.
2013-12-09 13:28:42 -05:00
621b2b5972
enable_names site setting implementation.
2013-12-08 19:31:25 +05:30
f9243a10cc
Don't debouce `afterRender`, debounce the preview refreshing mechanism.
2013-12-06 17:14:18 -05:00
9a24d2651d
Allow category to auto-close topics in X hours instead of days. FIX: the system message that says a topic was automatically closed was only counting in days.
2013-12-06 16:39:35 -05:00
8cc6cd933a
Don't allow filtering by user in summary mode and vice versa. It's just confusing.
2013-12-06 13:53:19 -05:00
b646495798
Remove unused translations
2013-12-06 13:16:04 -05:00
314a0e3fad
Some style changes for omitted posts, also mobile style.
2013-12-06 12:51:00 -05:00
e3660e59b4
Strip http(s) from SiteSetting.ga_domain_name
2013-12-06 11:46:52 -05:00
e103176400
FIX: actually show the upload avatar modal when allow_uploaded_avatars is true
2013-12-06 12:13:24 +01:00
418856a789
make sure assets always use schemaless absolute uris
2013-12-06 11:16:13 +01:00
a7eced3a06
Merge pull request #1723 from vikhyat/disable-uploads
...
Don't show uploading forms if the relevant site settings are disabled
2013-12-06 00:26:50 -08:00
483c9f9826
Don't show the upload avatar modal is allow_uploaded_avatars is false.
2013-12-06 11:31:11 +05:30
2850279c45
Don't show the upload option if max_attachment_size_kb is 0.
2013-12-06 10:29:15 +05:30
082f131b27
Add a site setting for when progress bar should only show post number. Default is 1000.
2013-12-05 17:17:44 -05:00
79427732b2
Show Gaps in the post stream when filters are active
...
Conflicts:
app/assets/javascripts/discourse/templates/topic.js.handlebars
2013-12-05 16:46:59 -05:00
0fe5ecbb24
When there are 2000 or more posts, only show the post number on the progress bar
2013-12-05 15:50:15 -05:00
51eff92170
Refactor UsersController#create
...
* Simplify controller action
* Extract service classes
2013-12-05 10:11:16 -08:00
6b618a805a
FIX: do not destroy current draft when *NOT* abandoning the current reply
2013-12-05 18:08:33 +01:00
2db3cfb16b
annotate models
2013-12-05 17:40:35 +11:00
50bc23c2be
Merge pull request #1718 from awesomerobot/master
...
fixing the user column on the topic-list page
2013-12-04 12:52:05 -08:00
2a809d7855
Migrate over slackRatio to vendored helper
2013-12-04 13:26:00 -05:00
3a2ae97668
Vendor the CloakedView stuff
2013-12-04 13:23:20 -05:00
3a6ba907d9
FIX: enter key in login form works again
2013-12-04 11:45:07 -05:00
0ece195723
Blacklist <center>
2013-12-04 11:43:20 -05:00
2d928a0537
local merge
...
Merge remote-tracking branch 'upstream/master'
2013-12-04 10:39:39 -05:00
15516f34c7
fixing the user column on the topic-list page
2013-12-04 10:38:01 -05:00
abed146cc7
FIX: Category description topics shouldn't auto-close
2013-12-04 10:31:25 -05:00
df7b24b14a
Merge pull request #1716 from ok-harry/master
...
set_locale of application_controller.rb must be called earlier
2013-12-04 07:09:14 -08:00
243acb4f05
Auto close topic on form submit rather than button click.
2013-12-04 18:17:28 +05:30
2d9876a6ac
FIX: set_locale filter must be executed before check_xhr filter because check_xhr filter renders html in some cases
2013-12-04 20:49:54 +09:00
b622edad7d
FIX: edit category modal is too short
2013-12-03 17:24:25 -05:00
3cfd2dd667
FIX: quote text twice overwrites the first quote
2013-12-03 16:39:35 -05:00
cb9fb2acfa
FIX: A post via the message bus wasn't updating `highest_post_number` properly.
2013-12-03 16:25:51 -05:00
915861a646
FIX: suspended users still appear suspended after their suspension expires
2013-12-03 15:53:30 -05:00
c4394688de
FIX: CSRF token retrieval bug
2013-12-03 15:30:33 -05:00
50fe117d7c
FIX: Load order bug
2013-12-03 15:11:33 -05:00
274743b877
Refactor: Move initialization code into separate initializers that use the API we
...
developed for plugins.
2013-12-03 14:22:32 -05:00
de78ee302a
- Extract Browser capabilities from Discourse namespace into a Singleton.
...
- Change Scrolling slack based on Android / Touch / Desktop
2013-12-03 13:03:19 -05:00
8b4c030c16
Small email fixes
2013-12-03 10:11:04 -05:00
bf2663346a
Merge pull request #1712 from awesomerobot/master
...
making the category dropdown taller
2013-12-02 21:34:54 -08:00
e16621077a
semicolon for the greater good
2013-12-03 16:09:57 +11:00
d6ddc70fea
making the category dropdown taller
2013-12-02 21:09:16 -05:00
bdac13b636
FIX: If there are no featured topics in a category, don't fail.
2013-12-02 17:44:57 -05:00
7bbb32bac2
Fix javascript_include_tag for browser-update so it includes MD5. Needed to add .js extension for some reason.
2013-12-02 15:57:23 -05:00
0c259af374
FIX: Don't give weird progress numbers when there are deleted posts.
2013-12-02 15:09:25 -05:00
b37fae50e3
OOPS: Commented out the wrong line
2013-12-02 14:28:01 -05:00
48bfcfadd9
Upgrade Ember.js, fix swallowing of template errors, report unresolved promises in development mode.
2013-12-02 13:15:58 -05:00
79f1055164
Fix autoclose form in category modal
2013-12-02 11:03:35 -05:00
3842097698
add lightbox extra-zoom on click
2013-12-02 11:03:47 +01:00
bfd2fd8607
update magnific popup to latest (v. 0.9.9)
2013-12-02 10:38:15 +01:00
ea835b78dc
Merge pull request #1710 from benjaminbrent/master
...
Fix email_preview AJAX call to use Discourse.ajax
2013-12-01 23:51:09 -08:00
2d4e62dd64
Fixed broken links in Digest email
...
Based on @eviltrout's fix from 7a60eacca9
2013-12-02 01:11:55 -05:00
7f4697a200
bug: if status changes always attempt to update the feature topics for the category right away
2013-12-02 16:32:24 +11:00
a2d5a7dbd8
auto close is messed up in category edit, remove for now
2013-12-02 16:13:32 +11:00
8d859a9f68
break cache of fonts
2013-12-02 08:19:34 +11:00
761da7d380
Fix email_preview AJAX call to use Discourse.ajax
2013-12-01 13:30:41 +11:00
f5d905c215
Merge pull request #1707 from chancancode/as_json_fix
...
The Rails JSON encoder API requires `as_json` to take an optional arg
2013-11-30 03:40:21 -08:00
6bbea9de0b
The Rails JSON encoder API requires `as_json` to take an optional arg
2013-11-29 21:43:44 -08:00
a9060fac70
added KBD style back
2013-11-29 22:44:00 -05:00
7a60eacca9
FIX: Broken unsubscribe link in HTML email
2013-11-29 17:13:16 -05:00
769223014c
FIX: Allow link redirects inside oneboxed posts
2013-11-29 14:29:49 -05:00
298b54c0e7
add download link in lightbox
2013-11-29 20:03:39 +01:00
008151e90d
FIX: Too much white space between posts on mobile
2013-11-29 13:06:52 -05:00
781a8876d3
Show post count in digest emails. Sort by score
2013-11-29 13:00:25 -05:00
3da2285ef1
FIX: Missing styles in HTML digest emails
2013-11-29 12:21:36 -05:00
9b6538832d
whitelist google.com/maps iframes
2013-11-29 18:08:53 +01:00
8c8645f158
FIX: Code and Emoticon formatting in HTML emails.
2013-11-28 17:21:14 -05:00
4ec0543362
FIX: emails with embedded posts should always use absolute URLs
2013-11-28 15:57:21 -05:00
a13c7c26f9
Put that autoclose regexp back. Firefox, take it easy.
2013-11-28 14:49:11 -05:00
5fd87ae45f
Merge pull request #1701 from velesin/sitemap_refactoring
...
refactors site map
2013-11-28 11:21:36 -08:00
f1bce7cc42
Uncomment the loading logic :)
2013-11-28 14:18:32 -05:00
924a88b5c0
Different Slack ratio on Touch devices, show loading indicator
2013-11-28 14:18:13 -05:00
488e9ca9dd
On mobile, keep topic map collapsed by default. Also, when collapsed don't show as many
...
data turds.
2013-11-28 11:45:16 -05:00
1cc72d564f
Add specs for topic create with auto_close_time. Just ignore auto_close_time from users who are not authorized to use it instead of raising an error.
2013-11-28 11:06:04 -05:00
79087f4e6f
fix exception in logs
2013-11-28 12:39:59 +11:00
52160179f8
add a tombstone for extra safety
2013-11-27 22:05:11 +01:00
8eef779d38
refactors site map
2013-11-27 21:58:36 +01:00
09155a9969
FIX: Upward scrolling jumps
2013-11-27 15:58:13 -05:00
13b31e9833
FIX: broke all the things on Firefox
2013-11-27 14:52:29 -05:00
746e115f99
Fix path of browser-update
2013-11-27 13:56:22 -05:00
40f86829f7
Post Cloaking:
...
* We now use a new custom view, {{cloaked-collection}} to display posts in a topic.
* Posts are removed and inserted (cloaked/uncloaked) into the DOM dynamically based on whether they
are visible in the current browser viewport.
* There's been a lot of refactoring to ensure the relationship between the post views and the topic
controller is sane.
* Lots of fixes involving jumping to a post, including a new LockOn component to that tries to stay
focused on an element even if stuff is loading before it in the DOM that would normally push it
down.
2013-11-27 12:53:32 -05:00
8a9bef944f
Fix browser-update.js so it doesn't depend on jQuery
2013-11-27 12:26:27 -05:00
3442d3adb2
Add left margin to ol and ul
2013-11-27 10:55:54 -05:00
a9ab98ef9e
Auto-close time can be entered in 3 ways, so a topic can close at any time
2013-11-27 09:52:35 -05:00
c2e7e72b74
faq.ko.html.erb Added
...
Korean translate updated.
2013-11-27 12:21:59 +09:00
d6a14889ac
Merge branch 'master' of github.com:discourse/discourse
2013-11-26 10:21:57 +11:00
3fa48f8d76
Style fix: https://twitter.com/andrzejkrzywda/status/404943844896423937
2013-11-26 10:21:41 +11:00
b0d132ee2e
make sure image urls have a scheme before pulling them in
2013-11-25 19:47:53 +01:00
549060867d
Updated documentation for `inlineRegexp`
2013-11-25 11:35:28 -05:00
6544f39bcc
fix topic counts not updating automatically in various spots (top menu / categories page / drop down)
2013-11-25 17:37:51 +11:00
92528d7207
message bus update, extract message bus js out into gem
2013-11-25 17:37:01 +11:00
f1a681aa46
Fix: Participant filter was broken.
2013-11-22 17:02:12 -05:00
afd198a387
removes unused property from HeaderController
2013-11-22 21:07:03 +01:00
82b78ec6ba
schemaless avatar urls
2013-11-22 19:18:45 +01:00
3cf5a363f7
do not destroy uploads when destroying a user
2013-11-22 18:29:07 +01:00
4e45c5ff3d
Fix js for handling click of header buttons. They were adding /# to the url, which broke routing.
2013-11-22 11:50:57 -05:00
35bb4fc17f
When flag is from system, don't show a user avatar. Say System: instead
2013-11-22 11:14:09 -05:00
ec5788f80b
Merge pull request #1688 from velesin/sitemap_integration_tests
...
header sitemap integration tests
2013-11-22 08:06:49 -08:00
f65cde3cda
do not bump posts when rebaking
2013-11-22 01:52:26 +01:00
1d3097245c
header sitemap integration tests
2013-11-21 20:38:56 +01:00
b6de8324be
FIX: removes invalid, unpaired closing tag
2013-11-21 17:33:03 +01:00
50005e2ef9
FIX: Back button wasn't reusing scroll position on category filter
2013-11-21 11:31:10 -05:00
69cc1dd689
FIX: don't suggest a username that's already taken, even if hub finds a match
2013-11-20 14:56:21 -05:00
97cb9e1545
Signup with 3rd party auth can find the matching username from the Discourse Hub
2013-11-20 14:56:21 -05:00
ea8e4bfbcf
FIX: Double footer navigation
2013-11-20 14:16:33 -05:00
d09735ff46
Merge pull request #1680 from velesin/user_activity_link_title_fix
...
FIX: repairs title attr in the link
2013-11-20 09:04:43 -08:00
9de07fd83f
Merge pull request #1678 from eriko/patch-3
...
Load plugin settings.
2013-11-20 07:54:20 -08:00
31fd5b85bc
FIX markdown hotlinked images were not properly pulled
2013-11-20 13:10:08 +01:00
fa0b5d3b0e
FIX: Missing Private message topic map
2013-11-19 18:59:29 -05:00
d16298b1d7
Merge pull request #1679 from velesin/logo_improvement
...
removes redundant enclosing tag
2013-11-19 14:59:45 -08:00
325ad46c20
Merge pull request #1681 from germanviscuso/japanese_locales
...
Provides Japanese locales
2013-11-19 14:58:06 -08:00
1616741836
Say something when no site settings match the filter
2013-11-19 16:46:20 -05:00
3f049f4853
Provides Japanese locales
2013-11-19 22:20:19 +01:00
3a470939f0
FIX: repairs title attr in the link
2013-11-19 21:32:02 +01:00
e7c6abde3e
removes redundant enclosing tag
2013-11-19 21:28:05 +01:00
bf390163aa
Load plugin settings.
...
Along the lines for loading the locale files for a plugin we should also load the settings.yml for a plugin. Updated version 04f3e09
2013-11-19 11:43:01 -08:00
981d8f6aea
Signup form: prefill username if Discourse Hub has a match for the email address. Also, fix some bad specs in username_checker_service_spec that were passing...
2013-11-19 14:15:28 -05:00
309904ef8f
Revert "Merge pull request #1673 from aperrault/patch-04"
...
This reverts commit c9ea89bdd39ed49888fc
2013-11-19 14:08:45 -05:00
c9ea89bdd3
Merge pull request #1673 from aperrault/patch-04
...
Fixing neglect to determine whether a user has the permission to create ...
2013-11-19 10:50:38 -08:00
9ed49888fc
FIX: Invalid sub category links in suggested topics
2013-11-19 13:36:11 -05:00
a7bbc93b9a
Merge pull request #1672 from shivpkumar/shiv/add-session-to-after-create-account
...
Add 'session' to auth hash in OAuth complete method
2013-11-19 10:16:31 -08:00
2f0e20bc11
add session to auth hash in oauth complete method
2013-11-19 09:58:12 -08:00
58b275665b
Oops, missing translation
2013-11-19 12:57:54 -05:00
f5fc0b6b55
Only show external link icons, use the wikipedia-style icon.
2013-11-19 12:42:19 -05:00
b98456a65f
Hide some values from the topic map if they're 0
2013-11-19 12:24:41 -05:00
20e4a2ef80
Renamed components so they don't all have the annoying discourse- prefix
2013-11-19 11:59:50 -05:00
d9c026bec5
Fixing neglect to determine whether a user has the permission to create a topic on a category (besides being able to create a post) in ListController, TopicList, and TopicListSerializer causing the "Create Topic" button to appear even if a user cannot actually create a topic in that category but can reply to a topic therein.
2013-11-19 05:09:58 -07:00
c22f602235
Merge pull request #1669 from GManzato/fix_fr_translation
...
Update french translation
2013-11-19 00:53:41 -08:00
231fa9c2c0
Update french translation
2013-11-19 01:00:05 +01:00
3ce6a7be4a
defer rendering of the site map
...
add new and unread links in the site map categories section
2013-11-19 10:41:57 +11:00
89a96b9e94
FIX: Topic map expansion broken without links.
2013-11-18 17:06:52 -05:00
9aa2bd068a
FIX: Broken links on categories page
2013-11-18 16:59:19 -05:00
6e3de67977
fix edit reason when editing a reply
2013-11-18 19:51:30 +01:00
a2466d182f
Added Participants, Likes to Topic Map
2013-11-18 13:49:53 -05:00
2f39a4ac6d
Don't shorten links in Topic Map
2013-11-18 13:49:53 -05:00
ae58a7db95
Add a warning on dashboard if enforce_global_nicknames is checked, but access key is blank.
2013-11-18 13:45:10 -05:00
281f839e54
Site settings page tweak
2013-11-18 13:45:10 -05:00
629fe8b426
If the topic can be summarized, expand the topic map by default
2013-11-18 13:43:35 -05:00
4ce81e1b01
Rename "Best Of" to "Summary"
2013-11-18 12:48:26 -05:00
34e451ef25
Removed extra comma
2013-11-18 12:16:14 -05:00
f2659a5916
Moved more into components, including summary stuff.
2013-11-18 12:08:21 -05:00
52048d2d2b
Converted Private Message map to a component
2013-11-18 12:08:21 -05:00
039acd6ead
Convert some TopicMap stuff to Ember components
2013-11-18 12:08:21 -05:00
ad3e276b4b
Rename TopicSummary -> TopicMap
2013-11-18 12:08:21 -05:00
dabdcf59c4
allow for arbitrary HTML at the top/bottom of every pages
2013-11-18 17:13:24 +01:00
639394e38a
FIX: Pinned topics within a category weren't working without a refresh
2013-11-18 10:52:01 -05:00
2e9d0ecac4
adjusting badges a bit
2013-11-17 22:32:58 -05:00
6e1198334c
automatic groups should be bootstrapped
2013-11-18 12:53:14 +11:00
805feca5f2
message at the bottom for uncategorized was all mangled, fallback to the old way it used to behave
2013-11-18 11:42:40 +11:00
1b19444b44
URGENT FIX: code would fail in Ruby 1.9.3 exception does not exist
2013-11-18 09:32:02 +11:00
6eb5f1aec2
FIX: site settings page layout at smaller widths
2013-11-16 14:14:49 -05:00
482b752046
add edit reason when editing a post
2013-11-15 23:28:49 +01:00
b921478cbb
Use debounce to make filtering on the All Results tab faster
2013-11-15 16:46:19 -05:00
d3c84b60c8
Add an All Results tab when filtering the site settings
2013-11-15 16:43:56 -05:00
97bc187735
Use stacked nav on left to navigate site settings categories
2013-11-15 15:22:42 -05:00
dfdc618e9a
Use File.join instead of hard-coding slashes
2013-11-15 14:34:03 -05:00
Robin Ward
Neil Lalonde
Régis Hanol
Vikhyat Korrapati
Alexander
Sam
voisintotoro
Godfrey Chan
Scott Albertson
Kris Aubuchon
Harry Seo
MK
Benjamin Brent
Wojciech Zawistowski
jjangg96
German Viscuso
Erik Ordway
Shiv Kumar
Autumn Perrault
Gilles Manzato