Sam
5e3a0846f7
FEATURE: allow themes to share color schemes
2017-04-17 15:56:24 -04:00
Sam
679b6548e6
FIX: order child themes by name
2017-04-13 10:51:44 -04:00
Sam
a3e8c3cd7b
FEATURE: Native theme support
...
This feature introduces the concept of themes. Themes are an evolution
of site customizations.
Themes introduce two very big conceptual changes:
- A theme may include other "child themes", children can include grand
children and so on.
- A theme may specify a color scheme
The change does away with the idea of "enabled" color schemes.
It also adds a bunch of big niceties like
- You can source a theme from a git repo
- History for themes is much improved
- You can only have a single enabled theme. Themes can be selected by
users, if you opt for it.
On a technical level this change comes with a whole bunch of goodies
- All CSS is now compiled using a custom pipeline that uses libsass
see /lib/stylesheet
- There is a single pipeline for css compilation (in the past we used
one for customizations and another one for the rest of the app
- The stylesheet pipeline is now divorced of sprockets, there is no
reliance on sprockets for CSS bundling
- CSS is generated with source maps everywhere (including themes) this
makes debugging much easier
- Our "live reloader" is smarter and avoid a flash of unstyled content
we run a file watcher in "puma" in dev so you no longer need to run
rake autospec to watch for CSS changes
2017-04-12 10:53:49 -04:00
Arpit Jalan
30a8c5cca2
FIX: render emoji in topic title
2017-04-12 10:38:17 -04:00
Régis Hanol
d1c79372d7
fix permalinks serializer with subfolder setups
2017-04-05 18:45:01 +02:00
Guo Xiang Tan
f4758a4c4d
FEATURE: Allow admins to schedule a topic to be published in the future.
2017-04-04 11:16:05 +08:00
Guo Xiang Tan
34b7bee568
FEATURE: Allow admin to auto reopen at topic.
...
* This commit also introduces a `TopicStatusUpdate`
model to support other forms of deferred topic
status update in the future.
2017-03-31 11:14:18 +08:00
Guo Xiang Tan
7c17966171
FEATURE: Include email in `User` webhook.
...
https://meta.discourse.org/t/should-the-email-address-of-a-new-user-be-included-in-the-webhook/59255
2017-03-25 08:23:01 +08:00
Neil Lalonde
11ce73b8ed
FEATURE: category setting for default top period
2017-03-22 16:54:18 -04:00
Neil Lalonde
9ae8813a53
FIX: admin user page should show count of all posts, including private messages, so admins can delete them. This bug was making it impossible to delete users.
2017-03-17 17:01:45 -04:00
Erick Guan
cfbfea0596
FEATURE: Allow easier customization to the web hook event serialization.
2017-03-16 10:09:05 +08:00
Neil Lalonde
6d7e968e30
FEATURE: box-style rendering of sub-categories
2017-03-13 15:25:52 -04:00
Neil Lalonde
6aab8cb331
FEATURE: new category setting for whether to show latest topics or top topics by default
2017-03-03 11:30:44 -05:00
Guo Xiang Tan
442bef2df9
Merge pull request #4706 from gsambrotta/add-name-search-dropbox
...
FEATURE: Add user name in search results
2017-03-02 15:22:15 +08:00
Neil Lalonde
262016604d
FEATURE: each category can control how many topics to show on categories page
2017-03-01 15:12:57 -05:00
giorgia
d308638a18
create searchResultUserSerializer, display name next to username in search results
2017-03-01 13:11:01 +01:00
Neil Lalonde
a702330ccd
FEATURE: make show_subcategory_list a per-category setting
2017-02-22 11:42:36 -05:00
Arpit Jalan
046cbad10b
FEATURE: add a button on admin user page that links to action log
2017-02-21 21:38:37 +05:30
Neil Lalonde
476ae57af3
FEATURE: primary group class on avatars in topic list
2017-02-20 15:55:10 -05:00
Arpit Jalan
dc2171960b
FIX: allow existing users to be invited to topic/message when must_approve_users is enabled
2017-02-03 13:01:23 +05:30
Guo Xiang Tan
156a00af47
UX: Show edit button on post revision modal as long as user can edit.
2017-01-27 10:49:17 +08:00
Guo Xiang Tan
ee396edd9c
Add edit post button to post revision modal for wiki-ed posts.
2017-01-25 14:36:00 +08:00
Neil Lalonde
61d4c1203e
FEATURE: group avatar flair shows on topic participants list, and participant avatars can have custom styles
2017-01-18 11:38:00 -05:00
Claas Augner
ad86d4a3e3
FIX: Translate titles of email templates
2017-01-05 01:26:38 +01:00
Sam
2b808ad9da
Merge pull request #4609 from joebuhlig/category-topics-wiki
...
FEATURE: Category setting to make all topics wikis
2016-12-20 09:15:51 +11:00
Neil Lalonde
923cf73c6e
Topic Featured Links: move data from custom fields to topics and categories tables. Invert behaviour of topic_featured_link_allowed checkbox. Fix a bug with invalid topic records due to changing that category checkbox.
2016-12-19 14:54:07 -05:00
Joe Buhlig
87251fded7
FEATURE: Category setting to make all topics wikis
...
FEATURE: Category setting to make all topics wikis
2016-12-19 06:42:18 -06:00
Guo Xiang Tan
43ee9f884e
FEATURE: Add `Group#full_name`.
2016-12-13 16:16:26 +08:00
Guo Xiang Tan
da7009a968
FEATURE: Add request membership button for allowed groups.
2016-12-12 22:48:08 +08:00
Guo Xiang Tan
9a800107cb
FIX: Associate category logo and background to uploads record.
2016-12-12 17:37:28 +08:00
Guo Xiang Tan
05f55dbc10
FEATURE: Group logs.
2016-12-12 17:29:54 +08:00
Guo Xiang Tan
be5b5f6bea
FEATURE: Public groups.
2016-12-12 17:00:30 +08:00
Erick Guan
52763f5115
FEATURE: Allow posting a link with topics
2016-12-05 17:20:54 +01:00
Guo Xiang Tan
bea0856f1c
FIX: Move title and name out of BasicUserSerializer.
2016-12-05 18:46:33 +08:00
Guo Xiang Tan
cdb7e14fa7
PERF: Show excerpt on group page.
2016-12-05 18:15:38 +08:00
Guo Xiang Tan
ce9f24dec9
Merge pull request #4588 from tgxworld/add_new_fields_to_group
...
Add new fields to group
2016-12-05 09:59:27 +01:00
Guo Xiang Tan
adb7fcb6b3
FEATURE: Add bio to group page.
2016-12-05 16:58:04 +08:00
Sam
dab48b7c17
correct regression
2016-12-05 17:40:47 +11:00
Guo Xiang Tan
0441ae3e95
Merge pull request #4577 from tgxworld/allow_group_owner_to_edit
...
FEATURE: Allow group owners to edit group name and avatar flair.
2016-12-05 07:28:55 +01:00
Guo Xiang Tan
31acd311e5
FEATURE: Allow group owners to edit group name and avatar flair.
2016-12-05 14:27:46 +08:00
Sam
c2a17826e7
ship highest staff post number to staff
2016-12-05 17:22:25 +11:00
Sam
c04d4171ff
FIX: whisper no longer experimental
...
- Regular users are not notified of whispers
- Regular users no longer have "stuck" topics in unread
- Additional tracking for staff highest post number
- Remove a bunch of unused columns in topics table
2016-12-02 17:03:31 +11:00
Guo Xiang Tan
559918c6c6
PERF: Add endpoint to check if a group can be mentioned by user.
2016-11-26 02:20:46 +08:00
Guo Xiang Tan
5794f1619d
PERF: Fix N+1 queries when loading groups.
2016-11-26 02:20:26 +08:00
Guo Xiang Tan
fbc3fcc4af
PERF: Make use of existing index.
2016-11-25 11:19:13 +08:00
Guo Xiang Tan
84914c5e1f
PERF: Fix N+1 query.
2016-11-24 17:47:14 +08:00
Guo Xiang Tan
a8b7599d4a
FEATURE: Add a radial ping when user's first notification has not been read.
2016-11-08 16:23:12 +08:00
Neil Lalonde
9ef1688a76
FEATURE: per-category default topic list sort order
2016-11-01 12:18:41 -04:00
Robin Ward
c03d25f170
FEATURE: Configure Admin Account
...
Adds a "Step 0" to the wizard if the site has no admin accounts where
the user is prompted to finish setting up their admin account from the
list of acceptable email addresses.
Once confirmed, the wizard begins.
2016-10-19 11:27:56 -04:00
Sam
f4f5524190
FEATURE: user API now contains scopes so permission is granular
...
previously we supported blanket read and write for user API, this
change amends it so we can define more limited scopes. A scope only
covers a few routes. You can not grant access to part of the site and
leave a large amount of the information hidden to API consumer.
2016-10-14 16:05:42 +11:00
cpradio
6f1c31d777
Add notification level user preference when replying to a topic
2016-09-30 14:58:07 -04:00
Neil Lalonde
e0be2f482e
FEATURE: tag filter dropdown menu is scoped to user and category
2016-09-22 15:23:37 -04:00
Robin Ward
2a0443445b
New step to choose emoji set
2016-09-22 09:52:19 -04:00
Robin Ward
9938f9bd67
Added images to the first and last step of the wizard
2016-09-22 09:52:19 -04:00
Robin Ward
29cf47cfb2
Track steps the user has completed, nag them to finish it.
2016-09-22 09:52:19 -04:00
Robin Ward
e3640ee5f6
Privacy Step
2016-09-22 09:52:19 -04:00
Robin Ward
c94e6f1b96
Add locale step
2016-09-22 09:52:19 -04:00
Robin Ward
3f6e3b9aff
Wizard - Color Scheme Step
2016-09-22 09:52:19 -04:00
Robin Ward
9f12b571ef
Wizard: Server Side Validation + Finished Step
2016-09-22 09:52:19 -04:00
Robin Ward
3a4615c205
Wizard: Step 1
2016-09-22 09:48:58 -04:00
Guo Xiang Tan
2470d1f65a
Revert "FIX: serve category images from the CDN"
...
This reverts commit d0962d6e5a
.
2016-09-22 11:29:04 +08:00
Erick Guan
00d5facf36
FEATURE: prompts new webhook events
2016-09-19 12:07:17 +08:00
Sam
24401e71bf
FEATURE: add seen_notification_id to current user serializer
2016-09-18 14:30:32 +10:00
Neil Lalonde
e3e15182df
FEATURE: avatar flair on user cards
2016-09-15 16:15:18 -04:00
Erick Guan
9ce61b4586
FEATURE: Webhooks.
2016-09-05 18:44:00 +08:00
Sam
55fad7b339
FIX: missing avatars from categories page when ajax loaded
...
UX: display last poster on categories page instead of OP
2016-08-31 14:02:30 +10:00
Régis Hanol
e064e6f7a3
FEATURE: new 'categories_and_latest' endpoint
2016-08-29 22:47:44 +02:00
Régis Hanol
5833e96017
FIX: use 'topic_all_time' as topic count failover in /categories page
2016-08-29 10:25:46 +02:00
Neil Lalonde
2251104e32
FEATURE: avatar flair can be font awesome icons
2016-08-26 17:15:37 -04:00
Robin Ward
c3a3aff120
FEATURE: Support for a whitelist for embeddable host paths
2016-08-23 14:56:12 -04:00
Sam
11f9a463ac
FEATURE: highlight last visited topic in topic list
2016-08-19 11:58:39 +10:00
Régis Hanol
eb953c0904
FIX: /categories page on mobile
2016-08-19 01:47:00 +02:00
Régis Hanol
6d1d7b7c8f
UX: new /categories layout
2016-08-17 23:23:16 +02:00
Neil Lalonde
d079f69b7b
FEATURE: add flair to avatars using new settings in the groups admin UI
2016-08-17 15:13:15 -04:00
Sam
416e7e0d1e
FEATURE: basic UI to view user api keys
2016-08-16 17:06:52 +10:00
Robin Ward
748a9e008f
FIX: Missing `post_number` in searching within a topic
2016-08-10 17:54:30 -04:00
Robin Ward
c1125c8649
PERF: Use simpler serializer for search, eager load post users
2016-08-09 14:49:46 -04:00
Robin Ward
429f27ec96
SECURITY: Avoid mass assignment on user create
2016-08-05 11:57:13 -04:00
Régis Hanol
d0962d6e5a
FIX: serve category images from the CDN
2016-08-05 13:03:49 +02:00
Sam
9018de39ed
FEATURE: allow shipping bio markdown via SSO
...
- Also adds site setting for sso_overrides_bio to disable bio editing by end users
2016-08-01 15:29:28 +10:00
Robin Ward
b2289d733f
List the "Watching First Post" tags on preferences
2016-07-22 16:16:45 -04:00
Sam Saffron
46b34e3c62
FEATURE: remove user option for edit history public
...
Users can no longer opt-in for "public" edit history
if site owner disables it.
This feature adds cost and complexity to post rendering since
user options need to be premeptively loaded for every user in the
stream. It is also confusing to explain to communities with private edit
history.
2016-07-16 21:30:00 +10:00
Neil Lalonde
a74606c87c
PERF: tag groups index query
2016-07-15 17:16:26 -04:00
Neil Lalonde
61ada93a99
FIX: category settings showed top tags instead of tag settings
2016-07-15 14:08:42 -04:00
Arpit Jalan
c626558d36
UX: group pages should not show Messages tab to unauthorised users ( #4318 )
2016-07-09 00:50:04 +05:30
Sam
f1b1b0da14
FEATURE: show watched first post in user page
2016-07-08 14:08:10 +10:00
Sam
4161ee210a
FEATURE: improved tag and category watching and tracking
...
- present tags watched on the user prefs page
- automatically watch or unwatch old topics based on watch status
New watching and tracking logic takes care of handling old topics
(either with or without read state)
When you watch a topic you now watch historically
Also removes confusing warnings from user.
2016-07-08 12:58:30 +10:00
Guo Xiang Tan
8fd0414cdf
WIP: Tags which are not allowed in a category showing in drop down.
2016-07-08 10:27:56 +08:00
Neil Lalonde
c63b0162e0
FIX: show tags in suggested topics list
2016-07-05 15:00:09 -04:00
Sam
c182836709
UX: include posters in suggested topics
...
required for mobile
2016-07-05 10:10:12 +10:00
Guo Xiang Tan
e221414935
PERF: Remove N+1 queries on user messages page.
2016-06-29 09:30:54 +08:00
Neil Lalonde
be338892ec
FIX: post revision history wasn't showing tags correctly
2016-06-15 14:15:30 -04:00
Neil Lalonde
a6090339a7
FEATURE: tag group options: limit usage of one tag per group, tags in a group can't be used unless a prerequisite tag is used
2016-06-09 16:01:19 -04:00
Neil Lalonde
a49ace0ffb
FEATURE: ability to restrict tags to categories using groups
2016-06-07 15:36:20 -04:00
Neil Lalonde
f3f6c2f98f
FEATURE: tag groups
2016-06-06 14:18:48 -04:00
Régis Hanol
31c0a22266
UX: special message when the user have enabled mailing_list_mode
2016-06-01 22:47:42 +02:00
Robin Ward
3c30fa628b
FIX: "Go Back" wasn't displaying properly most of the time
2016-05-31 10:51:50 -04:00
Robin Ward
559fa36c18
FEATURE: Topic timeline widget
2016-05-31 10:51:39 -04:00
Neil Lalonde
6796b15857
FEATURE: restrict tags to be used in a category
2016-05-30 16:56:33 -04:00
Neil Lalonde
f13470b96b
Use db schema for tags instead of plugin store and custom fields
2016-05-26 14:29:48 -04:00
James Kiesel
feffe23cc5
FEATURE: More granular mailing list mode ( #4068 )
...
* Rearrange frontend to account for mailing list mode
* Allow update of user preference for mailing list frequency
* Add mailing list frequency estimate
* Simplify frequency estimate; disable activity summary for mailing list mode
* Remove combined updates
* Add specs for enqueue mailing list mode job
* Write mailing list method for mailer
* Fix linting error
* Account for stale topics
* Add translations for default mailing list setting
* One query for mailing list topics
* Fix failing spec
* WIP
* Flesh out html template
* First pass at text-based mailing list summary
* Add user avatar
* Properly format posts for mailing list
* Move make_all_links_absolute into Email::Styles
* Apply first_seen_at to user
* Send mailing list email summary hourly based on first_seen_at
* Branch and test cleanup
* Use existing mailing list mode estimate
* Fix failing specs
2016-05-21 15:17:54 +02:00
Arpit Jalan
e2df79ee9e
FIX: handle posts with no user on needs approval page
2016-05-20 15:44:19 +05:30
Régis Hanol
03605f1b01
hide bookmarks count in user summary except for yourself
2016-05-09 15:51:43 +02:00
Régis Hanol
1e57bbf5c8
Lots bounce emails related fixes
...
- Show bounce score on user admin page
- Added reset bounce score button on user admin page
- Only whitelisted email types are sent to emails with high bounce score
- FIX: properly detect bounces even when there is no TO: header in the email
- Don't desactivate a user when reaching the bounce threshold
2016-05-06 19:34:33 +02:00
Régis Hanol
c775ea7b5e
add 'Most Liked' and 'Most Replied To' columns in user summary
2016-05-04 22:48:30 +02:00
Régis Hanol
8e611ec7a1
FEATURE: handle bounced emails
2016-05-02 23:15:32 +02:00
Neil Lalonde
e5918c7d00
FEATURE: Merge tagging plugin into core
2016-04-27 11:58:53 -04:00
Régis Hanol
2016e1cda1
UX: show topics where the top links are extracted from in user summary
2016-04-20 22:58:30 +02:00
Régis Hanol
4960b62110
FEATURE: new 'block_auto_generated_emails' site setting
2016-04-20 21:29:27 +02:00
James Kiesel
c0138c0277
Remove gunk from post stream serializer mixin ( #4176 )
2016-04-18 11:55:23 -04:00
Sam
a1d65ae8f6
UX: show topic title in email logs
2016-04-15 10:38:02 +10:00
Régis Hanol
e808f7f41e
User Summary improvements
...
Added "Top Links" list
Added "Most Liked By" list
Added "Bookmark count" stat
UX: Use fa heart icon instead of "like" text in stats
Change the order of the user stats
2016-04-13 23:02:51 +02:00
Robin Ward
e91379916b
FIX: Provide the ability to `reduce` cooked content
...
This allows us to strip polls from the group posts page.
2016-04-13 13:25:18 -04:00
David McClure
2cbd87c08c
Remove www. from website name
2016-04-11 07:13:33 -07:00
David McClure
c6f6b17f71
UX: Show website path in website name for all domains
...
Query parameters are still truncated in website name
2016-04-10 18:55:01 -07:00
Thorben Egberts
cf8b3fbd56
FEATURE: add user custom fields to user card
...
The user's custom fields are now displayed on the user card. This has to be enabled for each custom field in the custom field settings. See https://meta.discourse.org/t/custom-user-fields-on-usercard/22662/
2016-04-08 14:35:41 +02:00
Régis Hanol
2ac38e9d05
show all headers in rejected email details modal
2016-03-30 19:05:42 +02:00
Régis Hanol
bf579174c1
UX: improved user summary page
2016-03-30 18:05:16 +02:00
Sam
95076050f4
FEATURE: warn about mailing list mode if it is checked
2016-03-29 18:50:17 +11:00
Sam
adbc22530c
FIX: don't show badges in summary page if badges disabled
2016-03-29 17:12:15 +11:00
Sam
fe51f84aa7
FEATURE: allow admins to enter badge long descriptions
...
FIX: fallback to description if badge long description is missing
Also moves all badge localization into server.en, this slims the client down
serializers pass down localized names/descriptions/long descriptions
2016-03-28 18:38:57 +11:00
Robin Ward
27c793a990
UX: Show badges as cards on the badges index and show page
2016-03-25 15:33:06 -04:00
Neil Lalonde
213950e4cf
FEATURE: add option to include topics from trust level 0 users in digest emails
2016-03-17 17:35:23 -04:00
Robin Ward
1006b1ba94
Various Plugin Enhancements and Extension Points
2016-03-11 15:53:37 -05:00
Arpit Jalan
eb6a17f587
UX: show emoji in topic title on groups page
2016-03-11 13:36:31 +05:30
Régis Hanol
622d804d46
FEATURE: Add rejection message on rejected IncomingEmail
...
FIX: Better RateLimit description in rejected IncomingEmail
FEATURE: Send email when hitting a rate limit
2016-03-07 16:56:17 +01:00
Neil Lalonde
c1aea91d63
FEATURE: More digest email frequency options. Digests can be sent as often as every 30 minutes.
2016-03-02 15:43:47 -05:00
Arpit Jalan
bfaa4cdb37
FEATURE: compose a new pre-filled private message to a group via URL
2016-03-03 00:19:06 +05:30
Sam Saffron
5f4075a6cf
FEATURE: users can select how frequently they are notified on likes
...
- first time
- first time and daily (default)
- always
2016-03-02 23:16:52 +11:00
Sam Saffron
820a435af8
FEATURE: add "email in-reply-to user option"
...
We no longer include previous replies as "context", instead
we include and excerpt of the post being replied to at the bottom
of notifications, this information was previously missing.
Users may opt in to emailing previous replies if they wish
or opt out of "in-reply-to" which makes sense in some email clients that
are smarter about displaying a tree of replies.
2016-02-26 00:05:59 +11:00
Sam
ab06f86fbe
FEATURE: allow users to control how many previous replies they get
...
- always means we always send previous replies with every email
- never means we do not
- "unless previously sent" ... is the default, in which we only email you each reply once
The default_email_previous_replies site setting can control this toggle
2016-02-19 13:57:07 +11:00
Sam
f0e942f647
PERF: move 3 more option columns out of the user table
2016-02-18 16:57:22 +11:00
Sam
3829c78526
PERF: shift most user options out of the user table
...
As it stands we load up user records quite frequently on the topic pages,
this in turn pulls all the columns for the users being selected, just to
discard them after they are loaded
New structure keeps all options in a discrete table, this is better organised
and allows us to easily add more column without worrying about bloating the
user table
2016-02-17 18:08:25 +11:00
Régis Hanol
bf96025507
link email logs to the post that generate the email notification when available
2016-02-16 16:35:57 +01:00
Régis Hanol
91bb38626c
FEATURE: new incoming email details modal
2016-02-10 22:00:27 +01:00
Sam Saffron
3f67f91d27
need to allow for now scope
2016-02-04 00:19:08 +11:00
Sam Saffron
60ba9dcc5e
PERF: fix N+1 on categories page
2016-02-03 23:59:15 +11:00
Sam Saffron
bc75010b20
FEATURE: suggested messages for messages
...
FEATURE: clicking envelope takes you to inbox
Suggested messages works somewhat like suggested topics.
- New show up first (in either group inbox or inbox)
- Then unread (in either group inbox or inbox)
- Finally "related" which are messages with same participants as the current pm.
2016-02-03 18:50:05 +11:00
Gerhard Schlager
f4f87921c2
Replace uncategorized_description setting with translation
2016-01-28 00:26:25 +01:00
Régis Hanol
c88093eecb
Merge pull request #3920 from tgxworld/fix_onebox_emoji
...
FIX: Emoji in Discourse onebox is wrapped in square brackets.
2016-01-20 15:38:12 +01:00
Régis Hanol
0ba4bcb2ea
Merge pull request #3934 from gschlager/badges
...
UX: Show translated badge names and badge groupings
2016-01-20 14:42:30 +01:00
Sam Saffron
7303f8f309
FEATURE: first pass at user summary page
2016-01-20 15:14:25 +11:00
Régis Hanol
5018a8033d
FIX: add link to user profile for staged users
2016-01-19 16:41:07 +01:00
Régis Hanol
3083657358
FEATURE: better email in support
...
FEATURE: new incoming_email model
FEATURE: infinite scrolling in emails admin
FEATURE: new 'emails:import' rake task
2016-01-19 00:57:55 +01:00
Sam
ca3e2b4da3
FEATURE: you can not drill down and see why you have badges
...
Clicking on badges filters down the list to a particular user.
2016-01-18 17:59:20 +11:00
Guo Xiang Tan
a362ad9407
FIX: Emoji in Discourse onebox is wrapped in square brackets.
2016-01-13 19:00:11 +08:00
Arpit Jalan
e676974f16
Merge pull request #3953 from techAPJ/wiki
...
FEATURE: allow users to wikify their own posts based on trust level
2016-01-13 09:53:33 +05:30
Régis Hanol
e2744fc19f
FIX: adding the 'contains_messages' column back
2016-01-12 12:06:51 +01:00
Régis Hanol
8049dfdfda
CLEANUP: remove 'contains_messages' leftover 💩
2016-01-12 11:29:26 +01:00
Arpit Jalan
06bac23e5f
FEATURE: allow users to wikify their own posts based on trust level
2016-01-12 08:44:25 +05:30