github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 20:51:50 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
10,575 Commits 190 Branches 500 Tags 938 MiB
60559b42be
Commit Graph

6036 Commits

Author SHA1 Message Date
riking
4db5c8d617 Add data-auto-route=true to Logster link 2014-08-25 15:59:48 -07:00
Robin Ward
a568696098 FIX: Add the <br/> without removing stuff 2014-08-25 18:56:27 -04:00
Robin Ward
939b7ce7e2 Revert "FIX: Added <br/> for @coding-horror" 
This reverts commit d62218fb5b.
 2014-08-25 18:56:27 -04:00
Sam
64331e2ac1 row style is common, its the way we clear divs 2014-08-26 07:41:29 +10:00
Robin Ward
d62218fb5b FIX: Added <br/> for @coding-horror 2014-08-25 17:21:01 -04:00
Robin Ward
c820c65172 Merge pull request #2692 from riking/sorted_badges 
Sort the badges on the user profile page
 2014-08-25 15:56:27 -04:00
Jeff Atwood
de1e0345df proper fix for top page bottom buttons on mobile 2014-08-25 12:55:45 -07:00
riking
234956234b Fix badge type ordering 2014-08-25 12:48:31 -07:00
Jeff Atwood
a11cc46c73 remove global margin right on mobile btn 2014-08-25 12:47:02 -07:00
riking
99c11e2184 Sort the badges on the user profile page 
Also clean up UserBadgesController so it isn't doing two things in one
method
 2014-08-25 12:40:51 -07:00
