f37f6f7673
minor embed style tweak
2015-09-18 02:44:13 -07:00
01782affe2
clearer call to action in embed CSS styles
2015-09-18 00:40:04 -07:00
a4ace3f08e
FEATURE: ui for ordering search results in full page mode
2015-09-18 17:16:53 +10:00
d97e78b942
FIX: jitter in ui when expanding select 2
2015-09-18 17:16:53 +10:00
74ca8c3318
UX: Allow users to open search in new tab.
2015-09-18 11:14:56 +08:00
f39b9124b6
FEATURE: Log staff actions for Category changes.
2015-09-18 10:53:08 +08:00
c29b7ce498
FIX: Set saving to false about model has been saved.
2015-09-18 10:52:49 +08:00
25c7450ea7
Use existing function to extract error message.
2015-09-18 10:52:49 +08:00
086d31d53b
UX: when on full page search header search should not pop open
...
fix `/` handling in full page search to highlight search term
2015-09-18 12:20:59 +10:00
7468f85818
Merge pull request #3783 from scossar/fix-comment-in-menu-panel-scss
...
FIX: remove incorrect comment and rule from menu-panel.scss
2015-09-17 14:46:55 -07:00
0dc11e3a26
remove useless extra <div> around topic-avatar
2015-09-17 14:30:28 -07:00
6b1eb8df8f
remove comment, remove unused rule
2015-09-17 14:19:38 -07:00
4eaaf4198c
FIX: Liking a post shouldn't contract who liked it
2015-09-17 16:29:17 -04:00
0aee7b8211
move age beside title on mobile categories page
2015-09-17 15:25:37 -04:00
07e7b07b63
FIX: refreshing gravatar wasn't working
2015-09-17 19:42:44 +02:00
b45af1d6c8
FIX: Replies to whispers should default to whispers
2015-09-17 11:48:37 -04:00
0a78cdbd83
FIX: Clicking users in Private Messages Map should show card
2015-09-17 11:38:21 -04:00
901380224b
Merge pull request #3775 from xfalcox/patch-2
...
Fix composer for FF14+
2015-09-17 10:47:35 -04:00
87725206cd
Fix bug when adding new custom group
...
When adding a new group, if Delete was clicked before saving the
group, the modal would come up, but the Yes confirmation would
do nothing. This fixes that by taking an approach similar to the
Badges and checks to see if the Group is new, and if it is, just
returns to the index instead of invoking the confirm modal.
This also fixes the redirect after saving a new Group.
2015-09-17 10:23:58 -04:00
28d3260b30
Merge pull request #3780 from tgxworld/fix_mistake
...
FIX: Only cancel composer for when editing first post.
2015-09-17 09:58:46 +02:00
183d72f2e9
correct composer in iPad landscape
2015-09-17 17:19:50 +10:00
518262ce58
allow wider mobile header
2015-09-17 00:17:35 -07:00
0627a58b8b
FIX: too much whitespace at bottom of mobile posts
2015-09-17 00:00:53 -07:00
0969bd0f0d
tighten up post spacing on mobile
2015-09-16 23:48:15 -07:00
527c9158eb
we must hide the header for iPad
2015-09-17 13:19:08 +10:00
e254030760
FIX: header undocking when opening mobile view
...
FIX: make it possible to upload an image on iphone
FIX: mobile can now upload more than 1 image
2015-09-17 13:05:31 +10:00
faada383fa
Merge pull request #3779 from riking/signup-cta
...
Allow emoji in translated strings
2015-09-17 11:34:41 +10:00
7e8f4286e3
FEATURE: Allow emoji in some translated strings
2015-09-16 18:33:17 -07:00
bce8d0632a
FIX: Only cancel composer for when editing first post.
2015-09-17 09:24:02 +08:00
ec4a1bb2c4
FIX: page tracking was not properly tracking transitions
...
PERF: move closure to self contained method so env is released earlier.
2015-09-17 11:06:33 +10:00
2ac9f6a1b0
Merge branch 'master' of https://github.com/discourse/discourse
2015-09-16 17:16:20 -07:00
4714483612
copyedits on anon user call to signup action
2015-09-16 17:16:17 -07:00
975837cf0d
Merge pull request #3769 from tgxworld/disable_button_while_searching
...
UX: Disable button while searching.
2015-09-17 10:01:27 +10:00
4e587eb68f
Store nothing if anon cta is disabled
2015-09-16 16:32:15 -07:00
e16eebb48c
FIX: Don't even bother checking visit count
2015-09-16 15:35:50 -07:00
102b6f6fca
FIX: Reduce requirements for signup call-to-action
...
1 visit, 5 minutes, 3 topics
2015-09-16 15:34:39 -07:00
a2e51b0715
FIX: too few topics/posts notice will only show what needs to be done
2015-09-16 17:12:11 -04:00
f321dd2046
UX: mobile /categories page new and unread styles match other topic lists
2015-09-16 17:12:11 -04:00
24f09edbed
UX: replace cancel uploading link with icon + fix color (Take 2)
2015-09-16 22:04:48 +02:00
2546ca3c8e
FIX: Remove `attributes` observer, doesn't work in FF/Safari
2015-09-16 15:36:12 -04:00
97b608f090
FIX: Allow desktop chrome to scroll to bottom of menu panel
2015-09-16 15:30:40 -04:00
52f7ab3a06
Revert "UX: replace cancel uploading link with icon + fix color"
...
This reverts commit 1689f436d9
2015-09-16 15:15:07 -04:00
63f0247d21
FIX: Better height estimation / observing for menu panels
2015-09-16 14:46:53 -04:00
d61cfbe2aa
Merge pull request #3773 from tgxworld/fix_composer_bug
...
FIX: Composer being abandoned when transiting between routes.
2015-09-16 14:34:46 -04:00
62c20ff5f2
Merge pull request #3760 from riking/signup-cta
...
Signup cta
2015-09-16 14:33:25 -04:00
91db481fae
Merge pull request #3774 from tgxworld/meta_keys_header
...
Fixes for headers.
2015-09-16 14:33:08 -04:00
45a7e200a8
Fix composer for FF14+
...
Fix the preview for old versions of Firefox.
2015-09-16 15:13:44 -03:00
a845e0c498
FIX: Highlight posts was broken.
2015-09-17 01:37:48 +08:00
2958b4b0a1
FIX: Don't dismiss dropdown when searching within posts context.
2015-09-17 01:22:19 +08:00
390af7118a
Merge branch 'master' into signup-cta
...
Conflicts:
app/assets/javascripts/discourse/templates/topic.hbs
2015-09-16 10:06:47 -07:00
59c628735f
Use container for appending views in Discourse.ContainerView
2015-09-16 13:05:22 -04:00
685471303a
FIX: Don't dismiss headers on modifier keys.
2015-09-17 00:38:05 +08:00
a966546843
FIX: Cancel and reopen composer when editing first post.
2015-09-17 00:13:24 +08:00
1689f436d9
UX: replace cancel uploading link with icon + fix color
2015-09-16 17:54:09 +02:00
f427b6639b
FIX: Error showing `Unread` posts
2015-09-16 10:43:36 -04:00
5277ec1ac0
FIX: ensure we have a bucket before enabling backups to S3
2015-09-16 15:55:26 +02:00
cc75890cd4
UX: disable 'Hide results' button when poll is closed
2015-09-16 13:01:08 +02:00
28f0a012ca
FIX: Composer being abandoned when transiting between routes.
2015-09-16 18:17:57 +08:00
468b04db86
FIX: force wrapping on the filename of lightboxed images
2015-09-16 11:58:06 +02:00
66ec6b6e17
FIX: not counting new/unread on categories
2015-09-16 17:41:53 +10:00
7acc93b2a0
FEATURE: Track user profile views.
2015-09-16 14:48:31 +08:00
5d95b38c65
UX: Disable button while searching.
2015-09-16 14:47:35 +08:00
afdb15f99f
fix search screen looks white
2015-09-16 15:02:57 +10:00
77895473e5
don't select text on focus
2015-09-16 14:40:44 +10:00
31d801ce2c
don't blur on autocomplete click
2015-09-16 13:16:08 +10:00
7db4ddcb66
correct disappering header on mobile compose
2015-09-16 12:50:42 +10:00
0b2fa2b0af
FIX: admin menu rendered at incorrect spot
...
make sure we don't unsubscribe all events when menu is destroyed
2015-09-16 11:37:56 +10:00
3215273091
Merge pull request #3771 from riking/category-reorder
...
Do fix positions upon opening dialog
2015-09-16 11:01:06 +10:00
ca97b325fd
FIX: moderators should not have a link to site settings
2015-09-16 09:46:57 +10:00
ded23cc9c5
FIX: don't auto select context on mobile
2015-09-16 09:02:53 +10:00
c9398eaef9
fix comment
2015-09-16 08:55:05 +10:00
59c12ce35b
Stop showing wrench for non admins on topics
2015-09-16 08:51:28 +10:00
a14d7f16c8
fix reply glyph color on mobile editor
2015-09-15 15:39:59 -07:00
0a3388d19f
on mobile submit-panel must have width
2015-09-15 15:22:22 -07:00
74da57f77f
minor category page style tweaks for mobile
2015-09-15 14:37:14 -07:00
a47a71dd82
fix cancel button alignment on mobile editor
2015-09-15 14:28:31 -07:00
d4db1949a7
fix search help on mobile
2015-09-15 14:22:33 -07:00
975edceff4
Add semi colon linting to Javascript
2015-09-15 17:08:50 -04:00
2fa801c014
Do fix positions upon opening dialog
2015-09-15 14:06:20 -07:00
fc8539cb90
Merge branch 'master' into signup-cta
...
Conflicts:
.eslintignore
2015-09-15 13:59:36 -07:00
24991c4016
FIX: ESLint failure
2015-09-15 16:57:57 -04:00
41025be8f7
add download icon
2015-09-15 16:52:46 -04:00
d47f1db2be
Merge branch 'master' into signup-cta
...
Conflicts:
app/assets/javascripts/discourse/templates/topic.hbs
2015-09-15 13:52:12 -07:00
b4a724e80a
FEATURE: export dashboard reports to csv file
2015-09-15 16:45:10 -04:00
b12ace5f9d
FEATURE: Add staff gear icon to composer with options
2015-09-15 16:42:04 -04:00
6be78861ca
Merge branch 'master' into signup-cta
...
Conflicts:
app/assets/javascripts/discourse/lib/key-value-store.js.es6
2015-09-15 12:26:25 -07:00
41721b0898
Rename variables
2015-09-15 12:25:29 -07:00
62444b9a13
Fix the visit tracking logic
2015-09-15 12:25:12 -07:00
9c740ffa7e
UX: top period chooser was misaligned on mobile
2015-09-15 18:33:46 +02:00
91f3e8e724
For now, restrict whispering to staff only.
2015-09-15 12:29:32 -04:00
721b282d3c
Merge pull request #3701 from xfalcox/patch-1
...
Fix same domains links on subfolder installs
2015-09-15 11:49:09 -04:00
72f2454290
FIX: Auto close was broken
2015-09-15 11:09:20 -04:00
0de00308af
FIX: categories' notification_level wasn't serialized when hitting /categories
2015-09-15 14:58:22 +02:00
c46269e7ec
Merge pull request #3766 from tgxworld/fix_selected_posts_mobile
...
Fix selected posts mobile
2015-09-15 11:24:15 +02:00
6360420aed
FIX: Make category combobox in modal take 100% width.
2015-09-15 16:53:49 +08:00
9977599ca9
FIX: Input on modal was overflowing.
2015-09-15 16:53:49 +08:00
46c93a2687
FIX: Selected posts buttons not clickable.
2015-09-15 16:53:41 +08:00
4758144f6a
FIX: avoid horizontal scrollbar on narrow windows
2015-09-15 15:35:58 +10:00
24520937aa
FEATURE: improve safari editor hack
2015-09-15 13:09:12 +10:00
e0562894a8
FEATURE: if there is only one category, don't show the category picker
2015-09-15 10:52:42 +10:00
3ebad3e294
show a dot and reply count for new topics on mobile
2015-09-14 18:56:38 -04:00
8bcb22f52d
Merge pull request #3723 from tgxworld/remove_sequential_rendering_of_time_gap
...
FIX: Timegap only shows up for sequential posts.
2015-09-15 08:28:45 +10:00
4e39f9662d
Rewrite origin so it matches original behavior
...
As suggested by @nlalonde
2015-09-14 18:29:39 -03:00
a8b3010617
FIX: Pagination was broken for groups
2015-09-14 15:54:48 -04:00
edf54979e4
UX: don't show the top period in the navigation bar since it has its own dropdown
2015-09-14 21:54:39 +02:00
1853829471
FIX: When switching discovery routes, fill the screen if content changes
2015-09-14 13:52:21 -04:00
48c3fa423a
FIX: auto-focus input field on Safari was closing the modal
2015-09-14 12:39:46 +02:00
a5f906db69
Merge branch 'master' into category-reorder
2015-09-13 19:07:36 -07:00
447f65890d
Merge pull request #3757 from tgxworld/full_page_search
...
Improvements to full page search.
2015-09-14 12:00:26 +10:00
08dccaa874
FIX: Title input validation position.
2015-09-14 00:30:39 +08:00
9ba22b5155
minor embedding css fix
2015-09-13 04:02:58 -07:00
63e96580c4
correct minor default embedding style issues
2015-09-13 03:18:44 -07:00
c1deee772b
UX: Autofocus when input is empty.
2015-09-13 10:06:21 +08:00
2ae0ef0ad9
UX: Select search term when focus returns to search box.
2015-09-13 08:56:40 +08:00
b4974f5876
UX: Don't allow search if searchTerm is not valid.
2015-09-13 08:56:20 +08:00
1e739e8c96
FIX: move whisper styling to common
2015-09-12 20:44:20 +02:00
4252a2ee1e
switch to eye-slash on whisper, similar to unlisted
2015-09-11 16:53:20 -07:00
3b46ec7ae3
visual tweaks for topic lists on mobile
2015-09-11 16:34:37 -04:00
da4bd6f7e9
Merge pull request #3755 from scossar/category-page-for-mobile
...
FIX: eliminate horizontal scrolling on category page for mobile
2015-09-11 16:01:48 -04:00
e5ade5a761
set widths on table cells
2015-09-11 12:28:14 -07:00
5af0f5f80e
FEATURE: Whisper posts
2015-09-11 14:05:21 -04:00
62cc029886
FIX: Support using enter to change the hash, clicks should update hash
2015-09-11 12:47:44 -04:00
42263ac969
use translations (doh)
2015-09-11 09:46:54 -07:00
b3913b5692
doh, computed.or
2015-09-11 09:36:03 -07:00
fc5e157395
Sane sendAction() behavior
2015-09-11 09:34:20 -07:00
7454722247
Merge pull request #3747 from scossar/reorder-menu-components-in-markup
...
FIX: remove 'left: auto' for slide-in menu (required for RTL layouts)
2015-09-11 12:23:16 -04:00
4f5d42ca69
Merge pull request #3749 from riking/patch-1
...
FIX: Don't allow editing seeded category security settings
2015-09-11 12:22:58 -04:00
3c9a818a2f
fix broken js tests
2015-09-11 12:22:34 -04:00
637b110e76
use setter in topic-tracking-state or else get assertion error
2015-09-11 11:38:39 -04:00
4b43edee91
UX: mobile topic list and suggested topics: show new/unread counts OR total post count, not both.
2015-09-11 11:38:39 -04:00
18d7c1c75d
fix the build - take 2
2015-09-11 15:47:48 +02:00
8128abe6b9
ES6ify user preferences controller
2015-09-11 15:10:56 +02:00
a28df55518
fix the build
2015-09-11 15:10:56 +02:00
93f9dcfcec
FIX: don't overwrite custom uploaded avatar when selecting gravatar
...
FIX: remove unecessary serialized fields
2015-09-11 15:10:56 +02:00
569f2815d1
FIX: ensure we still works with cookies off
2015-09-11 15:10:56 +02:00
0c58f08207
FIX: profile picture selector
2015-09-11 15:10:56 +02:00
6437cd0341
FEATURE: add support for generic external avatar services
...
This changes it so we only ship an avatar template down to the client
it has no magic, all it knows is how to plug in size
2015-09-11 15:10:56 +02:00
90d49d1497
correct paths used for external service
2015-09-11 13:18:07 +10:00
f6380c66ef
oooops
2015-09-11 02:15:45 +02:00
2742602254
FEATURE: support for external letter avatars service
2015-09-11 02:12:40 +02:00
e43034f08f
Revert "FEATURE: SVG letter avatars (based on @eviltrout's spike)"
...
This reverts commit cd77465788
2015-09-11 00:23:52 +02:00
cd77465788
FEATURE: SVG letter avatars (based on @eviltrout's spike)
2015-09-11 00:11:48 +02:00
f36dcb6a62
Fix build
2015-09-10 14:21:36 -07:00
a9d10f454b
Oop
2015-09-10 14:12:08 -07:00
d86d4752cb
FIX: Don't allow editing seeded category security settings
2015-09-10 14:04:21 -07:00
c038758f8c
FIX: Several fixes related to category reorder
...
- Move "New Category" and "Reorder Categories" into a dropdown
- Always show "New Topic" on categories page, even for admins
- Make category reorder modal full-height (.full-height-modal)
- Move category reorder stylesheet out of admin stylesheet
2015-09-10 13:42:10 -07:00
0c5fb207e9
FIX: Fix behavior of category reorder dialog
2015-09-10 13:04:25 -07:00
20c8bb0494
remove hardcoded left: auto
2015-09-10 11:51:47 -07:00
9224afacaf
FIX: Don't put the FAQ as "New" if there is a custom `faq_url`
...
If we do this, it's impossible to ever mark it as read.
2015-09-10 14:01:55 -04:00
1f8328feb5
add code that was accidentally deleted
2015-09-10 09:50:42 -07:00
d2a177f1dd
change menu components position in header
2015-09-10 09:50:42 -07:00
c5e3be0e71
Merge pull request #3744 from tgxworld/fix_autocomplete_avatar_missing
...
FIX: Missing avatar in user autocomplete.
2015-09-10 17:35:55 +10:00
c386158c33
Merge pull request #3745 from tgxworld/add_plugin_outlet
...
FEATURE: Add a plugin outlet for custom controls.
2015-09-10 17:35:04 +10:00
7431c6ac3b
FIX: no user card for users with . or - in username
2015-09-10 17:14:34 +10:00
fcb4eebde1
FEATURE: Add a plugin outlet for custom controls.
2015-09-10 14:50:18 +08:00
0b9322d16a
PERF: remove uneeded data, notification count is pointless
...
Getting notification count is expensive, no point shipping it to clients
2015-09-10 16:44:42 +10:00
60b9985158
FIX: Missing avatar in user autocomplete.
2015-09-10 12:30:21 +08:00
38cb72b329
FEATURE: upload placeholder
2015-09-09 23:14:06 +02:00
ca8046c7c3
FIX: Switch out topic template if the user hasn't changed it
2015-09-09 16:21:01 -04:00
3ceadbd5b8
FIX: Allow qunit tests to run in browser by stubbing new functionality
2015-09-09 16:20:36 -04:00
bc52b72145
FIX: long category names overflow outside of bullet style category badges
2015-09-09 16:20:04 -04:00
2922cc3036
UX: mobile topic list: move post count to right side of topic title
2015-09-09 16:05:13 -04:00
9f826f1ad6
UX: Change style of "New" next to unread FAQ
2015-09-09 15:18:26 -04:00
fe6a4b7d1a
Merge pull request #3739 from scossar/use-outerHeight-to-calculate-header-height
...
FIX: eliminate 3px gap under mobile menu-panel
2015-09-09 15:10:29 -04:00
8a11f7f6c1
Remove `console.log`
2015-09-09 15:05:19 -04:00
74eacba12f
FIX: long category names overflow outside of box style badges
2015-09-09 14:46:40 -04:00
9548876c2d
FIX: Some keyboard commands should not fire when anonymous
2015-09-09 13:45:29 -04:00
4f890a439c
FIX: automatically load pages of topics list until it fills up the entire screen
2015-09-09 17:41:34 +02:00
5ed7663a63
FIX: on enter we would double search on full page search
2015-09-09 12:00:31 +10:00
5eb1fb3bfd
FEATURE: cache search results for 5 route transitions
...
DEV: transientCache that can be used to hold data for N route transitions
FEATURE: remember scroll position when hitting back from full page search
2015-09-09 11:52:11 +10:00
cb787b99bd
use outerHeight to calculate menu height
2015-09-08 14:37:07 -07:00
1c90f77d09
Merge pull request #3715 from gwwar/quote_newline_code
...
workaround for code block being parsed before quote block.
2015-09-08 16:52:46 -04:00
cf114f323d
Merge pull request #3737 from tgxworld/reload_page
...
Reload page when dealing with mass actions on topic.
2015-09-08 16:34:38 -04:00
d3666d3468
FIX: If private messages are disabled don't show the menu link
2015-09-08 16:32:20 -04:00
7b4bb186cd
Add margin to allow for right and left box-shadow
2015-09-08 11:43:18 -07:00
0e02e0272d
FIX: always-enabled plugins should be, well, enabled
2015-09-08 19:28:05 +02:00
e3a80936c8
prefer empty href attribute to #
2015-09-08 18:27:20 +02:00
c0136eb6e6
FIX: IP lookup was broken with relaxed user routes
2015-09-08 12:16:49 -04:00
f887637935
Don't use the container to look up the store for drafts
2015-09-08 11:34:52 -04:00
b549ed15b9
Reload page when dealing with mass actions on topic.
2015-09-08 23:25:52 +08:00
113cb4d3ad
FIX: '@observes' doesn't work that way
2015-09-08 10:34:36 +02:00
202e30097f
FIX: clicking on number should open user drawer
2015-09-08 18:01:48 +10:00
f9f52e3edc
FIX: misuse of @observes
...
it is passed "this" and the name of the property that changed, not actual values
2015-09-08 17:16:20 +10:00
b2633098ee
FIX: regression unable to send any PMs if you have a PM draft
2015-09-08 16:57:52 +10:00
71892cc5f4
FEATURE: select all / deselect all on search page
2015-09-08 16:11:21 +10:00
0c5189fa2a
SECURITY: fix possible XSS expanding quotes
2015-09-08 15:25:00 +10:00
e13ed24122
FEATURE: on mobile take users to full page search
...
UX: improve styling on full page search page
FEATURE: allow search context in full page search
FEATURE: visited color link for full page search
FIX: broken search help on fulls page search page
FEATURE: allow preload store to return a null
FEATURE: "mobileAction" for the header buttons
2015-09-08 11:04:03 +10:00
e37dd5a393
FIX: don't reload the page when clicking the number in a notification on mobile
2015-09-07 19:33:04 +02:00
d5a2029026
FIX: category permissions weren't properly loaded when /categories is the homepage
...
FIX: don't scope to a specific category when creating a new topic from /categories
2015-09-07 18:52:53 +02:00
d05bc64df8
do not default button title tag to label
2015-09-07 19:24:13 +05:30
335be272ff
FEATURE: implement capping of new/unread
...
We cap new and unread at 2/5th of SiteSetting.max_tracked_new_unread
This dynamic capping is applied under 2 conditions:
1. New capping is applied once every 15 minutes in the periodical job, this effectively ensures that usually even super active sites are capped at 200 new items
2. Unread capping is applied if a user hits max_tracked_new_unread,
meaning if new + unread == 500, we defer a job that runs within 15 minutes that will cap user at 200 unread
This logic ensures that at worst case a user gets "bad" numbers for 15 minutes and then the system goes ahead and fixes itself up
2015-09-07 12:03:17 +10:00
342eba4374
FEATURE: Category reordering dialog
2015-09-06 16:53:52 -07:00
e06d407153
Merge pull request #3718 from tgxworld/allow_emojis_to_be_copy_and_pasted
...
FIX: Allow user to quote Emojis.
2015-09-07 08:48:34 +10:00
81ba90fd22
suppress editor toolbar buttons a bit
2015-09-05 22:22:04 -07:00
73526e1211
FIX: Category permissions were broken
2015-09-05 11:40:12 -04:00
fa7d38a773
Merge pull request #3730 from riking/patch-7
...
FIX: Mentions unreadable on user cards
2015-09-04 15:48:28 -07:00
72d32160b3
FIX: Mentions unreadable on user cards
2015-09-04 14:19:11 -07:00
32e2d7963a
FEATURE: Show FAQ at top of the hamburger until the user reads it
2015-09-04 16:56:02 -04:00
5881f68556
Support for rewiring plugin outlets so we can move Akismet up
2015-09-04 16:09:02 -04:00
ea606a348f
FEATURE: post-after-cooked plugin-outlet
2015-09-04 12:45:04 -07:00
Jeff Atwood
Sam
Guo Xiang Tan
scossar
Robin Ward
Neil Lalonde
Régis Hanol
getabetterpic
Kane York
Rafael dos Santos Silva
Arpit Jalan