Sam
8b87f095c6
PERF: don't render share dialog until we have a link.
2014-12-11 15:46:08 +11:00
Sam
46720b1017
PERF: don't render user card until displayed
2014-12-11 15:42:12 +11:00
Blake Erickson
02ade72ceb
Update username should return a json response
...
- Have update username return json response that contains the updated
username and id. I figured this would be better than just return "OK".
- Add test to verify that the new username is returned.
2014-12-10 09:43:16 -07:00
Robin Ward
d2a7904bf2
UX: Banner topics should be readable even with dark color schemes.
2014-12-10 10:46:30 -05:00
Robin Ward
ff758cea11
FIX: Text in select2 dropdowns should not be variable since the
...
background is always white.
2014-12-10 10:25:35 -05:00
Jeff Atwood
7e609e1834
do we need #list-area margin-bottom so big?
2014-12-10 00:33:45 -08:00
Sam
0542c080b3
PERF: optimise rendering of posts
2014-12-10 18:05:04 +11:00
Erick Guan
9937af7ac4
disable sending email or show presence when forgot system user password
2014-12-10 14:17:56 +08:00
Robin Ward
e76449d800
When using automatic file includes (es6, hbs) from plugins, allow the
...
asset pipeline to find new and deleted files with deleting the `tmp`
folder and restarting the server.
2014-12-09 15:23:14 -05:00
Robin Ward
2b817f826b
Allows us to easily define routes in plugins
2014-12-09 13:26:30 -05:00
Robin Ward
72efcc8e86
UX: Make category link text black in digest emails
2014-12-09 11:28:45 -05:00
Sam
4f4c49f702
Merge pull request #3031 from oblakeerickson/activate_return_json
...
Have activate user return json
2014-12-09 10:12:42 +11:00
Robin Ward
4de412365e
The `{{i18n}}` helper should use quotes when looking up keys, always.
2014-12-08 16:36:18 -05:00
Régis Hanol
63d4932549
Merge pull request #3032 from awesomerobot/master
...
adding max-height for embedded video
2014-12-08 21:48:19 +01:00
Kris Aubuchon
448acc627b
adding max-height for embedded video
2014-12-08 15:39:36 -05:00
Robin Ward
5fd3f2547c
FIX: Fix rerendering issues on some components.
2014-12-08 14:47:49 -05:00
Blake Erickson
1d0eccf710
Have activate user return json
...
- Change activate user from admin controller to return json
- Test that it returns json
- Remove unnessary test from log_out spec
This commit was created so that when you activate a user through the api
it returns a json response.
2014-12-08 11:16:57 -07:00
Robin Ward
7069ee16e2
FIX: Javascript error when uploading backup
2014-12-08 12:38:36 -05:00
Sam
3547c20aa7
add toolbar to pick emoji family, bump up number to 60
2014-12-08 16:45:24 +11:00
Sam
23163422e6
correct positioning when emoji is added
2014-12-08 14:22:54 +11:00
Sam
555b783864
Add shortcuts support for emoji toolbar
...
(CTRL E to open, ESC to close)
2014-12-08 13:32:26 +11:00
Sam
fdecd69228
Merge pull request #3026 from oblakeerickson/legacy_avatar
...
Remove legacy avatar code
2014-12-08 11:03:55 +11:00
Sam
a7659490c6
Merge pull request #3028 from tytkal/arabic_support
...
Arabic support
2014-12-08 11:03:12 +11:00
Sam
4082076e0d
Merge pull request #3029 from bear-metal/master
...
Introduce support for being able to dump Rails heap after script/bench.rb runs
2014-12-08 11:01:08 +11:00
Régis Hanol
fe007d08b3
FIX: remove links and html 'hellips' from topic/post summaries
2014-12-08 00:23:53 +01:00
Lourens Naudé
fb60daa867
Introduce support for dumping Rails process heap at the end of a benchmark run
2014-12-07 22:55:37 +00:00
khalid al-hussayen
9fc0a3f6f9
add arabic local files
2014-12-07 23:05:24 +03:00
Blake Erickson
e9e88c9b82
Remove legacy avatar code
...
- Remove method that was only left around because the
[api](https://github.com/discourse/discourse_api/pull/53 ) called it
- Modify test to use new route instead of legacy route
https://meta.discourse.org/t/legacy-route-for-avatars/22838/2
2014-12-07 06:13:14 -07:00
Sam
c05203d449
typo
2014-12-07 16:43:26 +11:00
Sam
16c2562e57
Add more logging aroung blank posts
2014-12-07 16:39:30 +11:00
Régis Hanol
929ff00741
FIX: use excerpt instead of the summary
2014-12-06 18:48:39 +01:00
Régis Hanol
dec881ac9d
Merge pull request #3024 from oblakeerickson/avatar_return_json
...
Have pick_avatar return json.
2014-12-06 18:20:42 +01:00
Blake Erickson
a61519eebf
Have pick_avatar return json.
...
I'm working on writing a test in the discourse_api gem for uploading
avatars and the pick method needs to return a json response.
I also added a test to make sure json is returned.
2014-12-06 09:26:32 -07:00
Régis Hanol
86c4c947a3
FIX: drastically simplify auto-close topic logic
...
Get rid of this nonsensical maximum-flow algorithm :fired:
2014-12-06 16:29:54 +01:00
Robin Ward
da4e19af5b
Deprecations for future ember, `{{outlet}}` names need strings
2014-12-05 17:06:20 -05:00
Robin Ward
72749a24e1
FIX: Broken HTML (thanks HTMLbars)
2014-12-05 17:03:08 -05:00
Neil Lalonde
0f37ce1083
FIX: share popup on mobile layout went outside of viewport, and z-index was behind user avatars. Use a real link on touch devices instead of a text input.
2014-12-05 16:21:07 -05:00
Régis Hanol
cd170ca548
FEATURE: auto-close topics based on community flags
2014-12-05 19:37:43 +01:00
Sam
357a12f78e
FEATURE: work-in-progress emoji selector toolbar item
2014-12-05 17:19:17 +11:00
Sam
bc772233a7
ramp it down to 1 second, already handled on server so it will hold you back
2014-12-05 09:58:50 +11:00
Sam
3faa220dbc
ramp down "Forgot password" disable down to 5 seconds.
2014-12-05 09:56:46 +11:00
Robin Ward
50b75084bd
Merge pull request #3025 from awesomerobot/master
...
fixing loading spinner alignment and striping
2014-12-04 17:13:22 -05:00
Robin Ward
5f6f85b182
FIX: Disable loading below HTML, we have our own spinner for that and it
...
broke scrolling on some custom CSS.
2014-12-04 17:12:47 -05:00
Kris Aubuchon
d8c8264b4e
fixing loading spinner alignment and striping
2014-12-04 17:05:47 -05:00
Neil Lalonde
917a91eb40
FIX: permalink redirect support for url's with extensions in them, like .html and .php
2014-12-04 16:39:10 -05:00
Robin Ward
dd7b3d313e
FIX: Selecting default option without changing HTML markup.
...
I also filed a bug on Ember.js with details on the error.
2014-12-04 15:21:47 -05:00
Robin Ward
5ec77d4be4
FIX: If a category can't be found, don't include it in the list
2014-12-04 13:04:58 -05:00
Robin Ward
5492bbe11c
FIX: Couldn't click delete topic button due to missing action
2014-12-04 11:49:53 -05:00
Robin Ward
e035b07e92
Put Ember 1.8.1 + fixes back.
2014-12-04 08:51:35 -05:00
Sam
8f4e8fe8f2
FIX: only show "new pm" in pm tab when looking at your own profile
2014-12-04 13:50:36 +11:00
Sam
4aa0d88c6c
FEATURE: search private messages option
2014-12-04 13:50:36 +11:00
Kris Aubuchon
96ae3eccb3
making some adjustments to how posts are laid out so they don't break at small widths
2014-12-03 20:20:19 -05:00
Jason W. May
efa872e426
optional custom value for category slug (create and update)
2014-12-03 16:23:59 -08:00
Robin Ward
52f7f8e471
FIX: Check if the bio_cooked exists before outputting it.
2014-12-03 16:05:13 -05:00
Robin Ward
7f60276d66
FIX: Word null appearing in user card
2014-12-03 16:02:17 -05:00
Robin Ward
7bf669ccf3
FIX: Don't show `undefined` in the footer text.
2014-12-03 12:30:42 -05:00
Robin Ward
39fde5b9fb
Upgrade to 1.8.1: So long, metamorphs!
2014-12-03 10:49:18 -05:00
Régis Hanol
b4363de280
FIX: reload current page when deleting a user
2014-12-03 16:03:42 +01:00
Régis Hanol
0f0a329e7c
FIX: private message button wasn't adding the recipient (cc @gdpelican)
2014-12-03 14:55:43 +01:00
Régis Hanol
f9f54e2626
refactor fix in 67c4c90159
2014-12-03 13:00:02 +01:00
Régis Hanol
8ab32396a7
Merge pull request #3009 from gdpelican/feature/new-private-message
...
New Private Message button for user topics
2014-12-03 12:17:45 +01:00
Régis Hanol
7edb88a5a8
FIX: change top score formula
...
Adds more weight to `likes` (it's now the same weight as `post_count`)
2014-12-03 11:51:49 +01:00
Arpit Jalan
f84bdfdde3
FIX: if full user name is not provided, username should be present in email From header
2014-12-03 13:12:05 +05:30
Jeff Atwood
ea269ccfb2
rename purge_inactive to purge_unactivated
2014-12-02 21:36:25 -08:00
Sam
a8ff5fe97c
Merge pull request #3002 from jmay/group-membership-api
...
use limit & offset for pagination of group members
2014-12-03 11:11:10 +11:00
Jeff Atwood
2ad0aeea2f
Merge pull request #3015 from awesomerobot/master
...
a few very minor visual tweaks
2014-12-02 15:16:14 -08:00
Kris Aubuchon
ea37946d00
a few very minor visual tweaks
2014-12-02 17:10:14 -05:00
Robin Ward
c90668ae53
FIX: Better protection for invites scrolling
2014-12-02 17:03:12 -05:00
Robin Ward
008337b018
FIX: Selecting one user in admin would select them all
2014-12-02 15:30:57 -05:00
Robin Ward
67c4c90159
FIX: Clicking avatars broke for non-admins
2014-12-02 15:24:05 -05:00
Régis Hanol
461196f089
FEATURE: 'delete user' button in the user card in the admin section
2014-12-02 18:52:56 +01:00
Régis Hanol
99928cac26
FEATURE: use actual time in preference > email notifications' instruction
2014-12-02 18:15:32 +01:00
Robin Ward
87667cfe17
FIX: Editing a category definition topic was clearing its permissions
2014-12-02 11:46:21 -05:00
Régis Hanol
1210486623
FIX: editing the 1st post of a private message wasn't working
2014-12-02 16:04:45 +01:00
Arpit Jalan
2ead3fca69
FIX: exportUsers action was deleted, so user export was failing
2014-12-02 16:05:43 +05:30
Jeff Atwood
3fcde72656
bit shorter max width on mobile categories
2014-12-02 00:41:51 -08:00
Jeff Atwood
0503599de7
suppress long category names on mobile
2014-12-02 00:19:42 -08:00
Régis Hanol
f226e4efc0
FIX: don't error out when updating a topic with no changes
2014-12-02 02:16:30 +01:00
Robin Ward
b547be44b2
Better error message output
2014-12-01 14:53:37 -05:00
Régis Hanol
64b06b360a
Merge pull request #3008 from oblakeerickson/log_out_return_success
...
Have log_out method return json
2014-12-01 14:26:06 +01:00
Blake Erickson
bdc92eec70
Have log_out method return json.
...
This commit helps improve the discourse_api experience so that we can
check the json response if it was a success or not. This commit also
checks that a 404 is sent instead of a 500 if a bad user_id is passed
in.
2014-12-01 06:03:25 -07:00
James Kiesel
cc76087f59
Add new private message button on topics list
...
That'll teach me to wildly refactor things.
2014-12-02 00:53:49 +13:00
Jeff Atwood
c00c5e1024
our previous mobile avatar tap fix was incorrect
2014-12-01 03:36:25 -08:00
Jeff Atwood
003d32babe
decrease size of cat color stripe in digests a bit
2014-11-29 03:58:44 -08:00
Robin Ward
cb0e7a5724
For performance reasons, use `delete_all` when removing a user's email logs
2014-11-28 14:20:43 -05:00
Robin Ward
37a3e956b6
UX: Link categories in digest emails
2014-11-28 13:44:40 -05:00
Jeff Atwood
a85a3da167
move digest email featured post category underneath
2014-11-28 00:38:08 -08:00
Régis Hanol
07211489f0
FIX: hide restricted profile info from TL0 users to anonymous in 'JS-off' page
2014-11-27 19:51:13 +01:00
Régis Hanol
5b90ceb71d
FEATURE: rolls up 1.2.*.* IP ranges when number of entries > 10
2014-11-27 19:29:30 +01:00
Jeff Atwood
31b769d4fa
remove unneeded mobile footer left margin
2014-11-27 03:35:05 -08:00
Jeff Atwood
4589f28676
remove unwanted global text input font sizing
2014-11-27 02:13:15 -08:00
Jeff Atwood
c3a47aee70
use shorter Export button copy
2014-11-26 23:57:18 -08:00
Sam
013f1a6dd0
FEATURE: allow creating admin and moderator accounts via SSO
2014-11-27 12:39:00 +11:00
Sam
800ae5265f
Add admin and moderator state to sso provider
2014-11-27 12:24:37 +11:00
Régis Hanol
4e735e8aab
FIX: roll up staff action wasn't working
2014-11-27 01:12:56 +01:00
Sam
3fd4fc679e
a few missing spots
2014-11-27 11:02:54 +11:00
Sam
5c965dcb0b
FEATURE: show card when clicking on avatar in admin user list
2014-11-27 10:46:32 +11:00
Robin Ward
8366fcd78f
FIX: Don't lose focus on site settings text field (was changing routes
...
during filtering)
2014-11-26 18:01:45 -05:00
Robin Ward
257bde8e2b
FEATURE: "Suspect" users list in admin.
2014-11-26 13:58:16 -05:00
Régis Hanol
10b5032188
FIX: auto-closing attribution when a TL4 user auto-closes a topic
2014-11-26 19:51:07 +01:00
Régis Hanol
27d78332c4
FEATURE: restrict some user fields for TL0 users when viewed by anonymous users
2014-11-26 19:20:03 +01:00
Robin Ward
cb124d5836
UX: Consolidate "Admins" and "Moderators" into "Staff" on admin users
...
list
2014-11-26 13:10:12 -05:00
Robin Ward
a3e53e0d28
Use far fewer admin user list routes, instead pass the query as a
...
parameter.
2014-11-26 13:05:49 -05:00
Régis Hanol
41deea6892
Merge pull request #3006 from awesomerobot/master
...
fixing reply-tab bug and user profile background adjustment
2014-11-26 16:53:57 +01:00
Kris Aubuchon
1524612719
fixing reply-tab bug and user profile background adjustment
2014-11-26 10:49:50 -05:00
Régis Hanol
d7ef4f1edd
remove useless 'puts'
2014-11-26 16:40:03 +01:00
Régis Hanol
37a9164fa0
FIX: click counter for attachments
2014-11-26 13:05:43 +01:00
Sam
c10e3df012
FEATURE: implement SSO provider on Discourse so Auth can be farmed to it
...
FEATURE: pass return_sso_url to SSO endpoints, for easier return
2014-11-26 17:26:27 +11:00
Robin Ward
81eedf3a12
No need to call it `Discourse.TopicRoute` -- that is done automatically
...
by the compatibility layer. cc @ZogStrIP
2014-11-25 18:21:21 -05:00
Robin Ward
220f2424b5
FIX: Load order issue / header category badge when not surpressed
2014-11-25 18:13:38 -05:00
Sam
d171d6db19
FEATURE: export sso data if sso is enabled
2014-11-26 09:43:28 +11:00
Robin Ward
4c9f55d1e1
FIX: Suspended users should have links stripped from their profiles.
2014-11-25 16:14:39 -05:00
Régis Hanol
183c93904d
FIX: don't show the banner topic on error page
2014-11-25 19:09:17 +01:00
Régis Hanol
515b616d30
ooops. forgot the args :fired:
2014-11-25 18:45:45 +01:00
Régis Hanol
05727e89e0
Merge pull request #3003 from techAPJ/patch-2
...
upload bulk invite csv file to /public/uploads/csv
2014-11-25 18:10:09 +01:00
Arpit Jalan
c5229a0268
upload bulk invite csv file to /public/uploads/csv
2014-11-25 22:25:09 +05:30
Régis Hanol
0588292dcf
Merge pull request #2999 from riking/fix_top_referrers_topic_count
...
FIX: Topic referrals by user were wrong
2014-11-25 17:46:44 +01:00
Régis Hanol
e23a25994d
FEATURE: clean up unmatched email/ip entries after a year
2014-11-25 17:12:49 +01:00
riking
728e8a262c
FIX: Admin panel referral stats not counting topics correctly
...
Due to what seems to be a bug in ActiveRecord, the distinct: true option
is not recognized on counts with string column names. This commit fixes
that by moving the DISTINCT into the count string.
For robustness, the integration spec for IncomingLinksReport was
rewritten to be an actual integration spec, running the actual interface
on actual fake data.
2014-11-24 12:16:52 -08:00
Jason W. May
adb570fe53
use limit & offset for pagination of group members
2014-11-24 12:12:48 -08:00
Robin Ward
d3510bff04
Merge pull request #3001 from techAPJ/patch-1
...
FEATURE: add topic status namespace in RSS feed
2014-11-24 14:45:59 -05:00
Arpit Jalan
55e2126b1e
FEATURE: add topic status namespace in RSS feed
2014-11-25 00:52:26 +05:30
Régis Hanol
7b0ae702e7
FEATURE: log a new staff action when rolling up banned IP addresses
2014-11-24 19:48:54 +01:00
Régis Hanol
2c38f969cc
UX: add confirm dialog when rolling up IP ban entries
2014-11-24 19:38:47 +01:00
Régis Hanol
d3d517108d
FIX: display total number of other accounts with the same IP address in the IP lookup dialog
2014-11-24 19:34:04 +01:00
Régis Hanol
7b1c001932
FIX: limit other accounts deletion to 50 accounts otherwise it'll feel too slow
2014-11-24 18:05:40 +01:00
Régis Hanol
7f9747f55c
moar camelCase
2014-11-24 18:04:34 +01:00
Robin Ward
17b6d3a2fe
FIX: Mailing list mode was not checking for user deleted posts
2014-11-24 11:43:40 -05:00
Régis Hanol
1023191315
FEATURE: roll up function for 123.456.789.* ranges
2014-11-24 17:25:48 +01:00
Robin Ward
a91d5fc726
Merge pull request #2981 from karreiro/share_bug
...
FIX: Sharing link stood visible after using browser’s back button
2014-11-24 10:29:46 -05:00
Régis Hanol
7611eb4e78
UX: bold all the entries in the screened IP list that are more than a single IP
2014-11-24 11:26:29 +01:00
Régis Hanol
23a97bffbe
FIX: make IP lookup available to moderators
2014-11-24 11:08:13 +01:00
Sam
0111cb4cc2
FEATURE: serialize the fact we are https in about
2014-11-24 17:54:17 +11:00
Sam
1c498eb491
FEATURE: API endpoint for inviting an admin
2014-11-24 15:42:56 +11:00
Sam
c139498235
Merge pull request #2997 from awesomerobot/master
...
fixing the reply-to tab z-index bug
2014-11-24 13:03:12 +11:00
Kris Aubuchon
16cdfcffb5
fixing the reply-to tab z-index bug
2014-11-23 20:51:14 -05:00
Sam
9e1e3df6c9
FEATURE: Localize SSO error messages
2014-11-24 12:16:23 +11:00
Sam
490cd6f539
Merge pull request #2989 from jmay/group-admin-incremental
...
API addition: HTTP PATCH support for /groups/xxx: incremental membership changes
2014-11-24 11:50:51 +11:00
Sam
7e3df4287f
Add more logging for blank posts to detect culprit
2014-11-24 10:34:29 +11:00
Sam
d3b24b625b
Add more SSO logging for failure conditions
2014-11-24 10:02:22 +11:00
Robin Ward
953ac7de8f
Merge pull request #2993 from techAPJ/patch-4
...
Return a promise instead of triggering bootbox in model
2014-11-21 15:20:50 -05:00
Arpit Jalan
7455e81b31
sort screened IPs by match_count
2014-11-22 01:41:59 +05:30
Arpit Jalan
428b71687f
return a promise instead of triggering bootbox in model
2014-11-22 01:16:10 +05:30
Jeff Atwood
304b96aa81
UX: suppress long cat names in cat drop down too
2014-11-21 11:40:15 -08:00
Robin Ward
727e87b78f
Merge pull request #2992 from techAPJ/patch-4
...
FEATURE: export screened IPs list in a CSV file
2014-11-21 14:35:36 -05:00
Arpit Jalan
515882d224
FEATURE: export screened IPs list in a CSV file
2014-11-22 00:59:48 +05:30
Jeff Atwood
4e01046862
UX: suppress long cat names in topic lists
2014-11-21 11:13:38 -08:00
Jason W. May
6f8119ebb8
Merge branch 'master' into group-admin-incremental
2014-11-21 10:04:05 -08:00
Jason W. May
98404d19c5
check that `changes` param is present
2014-11-21 10:03:29 -08:00
Régis Hanol
0398ab7514
FIX: when adding an IP to the spammer list, check the broader ban list
...
first
FEATURE: allow admins to search users using IP ranges
2014-11-21 18:16:06 +01:00
Sam
d53b4ab5bc
Merge pull request #2979 from techAPJ/patch-1
...
FEATURE: log out user everywhere and refresh/redirect
2014-11-21 16:59:44 +11:00
Sam
df99591f10
FEATURE: hide bookmarks but always show if post is bookmarked
2014-11-21 11:53:06 +11:00
Sam
034967328c
FIX: sso with avatar override may fail on first account creation
2014-11-21 11:36:14 +11:00
Sam
508efe3029
FIX: PM title not editable
2014-11-21 11:08:20 +11:00
Régis Hanol
0cbfb43adb
UX: use warning (nuke?) icon instead of trash icon
2014-11-21 00:32:06 +01:00
Régis Hanol
acb8030d12
add confirm dialog when deleting other accounts with same IP address
2014-11-21 00:31:22 +01:00
Sam
4a7e0416d1
FIX: expire stylesheet cache on save
2014-11-21 08:32:32 +11:00
Jeff Atwood
97a44b4c43
post-date can be same size as other post info
2014-11-20 12:23:21 -08:00
Robin Ward
dd1ebb535b
FIX: Could not download exported data on some sites
2014-11-20 14:02:10 -05:00
Régis Hanol
b8d806ee07
FEATURE: delete all accounts from this IP in the IP lookup modal
2014-11-20 19:59:20 +01:00
Jason W. May
50de22801f
API addition: HTTP PATCH support for /groups/xxx: incremental membership changes
2014-11-20 09:29:56 -08:00
Sam
73041c0e14
uniqueness constraint is not correct scoping on hidden is not fully correct
...
simpler just to handle it in the DB
2014-11-20 16:48:45 +11:00
Jeff Atwood
57ef9bb21b
fix pop up composer tips display for mobile
2014-11-19 21:46:18 -08:00
Sam
e1be1e5fd9
FIX: don't crash from observer if user record is bad
2014-11-20 16:08:06 +11:00
Sam
6b10c4dc54
add support for hidden api keys, used in hosting scenarios
2014-11-20 15:38:20 +11:00
Sam
6bed4e1bf0
add allowed_ips to api_keys
...
update annotations
2014-11-20 14:53:15 +11:00
Régis Hanol
98e8523eec
UX: improve ip-lookup modal
...
- replace close button with cross
- use table instead of ul/li
- use trust level number instead of full name
- sort users by descending trust level
- add post count
2014-11-19 21:38:53 +01:00
Régis Hanol
0947191060
UX: improved our footer handling
...
- new "show-footer" mixins
- converted most of the routes to ES6
- FIX: handling of "indexStream" in user pages
There will now be a footer on all the following pages
- /exception
- /about
- /latest
- /new
- /unread
- /starred
- /top
- /categories
- /c/:category
- /c/:category/l/latest
- /c/:category/l/new
- /c/:category/l/unread
- /c/:category/l/top
- /t/:topic/:id
- /groups/:name/members
- /user/activity
- /user/activity/topics
- /user/activity/posts
- /user/activity/replies
- /user/activity/likes-given
- /user/activity/likes-received
- /user/activity/bookmarks
- /user/activity/starred
- /user/badges
- /user/notifications
- /user/flagged-posts
- /user/deleted-posts
- /user/private-messages
- /user/private-messages/mine
- /user/private-messages/unread
- /user/invited
- /user/:username/preferences
- /faq (static pages)
- /badges
- /badges/:id/:badge
2014-11-19 20:37:43 +01:00
Robin Ward
87cd5dbcb7
Merge pull request #2985 from techAPJ/patch-3
...
remove /download from csv file url
2014-11-19 14:10:34 -05:00
Arpit Jalan
aebf36c356
remove /download from csv file url
2014-11-20 00:34:38 +05:30
Robin Ward
bb5be561f3
Merge pull request #2982 from techAPJ/patch-2
...
FEATURE: show exact error for test email
2014-11-19 12:30:32 -05:00
Arpit Jalan
c84b51d4ae
FEATURE: show exact error for test email
2014-11-19 22:58:59 +05:30
Régis Hanol
ada8e6eb23
Merge pull request #2984 from cpradio/pr-tl4-flag-spam-post-hidden
...
FIX: TL4 flag on TL0 post as spam, hides the post
2014-11-19 17:41:02 +01:00
cpradio
626da65339
FIX: TL4 flag on TL0 post as spam, hides the post
2014-11-19 11:26:57 -05:00
Arpit Jalan
eb9eada894
FEATURE: log out user everywhere and refresh/redirect
2014-11-19 12:34:34 +05:30
Guilherme Carreiro
7ad10b5ea6
FIX: Sharing link stood visible after using browser’s back button
2014-11-18 20:32:04 -02:00
Régis Hanol
9c1341b554
FIX: limit the number of group members returned for automatic groups
2014-11-18 12:13:45 +01:00
Régis Hanol
f18d30f1d7
FIX: don't limit the number of group members returned to the front-end (UI needs some work for large groups)
2014-11-18 12:09:37 +01:00
Sam
b4844d4477
FIX: correct old username index
...
(in some cases search was not finding accounts)
2014-11-18 14:32:23 +11:00
Sam
4ff056231d
FIX: expanding replies not working correctly
2014-11-18 11:52:10 +11:00
Jeff Atwood
75b5b27f78
we don't need this /popular redirect any more
2014-11-17 16:40:23 -08:00
Régis Hanol
672cd92638
FIX: damn timezones
2014-11-17 22:53:41 +01:00
Robin Ward
0b0cee4e07
Merge pull request #2969 from cpradio/pr-add-category-to-group-posts
...
FEATURE: Add category to Group Post Listing
2014-11-17 16:02:15 -05:00
cpradio
cca78f1031
Remove n+1 query on Categories
2014-11-17 15:43:22 -05:00
Régis Hanol
15a5d06495
use proper case & remove unused view
2014-11-17 18:17:24 +01:00
Régis Hanol
216a5a87cb
FIX: do not display EPOCH
2014-11-17 16:32:14 +01:00
Régis Hanol
7bb9a839e5
fix the build (again)
2014-11-17 16:06:43 +01:00
Régis Hanol
dd9c475ea0
FIX: changing category within edit grace period as TL3 pops up an error
2014-11-17 15:57:45 +01:00
Régis Hanol
dbb4491bc3
Merge pull request #2973 from lidel/openstreetmap-support
...
UX: whitelist OpenStreetMap iframes
2014-11-17 15:04:58 +01:00
Régis Hanol
fae19aa56c
FEATURE: improve admin IP lookup dialog (add username/trust level/read time/topics entered)
2014-11-17 14:51:28 +01:00
Marcin Rataj
9dccd975d9
UX: whitelist OpenStreetMap iframes
2014-11-17 14:30:25 +01:00
Régis Hanol
7641d88224
FEATURE: new 'maximum new user accounts per registration IP' site setting
2014-11-17 12:04:29 +01:00
Jeff Atwood
78f6cea16c
bump up header icon size a bit
2014-11-17 02:21:30 -08:00
Jeff Atwood
e3ff168e42
specify max-width 100% on digest email logos
2014-11-17 02:10:33 -08:00
Sam
8881e56df5
PERF: don't ever use inject on AR relations
...
inject will deteriorate to a method missing that
invokes arel and a world of uneeded work
2014-11-17 18:03:11 +11:00
Sam
6f7a89dcaa
PERF: use preloader trick to load topic categories
2014-11-17 18:03:11 +11:00
Jeff Atwood
c059352484
Merge pull request #2971 from cpradio/pr-fix-allowed-category-ids-for-group-posts
...
FIX: Change is_staff to is_admin for group posts to match other places
2014-11-16 18:51:31 -08:00
cpradio
bf7be0c130
FIX: Change is_staff to is_admin to match other places where guardian.allowed_category_ids is used
...
https://meta.discourse.org/t/security-permissions-and-messages-displayed-on-group-url/22169/17
2014-11-16 20:31:16 -05:00
cpradio
ce78cb1ee4
FEATURE: Add category to Group Post Listing
2014-11-14 19:30:05 -05:00
cpradio
c2bbbb38f0
FIX: Do not recall prior DRAFT in a given category when using the Create Topic keyboard shortcut
2014-11-14 18:12:42 -05:00
Neil Lalonde
22fa46b1f2
just say Delete
2014-11-14 16:29:53 -05:00
Neil Lalonde
ebcf21585c
FEATURE: add a button for staff to delete a user on their profile page
2014-11-14 15:25:33 -05:00
Robin Ward
ac245ede43
UX: Fixes for group view
2014-11-14 14:28:46 -05:00
Robin Ward
9cd3708b63
Instead of using a "discoveryLoading" action, return `true` so it can
...
bubble up itself.
2014-11-14 13:33:55 -05:00
Robin Ward
1d1978086c
FIX: Improve use of loading spinners on discovery routes
2014-11-14 12:28:20 -05:00
Robin Ward
3829add90b
Merge pull request #2963 from cpradio/pr-pin-unpin-topic-kb-shortcut
...
FEATURE: Added Pin/Unpin Keyboard Shortcut
2014-11-14 11:14:35 -05:00
Robin Ward
cb25d0c0fb
Tweak HTML to include active class on the `li` on the site settings
...
route
2014-11-14 11:10:55 -05:00
Neil Lalonde
c74225b5a6
Merge pull request #2964 from lirent/master
...
New "sq" language files for Discourse
2014-11-14 11:07:24 -05:00
Jeff Atwood
e9ec3738d8
tone down css chevron a bit
2014-11-14 01:19:30 -08:00
Jeff Atwood
1d59a0f815
incorrect position: relative
2014-11-14 00:46:04 -08:00
Jeff Atwood
ed5896c511
missed a closing buffer.push tag
2014-11-14 00:26:23 -08:00
Jeff Atwood
fdacb67c71
use CSS chevron instead of fa-chevron-right
2014-11-14 00:10:46 -08:00
Jeff Atwood
529a0cdcf2
more de-chevroning of user page
2014-11-13 23:45:08 -08:00
Jeff Atwood
6a40501cb3
correct user page action button alignment on mobile
2014-11-13 23:41:17 -08:00
Jeff Atwood
313c41aadb
lighten user page stream dates
2014-11-13 23:35:44 -08:00
Jeff Atwood
10b6741a15
de-chevron the side nav a bit
2014-11-13 23:28:17 -08:00
Sam
c7bc692f40
PERF: stop querying banner topic on every page hit
2014-11-14 15:39:17 +11:00
Robin Ward
a710ff08ad
Missing Loading Route
2014-11-13 17:35:46 -05:00
Régis Hanol
bf666f8553
FEATURE: allow animated thumbnails
2014-11-13 23:30:34 +01:00
Jeff Atwood
64140c5fe0
digest email style tweak
2014-11-13 13:44:53 -08:00
Robin Ward
9520cc0613
FIX: Inconsistent loading of user profiel page (expanded/unexpanded top
...
area)
2014-11-13 16:30:58 -05:00
Robin Ward
0d12ed2231
UX: More spinner upgrades
2014-11-13 15:40:28 -05:00
Robin Ward
074fa81182
UX: Proper loading spinner on create account
2014-11-13 13:50:19 -05:00
Robin Ward
61109a43d2
UX: Use new spinner when logging in
2014-11-13 13:43:54 -05:00
Robin Ward
7b50244e98
UX: Use new loading spinner when uploading an image
2014-11-13 12:55:47 -05:00
Jeff Atwood
1629b47bde
correct blank profile image alignment
2014-11-13 02:11:30 -08:00
Régis Hanol
4f84a3620e
Merge pull request #2962 from techAPJ/patch-1
...
FEATURE: add custom user fields in user csv export
2014-11-13 11:11:02 +01:00
Jeff Atwood
85e9aaa4fa
fix width of users column in topic lists
2014-11-13 01:02:37 -08:00
Arpit Jalan
fadddccf8a
FEATURE: add custom user fields in user csv export
2014-11-13 13:28:45 +05:30
Jeff Atwood
52e27a9870
improve flag count display on user page
2014-11-12 23:41:26 -08:00
Jeff Atwood
e78149a97e
bg transparency for user profiles
2014-11-12 23:33:45 -08:00
Sam
4fc3834dd6
FEATURE: allow inline disposition on uploads
...
when linking an upload allow ?inline=1 to display upload inline
2014-11-13 08:50:55 +11:00
Lirent
d07c6c8cbb
erb file for sq lang
2014-11-12 22:08:09 +01:00
Robin Ward
03bc91f204
Unify `loading-spinner` helper, add conditional support via component
2014-11-12 15:11:20 -05:00
Jeff Atwood
e1dda2337b
remove quarternary color from dialog header CSS
2014-11-12 12:10:42 -08:00
Robin Ward
02abcd03fb
UX: Position loading spinner properly on user pages
2014-11-12 13:57:59 -05:00
Robin Ward
fb241a4351
UX: Use loading spinner on notifications
2014-11-12 13:37:51 -05:00
Robin Ward
e26e5312d7
FIX: Couldn't click on avatar on private message list
2014-11-12 11:53:07 -05:00
Régis Hanol
a8a0be0b34
FIX: change the unlisted/invisible topic state only when unhiding the first post
2014-11-12 16:34:30 +01:00
cpradio
a4aeaeae30
Fixed typo
2014-11-12 09:41:53 -05:00
cpradio
61cc8ead44
FEATURE: Added Pin/Unpin Keyboard Shortcut
2014-11-12 09:36:24 -05:00
Régis Hanol
a036ac7bdc
FIX: users can see the raw email source of their own posts
2014-11-12 14:49:42 +01:00
Régis Hanol
fe541891fc
remove unnecessary <footer> tags
2014-11-12 14:35:20 +01:00
Jeff Atwood
c3df1f368f
better CSS for the notify flag msg char count
2014-11-12 01:23:49 -08:00
Jeff Atwood
f83033ad41
add privacy reminder to flag dialog
2014-11-12 00:39:32 -08:00
Jeff Atwood
36d094856c
normalize footer div on all emails
2014-11-11 23:19:15 -08:00
Sam
c98d0a8eb6
Revert "Revert "PERF: use distributed cache for site text and category slugs""
...
This reverts commit 65e7cd1d1d
.
2014-11-12 10:01:41 +11:00
Sam
65e7cd1d1d
Revert "PERF: use distributed cache for site text and category slugs"
...
This reverts commit a97f2eee05
.
2014-11-12 10:01:07 +11:00
Sam
a97f2eee05
PERF: use distributed cache for site text and category slugs
2014-11-12 09:44:44 +11:00
Robin Ward
824c0b0f87
FIX: Remove `grouped-each` helper. GroupedView is deprecated in Ember
...
1.9
2014-11-11 15:58:47 -05:00
Robin Ward
873277ae5f
Add loading route support to admin flags
2014-11-11 15:48:13 -05:00
Robin Ward
dc4da6b013
UX: Don't delay spinner on topic lists or clicking home
2014-11-11 14:58:00 -05:00
Robin Ward
2431ca5e25
Whitelist more loading routes, remove unneeded user loading route.
2014-11-11 14:37:53 -05:00
Robin Ward
4d4734ef2f
Refactored loading routes for users/badges
2014-11-11 14:17:19 -05:00
Robin Ward
af71326a9c
FIX: Missing styling for embedded reply
2014-11-11 11:17:39 -05:00
Régis Hanol
a566657d7a
Merge pull request #2960 from awesomerobot/master
...
simplifying the spinner due to IE/Win Chrome issues
2014-11-11 15:50:41 +01:00
Kris Aubuchon
6ca555eee0
simplifying the spinner due to IE/Win Chrome issues
2014-11-11 09:22:14 -05:00
Régis Hanol
58f46642dd
FIX: don't put the footer insider container in topic page
2014-11-11 12:05:50 +01:00
Régis Hanol
a1f56183ca
FIX: don't put the footer inside a container (allow for full width footers)
2014-11-11 11:37:59 +01:00
Sam
4e85fc9dae
PERF: cache all site_text in memory
2014-11-11 16:28:59 +11:00
Sam
b2af49251d
PERF: remove superflous queries from initial page loads
...
stop doing expensive work to figure out discourse style sheet
2014-11-11 15:32:44 +11:00
Sam
1a775aa784
Merge pull request #2784 from chancancode/upgrade-to-rails-master-4-2
...
[WIP] Upgrade to rails master/4.2
2014-11-11 09:46:02 +11:00
Régis Hanol
988835a9a3
FEATURE: users can see the raw email source of their own posts
2014-11-10 22:00:17 +01:00
Régis Hanol
ec76be964e
UX: better footer handling
2014-11-10 21:51:55 +01:00
Robin Ward
f414020be8
FIX: New topics were not showing in suggested
2014-11-10 15:20:01 -05:00
Robin Ward
a6b1be81b1
Upgrade to Ember 1.7.1 + group patch
2014-11-10 14:49:02 -05:00
Robin Ward
c32df362d4
Add loading template for routes that return promises
2014-11-10 13:07:49 -05:00
Robin Ward
e1d26736b2
FIX: Missing tab delegation
2014-11-10 12:04:16 -05:00
Robin Ward
9f127d8183
UX: Focus on the user card when it's rendered
2014-11-10 11:31:28 -05:00
Robin Ward
bfa5835025
Merge pull request #2957 from techAPJ/patch-1
...
add user title in exported csv
2014-11-10 10:11:24 -05:00
Sam
6a42588007
remove X from search in ie
2014-11-10 21:31:15 +11:00
Sam
d77f218122
Don't try to publish messages on broken posts
2014-11-10 21:24:54 +11:00
Godfrey Chan
5d7aca3cc6
Use *_url instead of *_path to avoid a deprecation warning
2014-11-10 01:05:47 -08:00
Godfrey Chan
7351917ee4
Boolean -> String quoting has changed on Rails master
...
CustomField.create(name: 'zomg', value: true).reload.value # => 't' on Rails 4.1, '1' on 4.2
rails/rails@42be84ba
2014-11-10 01:05:46 -08:00
Jeff Atwood
a90176550c
let's try no table border on email digests
2014-11-10 00:54:59 -08:00
Kris Aubuchon
00bb72f52d
fixing very bizaare Safari 8.0 bug on title input
2014-11-09 19:26:22 -05:00
Arpit Jalan
0ea1ad4785
add user title in exported csv
2014-11-08 20:07:22 +05:30
Robin Ward
0777efe74d
FIX: 1000 was a crazy threshold for showing categories at the bottom of
...
digests
2014-11-07 17:16:52 -05:00
Robin Ward
bfe2021859
UX: In digest email lists of topics, show striped version of category
...
badge
2014-11-07 17:00:09 -05:00
Robin Ward
8199c3b440
Don't add the `g` flag
2014-11-07 12:09:45 -05:00
Robin Ward
0044a99000
Don't raise an error for global regexps; warn the plugin author instead.
2014-11-07 12:04:44 -05:00
Robin Ward
564e7a988c
Merge pull request #2848 from riking/whitelist-api
...
Improve Markdown.whiteListTag, code dialect
2014-11-07 11:33:37 -05:00
Robin Ward
d6ff1630a8
Merge pull request #2898 from kellec/remove_focus_link_href
...
Remove href attribute from tab link to prevent duplicate event on enter.
2014-11-07 11:01:06 -05:00
Robin Ward
6f7cf8599f
Merge pull request #2949 from fantasticfears/master
...
css tweak - expanding some room for zh_CN
2014-11-07 10:55:55 -05:00
riking
d7a4e39e1d
FEATURE: ?include_raw parameter for /t/id/posts.json
...
include_raw is not added for the wordpress view because it uses the
BasicPostSerializer, and is not a one-line change.
This is the only use of the TopicViewPostsSerializer class, and the
previous change covered the only use of the TopicViewSerializer class.
No other locations include the PostStreamSerializerMixin. Therefore,
this feature is most likely complete.
2014-11-07 07:28:07 -08:00
Jeff Atwood
9f6a0cb126
minor style tweaks to file upload modal
2014-11-06 14:17:52 -08:00
Régis Hanol
684eb4045b
Merge pull request #2950 from awesomerobot/master
...
some cleanup for new usercards on dark themes
2014-11-06 18:10:26 +01:00
Kris Aubuchon
5c84c74a69
some cleanup for new usercards on dark themes
2014-11-06 11:33:30 -05:00
Robin Ward
3b699daec3
UX: Fix some weird margins/padding when zoomed in on user profiles
2014-11-06 11:31:06 -05:00
Erick Guan
951b6e6bb8
css tweak - expanding some room for zh_CN
2014-11-06 22:06:21 +08:00
Jeff Atwood
9ae7c3c595
address odd user card issue with buttons
2014-11-06 03:29:24 -08:00
Jeff Atwood
8e38c129c5
minor login copy tweaks
2014-11-06 02:27:27 -08:00
Régis Hanol
bb2d538194
FEATURE: log impersonations
2014-11-06 10:58:47 +01:00
Sam
246f77c98d
tweak positioning when it has no room to right
2014-11-06 16:25:40 +11:00
Sam
e3bfc2e447
correct positioning of user card on sites with custom headers
...
fix regression (can not click on links in card)
2014-11-06 13:00:21 +11:00
Jeff Atwood
30ce67f689
Merge pull request #2947 from awesomerobot/master
...
updated loading spinner
2014-11-05 17:24:07 -08:00
Kris Aubuchon
a0e5605869
updated loading spinner
2014-11-05 20:13:51 -05:00
Sam
9c81f2c6af
remove duplicate code
...
fix issue where clicking on
the same user in 2 locations on the page would not work correctly
centralize logic
2014-11-06 12:13:46 +11:00
Sam
7b484937d0
minor debouncing fixes for user card
2014-11-06 10:30:38 +11:00
Régis Hanol
3d94808c00
UX: add the word it's before standard spam names to form a complete sentence
2014-11-05 22:46:07 +01:00
Régis Hanol
d104b72aee
UX: remove 'ago' from user streams
2014-11-05 21:53:16 +01:00
Robin Ward
b328d47628
FIX: fa- check was incorrect on user card
2014-11-05 15:19:08 -05:00
Robin Ward
a0e92ef57a
FIX: PageTracker was not sending the proper page title through at all
...
times.
2014-11-05 15:15:58 -05:00
Robin Ward
2d9187cd9d
Admin controls to select a date range for reports
2014-11-05 14:46:44 -05:00
Régis Hanol
a5616146eb
FIX: remove meta data from lightbox in both excerpt (html & text)
2014-11-05 20:37:00 +01:00
Robin Ward
e79c1c23d9
Show CSV groups on user profile
2014-11-05 14:05:16 -05:00
Robin Ward
068d22e9b3
Add API support for querying admin reports by date range
2014-11-05 13:11:37 -05:00
Robin Ward
fde5e739c9
Work in progress (up till about?)
2014-11-05 12:39:25 -05:00
Robin Ward
acfd99ebf2
FIX: Use proper HTML for spinner rather than handlebars
2014-11-05 12:04:35 -05:00
Robin Ward
ea0c6df839
FIX: Only look for `fa-` at the beginning of the field. Allows urls with
...
that combination in it. Thanks @riking
2014-11-05 11:52:22 -05:00
Régis Hanol
d22b668393
Merge pull request #2946 from awesomerobot/master
...
trying out a new css-only loading spinner
2014-11-05 17:44:33 +01:00
Kris Aubuchon
59e0c1b9cd
trying out a new css-only loading spinner
2014-11-05 10:08:20 -05:00
Régis Hanol
568033f623
FIX: escape topic status' title
2014-11-05 12:09:22 +01:00
Jeff Atwood
73a1d168e3
remove profile button from user card
2014-11-04 15:04:08 -08:00
Robin Ward
6a424cf469
UX: Make the user card badge image larger. If present, make text have a
...
smaller width to accomodate the larger image.
2014-11-04 16:30:46 -05:00
Robin Ward
a78048f3fb
FIX: Filter user button shouldn't appear on card when there is already a filter
...
active.
2014-11-04 16:12:42 -05:00
Robin Ward
c9eb809dad
FIX: The text to users who signed up when approval was required was
...
misleading.
2014-11-04 15:48:03 -05:00
Sam
cc9b040502
Revert "FEATURE: display github profile links on user card and profile"
...
This reverts commit 95c518329a
.
2014-11-05 07:45:35 +11:00
Robin Ward
e8a750e27a
FIX: Missing dates on user card
2014-11-04 15:22:55 -05:00
Robin Ward
74e2b8f674
FIX: User card @mentions looked pretty bad
2014-11-04 14:25:35 -05:00
Robin Ward
9161b8529f
Broken tests, let's try popping in/out now to see how that works.
2014-11-04 13:46:35 -05:00
Robin Ward
d4d282e919
UX: Let's try a fade in when the user card is shown
2014-11-04 13:26:33 -05:00
Robin Ward
e96630c6f4
FIX: Malformed user card HTML
2014-11-04 13:13:45 -05:00
Robin Ward
ac25a24b40
Missing i18n key
2014-11-04 13:08:32 -05:00
Robin Ward
9196642221
UX: Add title to user card image, shrink to avoid bleeding into text.
2014-11-04 13:01:41 -05:00
Robin Ward
7a8811882e
UX: Remove icons, add black/white colors to attributes in user card
2014-11-04 12:53:02 -05:00
Kris Aubuchon
03c3221ea8
quick fix on collapsed user profile controls
2014-11-04 10:57:30 -05:00
Sam
8432acf0af
Merge pull request #2938 from riking/include_raw
...
Add ?include_raw parameter to topic views
2014-11-04 14:26:35 +11:00
Sam
95c518329a
FEATURE: display github profile links on user card and profile
...
Can be disabled by unchecking "public_github_screen_name"
2014-11-04 13:33:58 +11:00
Sam
e14e2b8158
remove custom groups, they are not needed
2014-11-04 13:33:26 +11:00
Régis Hanol
862c8a19a3
FEATURE: use img's title attribute in overlay information when provided
2014-11-03 22:03:06 +01:00
Régis Hanol
2c7b47fc40
fix the build
2014-11-03 20:42:13 +01:00
Régis Hanol
bdb78ce76a
FEATURE: consider SVG as an image when authorized
2014-11-03 19:54:10 +01:00
Robin Ward
bab4f48eeb
FIX: Trim the profile text in the user card even if it has multiple lines.
2014-11-03 11:59:56 -05:00
Régis Hanol
fd5677808c
SPEC: make sure digest doesn't pick any topics in categories that are muted
2014-11-03 16:57:50 +01:00
Régis Hanol
a7fa1b33e5
Merge pull request #2936 from vairix-dfernandez/master
...
Feature: Extended user stats in user export csv
2014-11-03 16:47:40 +01:00
Kris Aubuchon
6ab7bfee14
fixing ban display on usercard and IE11 issue with user page controls
2014-11-03 10:16:10 -05:00
Daniel Fernández
61ff64d011
Resfactor: improve syntax extended user stats in user export csv
2014-11-03 13:04:51 -02:00
Régis Hanol
b09ad87098
FIX: add 'show emails' button from moderators in user admin section
2014-11-03 12:46:08 +01:00
Sam
4d82a571fb
FIX: restrict the size of small tags (when nested)
2014-11-03 11:23:18 +11:00
Jeff Atwood
4e3a8b87e3
mobile user profile page tweak
2014-11-01 21:44:56 -07:00
Jeff Atwood
6f391052dc
mobile user profile page tweak
2014-11-01 21:30:37 -07:00
Jeff Atwood
a54e33cd6b
FIX: mobile date was pushed offscreen, w/ h-scroll
2014-11-01 21:21:21 -07:00
Kris Aubuchon
1f4e2d0fd6
adding last post/joined to usercard
2014-11-01 23:03:52 -04:00
riking
6a946712b3
Add ?include_raw parameter to topic views
2014-11-01 14:32:18 -07:00
Sam
9d43e0ae0c
FIX: regression, ESC is not captured correctly
2014-11-01 18:31:16 +11:00
Robin Ward
811b8f3281
FIX: On mobile you couldn't click on a post avatar
2014-10-31 17:34:45 -04:00
Jeff Atwood
0408960b74
tweak time field on user page stream
2014-10-31 12:26:46 -07:00
Jeff Atwood
28bd46d816
clean up user page mobile styles
2014-10-31 12:21:55 -07:00
Jeff Atwood
e822108d85
tighten up mobile search spacing
2014-10-31 12:12:25 -07:00