Jeff Atwood
024c503870 mobile login tweaks 2014-08-25 12:38:27 -07:00
Robin Ward
ed125975a1 SECURITY: Prefix session key and validate token format. 2014-08-25 15:31:49 -04:00
Jeff Atwood
3a010c34cc smallenate anon drop-down topic counts 2014-08-25 12:14:47 -07:00
Robin Ward
0fba445bc1 FIX: Broken build 2014-08-25 13:35:40 -04:00
Robin Ward
f10f9585ae Better Support for whitelisting caja tags 2014-08-25 13:11:20 -04:00
Régis Hanol
7aaf718cf3 update bbcode dialect and fix vBulletin importer 2014-08-25 10:48:29 +02:00
Jeff Atwood
bd66c67398 whoops, used font awesome 3.2 styles :( 2014-08-24 22:20:59 -07:00
Jeff Atwood
01853fb9d3 replace trophy with shield to indicate admin 2014-08-24 22:05:11 -07:00
Sam
56a0a40175 Merge pull request #2677 from keskuskentta/fi_locale 
Add Finnish
 2014-08-25 08:44:00 +10:00
Sam
643d0dfc13 FIX: use CDN when expanding avatar templates 2014-08-25 08:18:41 +10:00
Anton Andriyevskyy
c42a5551a1 Update RU pluralization to use 3 keys: one, few, other (as by Transifex) 2014-08-23 15:28:14 +03:00
Sam
af71307363 Add 10px margin for buttons in mobile 2014-08-23 10:41:48 +10:00
Sam
e0a74e336a Add SSO diagnostics 2014-08-23 10:34:48 +10:00
Sam
f493eb5d12 FEATURE: allow version emails to be disabled globally 2014-08-23 10:02:32 +10:00
Jeff Atwood
ae9fcf17ef make period chooser (/top h2) unselectable on touch 2014-08-22 17:01:12 -07:00
Robin Ward
db376d16d3 FIX: Topic entrance widget wasn't disappearing 2014-08-22 18:45:48 -04:00
Neil Lalonde
bbb358b356 Add likes given and likes received requirement for being TL3. Configure with site settings leader_requires_likes_given and leader_requires_likes_received. 2014-08-22 17:33:39 -04:00
Neil Lalonde
00c28f2391 Show total likes given. Put likes given/received and flags given/received together. 2014-08-22 15:23:19 -04:00
Jeff Atwood
79f7a922ef add <hr> between sections of digest email 2014-08-22 12:15:02 -07:00
Robin Ward
2ae46b4742 REMOVE: Auto quoting confused more people than it helped. 2014-08-22 14:51:31 -04:00
Neil Lalonde
dafc63e3a0 Show how many likes users received in the last 100 days on their admin profile page 2014-08-22 14:37:07 -04:00
Robin Ward
300dbdc88b FIX: BBCode contents can span multiple lines 2014-08-22 14:32:29 -04:00
Neil Lalonde
5454c1ed24 Updated model anotations 2014-08-22 13:01:44 -04:00
Neil Lalonde
7756b72a59 FIX: after bulk change category, refresh topic list 2014-08-22 13:01:08 -04:00
Robin Ward
104b39540a FIX: BBCode with params couldn't span lines 2014-08-22 12:14:10 -04:00
Kris Aubuchon
a8e6e1e3d5 adding highlight back to topic-list 2014-08-22 10:45:51 -04:00
Arpit Jalan
6a0309365f Suppress share link for anonymous users 2014-08-22 13:53:28 +05:30
Sam
ac4f6d9c97 Merge pull request #2647 from riking/multiple-addresses 
Allow processing of email sent to multiple addresses
 2014-08-22 10:32:42 +10:00
Sam
bcbe36a834 Merge pull request #2675 from amalagaura/patch-1 
Fix min_trust_level for wordpress
 2014-08-22 10:25:39 +10:00
Sam
c865bf0d71 Merge pull request #2670 from Wilhansen/sso_override_avatar 
Implement SSO overriding avatars.
 2014-08-22 10:22:06 +10:00
Sam
136169bc73 Merge pull request #2676 from riking/logster-link 
Add link to Logster in "Logs" tab of admin panel
 2014-08-22 10:21:04 +10:00
Sam
9ecbfad5fa only hijack search on topic page 2014-08-22 08:53:00 +10:00
Robin Ward
c713cc57d0 FIX: Firefox floating CSS, added calendar glyph to pop up 2014-08-21 16:42:50 -04:00
Robin Ward
dd84b9d79f FIX: Don't skip TOS check when using 3rd party auth 2014-08-21 16:23:02 -04:00
Robin Ward
c1aa2458f8 UX: Add drop down for top lists, big refactor of repeated code. 2014-08-21 16:08:47 -04:00
Jeff Atwood
2fed513ea2 remove admin link on user drop down 2014-08-21 11:26:57 -07:00
probus
1a28fcf486 Add Finnish 2014-08-21 13:48:42 +03:00
riking
50d4e283dc Add link to Logster in "Logs" tab of admin panel 2014-08-20 14:40:16 -07:00
Jeff Atwood
7dd6b43e8a missed the posts TH on /categories 2014-08-20 13:54:31 -07:00
Jeff Atwood
21b18b1253 remove the "view all {number}.." from mobile cat 2014-08-20 13:51:10 -07:00
Régis Hanol
b2232b4dcf FIX: banner on small desktop screen 2014-08-20 22:45:57 +02:00
Jeff Atwood
5f0b8e3d93 remove posts column from /categories 2014-08-20 13:43:00 -07:00
Régis Hanol
5b1785157d TRIVIAL: fix deprecations due to momentjs upgrade 2014-08-20 22:22:58 +02:00
Robin Ward
33de48dc0c FIX: Float site settings were marked as overridden, reset didn't work. 2014-08-20 15:24:56 -04:00
Robin Ward
d35633deab FIX: Using a binding in an {{avatar}} was broken 2014-08-20 15:12:18 -04:00
Robin Ward
506dca6d4e FIX: Moving posts was not updating reply_count and 
`reply_to_post_number` so reply linkage was broken.
 2014-08-20 14:15:23 -04:00
Robin Ward
eb02619d1f UX: Move topic entrance widget to posts column 2014-08-20 14:15:23 -04:00
Régis Hanol
dbb4258e86 FIX: user avatar in flags list 2014-08-20 19:21:19 +02:00
Régis Hanol
054ae8bc13 TRIVIAL: do not remove backups in development 2014-08-20 18:58:58 +02:00
Régis Hanol
8a20d05ba5 FEATURE: backup without uploads 2014-08-20 18:53:58 +02:00
Robin Ward
c316894167 TWEAK: Don't include moderators on "About" if they are admins. 2014-08-20 12:43:02 -04:00
Neil Lalonde
96eecf18ef FIX: moving a post to a topic with a deleted post should use correct post_number. Was getting unique index violation on (topic_id, post_number). 2014-08-20 12:28:53 -04:00
Robin Ward
6ef85ea014 UX: Don't highlight the latest poster in the topic list if there is only 
one avatar shown.
 2014-08-20 12:09:39 -04:00
Robin Ward
2b5feda625 FIX: You need to be logged in to edit wiki posts. 2014-08-20 11:04:45 -04:00
Jeff Atwood
4508fbe9e6 remove <hr> between Popular Posts in email digest 2014-08-19 23:23:20 -07:00
Sam
4522451920 Merge pull request #2672 from cpradio/master 
Only show unique badge titles in the Badge Title dropdown
 2014-08-20 11:47:05 +10:00
cpradio
765b099513 Only show unique badge titles in the Badge Title dropdown 
Filter the preference Badge Title to only show unique badge title names.
Updated to use lodash
https://meta.discourse.org/t/set-title-dialog-shows-multiple-instances-of-the-same-badge/19071
 2014-08-19 21:30:36 -04:00
cpradio
04cd3c0551 Only show unique badge titles in the Badge Title dropdown 
Filter the preference Badge Title to only show unique badge title names.
https://meta.discourse.org/t/set-title-dialog-shows-multiple-instances-of-the-same-badge/19071
 2014-08-19 20:59:20 -04:00
Ankur Sethi
43b5292303 Fix min_trust_level for wordpress 
min_trust_level in the wordpress method was being set to 1 always, the order of the ternary operator was reversed.
 2014-08-19 20:15:24 -04:00
Jeff Atwood
4c66362dd1 remove right-arrow on cross-topic oneboxes 2014-08-19 15:19:01 -07:00
Jeff Atwood
c24b326c04 add glyph to move dialog button 2014-08-19 15:01:32 -07:00
Neil Lalonde
4e857bfa12 FIX: add http:// to feed_polling_url if it's missing 2014-08-19 17:57:14 -04:00
Robin Ward
65297533fa FIX: Allow links to name attributes 2014-08-19 16:51:53 -04:00
Robin Ward
5667cfe6cb FIX: Load user-avatar first. 2014-08-19 16:32:35 -04:00
Robin Ward
b46a373ff9 UX: Show User popup when clicking on a user in the topic list. 2014-08-19 16:22:37 -04:00
Robin Ward
3235f2c477 FIX: Don't try and delete inactive admins, rare as they may be. 2014-08-19 13:47:01 -04:00
Neil Lalonde
2672857aee FIX: public_user_custom_fields are returned by UserSerializer 2014-08-19 11:05:44 -04:00
Régis Hanol
f2b0228164 FIX: unhide post when a moderator undos the flag on which s/he took action 2014-08-19 16:14:17 +02:00
Akshay
3fd784b513 removed useless assignments at some places 2014-08-19 18:10:23 +05:30
Sam
7d068c1432 Merge pull request #2669 from akshaymohite/optimization-fixes 
removed useless access modifiers specified in models
 2014-08-19 21:10:40 +10:00
Wilhansen Li
e0f970326f Implement SSO overriding avatars. 
Implemented by having Discourse download the image from the provided URL
and treating it as a custom upload.

Adds two more parameters to the SSO site’s response:

* `avatar_url` specifies the URL of the overriding avatar.
* `avatar_force_update` Discourse does not re-download avatars that
has already been download from the same URL. Setting this to true forces
Discourse to re-download the avatar in `avatar_url`

Note that both parameters are ignored if `sso_overrides_avatar` is set
to false.
 2014-08-19 15:53:34 +08:00
Sam
65826ab3a6 FIX: only update column if we have a user 2014-08-19 17:26:20 +10:00
Sam
8699c929db FIX: report db when we get an exception in multisite 2014-08-19 17:24:00 +10:00
Sam
2d16255185 FIX: make filter bindable 2014-08-19 16:50:30 +10:00
Akshay
9d11ccc42e removed usless access modifiers specified in models 2014-08-19 07:28:21 +05:30
Sam
1a2070b4d9 FIX: exception in an interval 2014-08-19 11:13:19 +10:00
Robin Ward
68fca9398d FIX: Topic entrace considered the same day of a different month as today. 2014-08-18 17:40:50 -04:00
Robin Ward
14c765ef11 UX: Tweak logic for showing times in topic entrance popup 2014-08-18 17:14:50 -04:00
Neil Lalonde
0841cd2ba6 FEATURE: Add education text to new and unread pages when there are no results 2014-08-18 16:17:40 -04:00
Robin Ward
f1486c7728 FIX: Inconsistency between unread counter and unread filter 2014-08-18 16:15:26 -04:00
Robin Ward
c5d6f6a034 UX: Allow users to tab to the activity column 2014-08-18 14:44:31 -04:00
Robin Ward
db4abe76db CLEANUP: Remove dead resetRead code path 2014-08-18 14:35:33 -04:00
Robin Ward
454c634b7e UX: Make posts columns link to the last post in a topic. 2014-08-18 14:17:14 -04:00
Robin Ward
b175abbfb5 FIX: Admin group search was failing 2014-08-18 14:08:21 -04:00
Régis Hanol
9f72971d26 FEATURE: add the pencil glyph when the post was edited after the first flag 2014-08-18 18:56:39 +02:00
Neil Lalonde
d273374f1a FIX: before nuking a user, do a real count of posts instead of relying on user_stat record 2014-08-18 12:07:29 -04:00
Régis Hanol
5b3a758ba9 FIX: redirect old avatars to proper user_avatar route 2014-08-18 17:45:07 +02:00
Robin Ward
05193deb4d Merge pull request #2659 from riking/wrong-progress-pos 
Hopefully fix once and for all the 172/160 problem
 2014-08-18 11:30:09 -04:00
Neil Lalonde
1445ad61da FIX: case-insensitive category lookup when creating topics 2014-08-18 11:07:49 -04:00
Neil Lalonde
6c10cc3788 FIX: top_menu with category links like category/Meta are not case sensitive 2014-08-18 11:07:49 -04:00
Robin Ward
49f0eaea13 Merge pull request #2650 from Elberet/fix-parser 
Fix: block parser uses regexes for stop tags, allows stricter matching
 2014-08-18 11:06:08 -04:00
Régis Hanol
d7b1313d5e FEATURE: acting on a flag should not post an automated status message if you already replied to it 2014-08-18 17:00:14 +02:00
Régis Hanol
0d72b670f8 Merge pull request #2666 from akshaymohite/optimization-fixes 
Fixed ActiveRecord validation for post_id in incoming_link.rb
 2014-08-18 16:14:56 +02:00
Régis Hanol
e1191a5fcf Merge pull request #2511 from windhamg/s3_iam_role 
support for EC2 IAM roles with Amazon S3 file store/backup
 2014-08-18 16:14:14 +02:00
Akshay
fd6683697f Fixed ActiveRecord validation for post_id in incoming_link.rb 2014-08-18 19:11:34 +05:30
Régis Hanol
66aaa9329e FEATURE: vBulletin importer 2014-08-18 13:04:08 +02:00
Akshay
b4e38e5646 updated checks of environment with Rails.env by Rails.env methods 2014-08-18 15:36:47 +05:30
Jeff Atwood
efb8dec951 Reset Read Data not needed here 2014-08-18 02:17:40 -07:00
Jeff Atwood
ff03f98945 remove coldmapping from topic map 2014-08-18 00:24:56 -07:00
Sam
5193c9fd16 FIX: ensure consistency on topic featured users 2014-08-18 17:13:32 +10:00
Sam
f7d4cb6745 FIX: incorrect tooltip, most posts was only sometimes right 2014-08-18 17:13:32 +10:00
Jeff Atwood
e9bfb1c89e make share link input field readonly, with css tweaks 2014-08-17 23:08:53 -07:00
Sam
8737ffb272 Merge pull request #2658 from akshaymohite/optimization-fixes 
Not initializing variable for looping if unused in loop
 2014-08-18 14:42:52 +10:00
Sam
baaa3e0f9f FIX: #2664 it should be validates not validate 
Thanks @chancancode
 2014-08-18 14:40:54 +10:00
Sam
e18b030b8a SECURITY: stop potential symbol leak 2014-08-18 13:00:02 +10:00
Sam
24932009a5 FIX: don't make an ajax request when password or user is blank 2014-08-18 12:50:25 +10:00
Sam
b82726b029 FIX: incorrect redirection code 2014-08-18 12:35:31 +10:00
Sam
9ba8b29e98 FIX: API should return post_action or nil, true is wrong 2014-08-18 12:03:46 +10:00
Sam
e0a82d3088 FIX: rate limit password reset email 2014-08-18 10:55:30 +10:00
Jeff Atwood
582ec5954f fix incorrect translation string 2014-08-16 23:18:13 -07:00
Jeff Atwood
09291fcba0 make entire first/last entry popup unselectable 2014-08-16 23:16:13 -07:00
Jeff Atwood
967120f23e Merge pull request #2663 from gschlager/i18n_fix01 
Add missing translation
 2014-08-16 23:11:58 -07:00
Jeff Atwood
915a9f5230 Merge pull request #2645 from xfix/translate-log-in 
Allow translating "Log In" button in HTML code.
 2014-08-16 23:07:46 -07:00
Jeff Atwood
6795d378b4 remove a few strings on admin in favor of glyphs 2014-08-16 22:53:41 -07:00
Gerhard Schlager
6b286ad4f4 Add missing translation 2014-08-17 00:29:39 +02:00
Jeff Atwood
6d09f53dfc topic jump buttons shouldn't be selectable 2014-08-16 14:20:20 -07:00
Jeff Atwood
80f3cdd9a2 move arrow for topic entry 2014-08-16 13:24:58 -07:00
Robin Ward
aa41548e8e UX: When clicking an activity date, pop up a little menu with options to 
go to beginning or end of the topic.
 2014-08-15 16:39:57 -04:00
Robin Ward
0ce2df36e0 Merge pull request #2662 from techAPJ/patch-3 
FEATURE: add additional fields in user list export
 2014-08-15 16:03:16 -04:00
Arpit Jalan
8d7f4c1944 FEATURE: add additional fields in user list export 2014-08-16 00:39:28 +05:30
Robin Ward
f7b0c31418 Post history heatmap should use site settings for thresholds 2014-08-15 12:22:06 -04:00
Robin Ward
2f4f5d56e1 Use Site Settings for the cold date ranges 2014-08-15 12:09:31 -04:00
Robin Ward
26ca197be9 Adds Site settings to configure post:like ratio thresholds 2014-08-15 12:02:29 -04:00
Robin Ward
eb5a3da10d UX: Include tooltip text when hovering over posts column 2014-08-15 11:49:30 -04:00
Robin Ward
8f51878d73 FIX: Remove seen flag status from viewed topics 2014-08-15 10:46:58 -04:00
Jeff Atwood
c04b7cfe8a only do two levels of coldmapping 2014-08-14 22:27:10 -07:00
Jeff Atwood
f8cb0b6452 we have two sets of heatmap colors, apparently 2014-08-14 21:55:17 -07:00
Jeff Atwood
c32f64fe94 more betterer heat/coldmap color scheme 2014-08-14 21:36:35 -07:00
Sam
465c2a2ba8 FEATURE: logout redirect support 
Allow users to also logout on an external site after logging out locally
 2014-08-15 12:57:29 +10:00
Sam
e16dd96b6d FIX: dispatch correct modal on auto login 2014-08-15 12:13:10 +10:00
Robin Ward
00c791b12e FIX: Issues signing in without local logins 2014-08-14 22:09:12 -04:00
riking
903c760a9b Use progress bar indices in jump control, too 2014-08-14 17:52:21 -07:00
riking
8539c08d35 Fix assignment of post number to progress position 2014-08-14 17:31:34 -07:00
Jeff Atwood
e539e6ff21 try grey instead of blue for coldmap range 2014-08-14 16:42:31 -07:00
Robin Ward
c2c256cdd9 FIX: Bug with cached topics not being marked as read in your topics 
list.
 2014-08-14 18:31:02 -04:00
Akshay
6301a43d57 Not initializing variable for looping if unused in loop 2014-08-15 03:24:55 +05:30
Jeff Atwood
6cc8ec87b5 we don't need this "or" separator on login page 2014-08-14 14:41:45 -07:00
Robin Ward
167f393a03 Merge pull request #2655 from techAPJ/patch-3 
FEATURE: export user list
 2014-08-14 17:19:49 -04:00
Robin Ward
6e67fab9aa Merge pull request #2656 from akshaymohite/optimization-fixes 
Avoid using to_s when performing String Interpolation
 2014-08-14 17:17:57 -04:00
Arpit Jalan
b0f44dcdf3 clean up exports weekly 2014-08-15 02:03:30 +05:30