github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 04:04:21 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11,169 Commits 190 Branches 500 Tags 938 MiB
ebf46450bc
Commit Graph

2778 Commits

Author SHA1 Message Date
Régis Hanol
00bd665c96 FEATURE: add count of previous flags on the post 2014-09-08 17:53:29 +02:00
Robin Ward
334e21a03a Revert "Revert "FEATURE: Can create warnings for users via PM"" 
This reverts commit 1c7559380c.
 2014-09-08 11:11:56 -04:00
Robin Ward
1c7559380c Revert "FEATURE: Can create warnings for users via PM" 
This reverts commit b0bfc1f93f.
 2014-09-08 10:38:59 -04:00
Robin Ward
b0bfc1f93f FEATURE: Can create warnings for users via PM 2014-09-08 10:27:06 -04:00
Arpit Jalan
379b46e4cb Correct starred education copy, unclosed ul tag 2014-09-08 13:41:57 +05:30
Jeff Atwood
c372eed999 minor copy tweaks 2014-09-07 23:43:32 -07:00
Sam
563a313179 Merge pull request #2767 from gschlager/i18n_fix04 
FIX: Some default group names could not be translated
 2014-09-08 13:06:29 +10:00
Jeff Atwood
f87aae489c minor copy tweaks 2014-09-07 16:53:16 -07:00
Jeff Atwood
5c009d9e99 slight update to topnav education panels 2014-09-07 16:29:44 -07:00
Jeff Atwood
233d8832ff improve education panels on new, unread, starred 2014-09-07 14:49:53 -07:00
Gerhard Schlager
d79a4812f6 UX: Filter for "Reply key" was not translatable in Transifex 
Empty strings are not translatable in Transifex.
 2014-09-07 16:10:39 +02:00
Gerhard Schlager
970aafecb4 FIX: Some default group names could not be translated 2014-09-07 14:48:03 +02:00
Jeff Atwood
a2b9251b22 change revision markup view to say "raw" 2014-09-06 01:31:46 -07:00
Jeff Atwood
cf0167186f improve starred topics education copy 2014-09-06 00:46:49 -07:00
Neil Lalonde
ca5f361d0a FEATURE: restrict admin access based on IP address 2014-09-05 12:06:01 -04:00
Jeff Atwood
8b634b5f0f Merge pull request #2759 from techAPJ/patch-2 
Add education panel for starred tab
 2014-09-04 23:47:44 -07:00
Sam
96ac2f63cd Rename trust level badges 2014-09-05 16:38:29 +10:00
Arpit Jalan
0db66d3a18 Add education panel for starred tab 2014-09-05 11:15:10 +05:30
cpradio
2ef499d021 UX: Add g, t keyboard shortcut to modal window for go to top 
https://meta.discourse.org/t/add-shortcut-g-t-to-go-to-top-page/19586
 2014-09-04 18:28:03 -04:00
Jeff Atwood
53af2abb20 copyedit on full name help 2014-09-04 13:39:54 -07:00
Jeff Atwood
7466af9786 more renaming of trust level settings 2014-09-04 13:22:17 -07:00
Jeff Atwood
fcca64c0cf rename site settings for trust levels as numbers 2014-09-04 13:16:51 -07:00
Robin Ward
1c5e8efa68 FEATURE: Show an email icon beside posts that arrived via email 2014-09-04 13:04:41 -04:00
Arpit Jalan
93d9fe0497 Update Translations 2014-09-04 21:48:58 +05:30
Neil Lalonde
ff136ddeea FEATURE: accounts that have not been activated are grey in admin user lists 2014-09-03 10:09:30 -04:00
Sam
9c16dee843 Merge pull request #2742 from riking/patch-1 
UX: Change Impersonate to btn-danger
 2014-09-03 22:18:19 +10:00
Sam
d4f08f442c FIX: correct template for search in post (regression) 2014-09-03 17:09:01 +10:00
riking
8979020b9d Clean up unused translations 2014-09-02 15:40:23 -07:00
Robin Ward
2b0e11dad8 Merge pull request #2711 from hydrarulz/localize_romanian 
Add translation for Romanian.
 2014-09-02 10:48:38 -04:00
Jeff Atwood
cfb92b6e5b UX: clarify notify user flag option is just a PM 2014-09-02 03:37:21 -07:00
Jeff Atwood
3ebc67244a copyedits on Welcome to Lounge 2014-09-02 02:31:24 -07:00
Sam
e0c8abc911 Merge pull request #2717 from riking/badge-solid 
Admin badge interface improvements
 2014-09-02 08:21:06 +10:00
Sam
202656a679 Merge pull request #2725 from cpradio/german-keyboard-support 
FIX: Support J/K bindings on German Keyboards
 2014-09-02 08:02:10 +10:00
Sam
69e418facf FEATURE: wider search with more context 2014-09-01 17:04:57 +10:00
Jeff Atwood
7ef056810c minor copy update 2014-08-31 23:32:41 -07:00
cpradio
6234284243 FIX: Remove the old keyboard bindings for next/prev section, update client.en.yml to reflect the new bindings 2014-08-31 21:42:03 -04:00
riking
1833b43ae2 FEATURE: Badge query validation, preview results, and EXPLAIN 
Upon saving a badge or requesting a badge result preview,
BadgeGranter.contract_checks! will examine the provided badge SQL for
some contractual obligations - namely, the returned columns and use of
trigger parameters.

Saving the badge is wrapped in a transaction to make this easier, by
raising ActiveRecord::Rollback on a detected violation.

On the client, a modal view is added for the badge query sample run
results, named admin-badge-preview.
The preview action is moved up to the route.
The save action, on failure, triggers a 'saveError' action (also in the
route).

The preview action gains a new parameter, 'explain', which will give the
output of an EXPLAIN query for the badge sql, which can be used by forum
admins to estimate the cost of their badge queries.
The preview link is replaced by two links, one which omits (false) and
includes (true) the EXPLAIN query.

The Badge.save() method is amended to propogate errors.

Badge::Trigger gets some utility methods for use in the
BadgeGranter.contract_checks! method.

Additionally, extra checks outside of BadgeGranter.contract_checks! are
added in the preview() method, to cover cases of null granted_at
columns.

An uninitialized variable path is removed in the backfill() method.

TODO - it would be nice to be able to get the actual names of all
columns the provided query returns, so we could give more errors
 2014-08-31 11:25:44 -07:00
Jeff Atwood
9aac004c0a minor copy update, Omit Needless Words 2014-08-31 04:47:27 -07:00
Jeff Atwood
6221a84ce8 minor copy updates 2014-08-31 04:46:20 -07:00
Arpit Jalan
82d4c29c88 TRIVIAL: add line break before time for post navigator 2014-08-30 16:14:00 +05:30
Arpit Jalan
289d9e4fe1 FIX: use short date format for topic summary 2014-08-30 12:07:43 +05:30
Jeff Atwood
7a50ba600a Merge pull request #2726 from techAPJ/patch-4 
FIX: use short date format for post navigator
 2014-08-29 23:11:31 -07:00
Arpit Jalan
3c005557e6 FIX: use short date format for post navigator 2014-08-30 11:34:33 +05:30
Jeff Atwood
70dbad16dc UX: simplify copy for summarize topic mode 2014-08-29 22:59:39 -07:00
Jeff Atwood
d7e4a19f3a Merge pull request #2723 from cpradio/keyboard-binding-incoming-updated-topics 
UX: Keyboard binding incoming/updated topics
 2014-08-29 19:33:40 -07:00
Jeff Atwood
111b35f613 UX: rename "Leader" to "Veteran" (more) 2014-08-29 17:09:54 -07:00
cpradio
2e200ffbf0 Merge remote-tracking branch 'origin/master' into keyboard-binding-incoming-updated-topics 
Conflicts:
	config/locales/client.en.yml
 2014-08-29 20:05:59 -04:00
cpradio
875b39fb5f Merge remote-tracking branch 'origin/master' into keyboard-binding-incoming-updated-topics 2014-08-29 19:56:39 -04:00
Jeff Atwood
cb45d5fa25 Merge pull request #2724 from cpradio/key-binding-reply-new-topic 
UX: Add keyboard binding for reply as new topic
 2014-08-29 16:46:34 -07:00
Jeff Atwood
d74f94afa1 Merge pull request #2722 from cpradio/dismiss-keyboard-bindings 
UX: Add key-bindings for Dismiss New, Dismiss Posts, and Dismiss Topics
 2014-08-29 16:28:25 -07:00
cpradio
68e807f791 UX: Add keyboard binding for reply as new topic 2014-08-29 19:14:42 -04:00
Sam
68a3fd5ef0 FIX: developer emails not working on ruby 2.0 2014-08-30 09:07:30 +10:00
Jeff Atwood
0eb367f9c3 UX: rename "Leader" to "Veteran" (first steps) 2014-08-29 15:57:13 -07:00
Jeff Atwood
324c0eb7e4 UX: improve default new user guidance 2014-08-29 15:47:53 -07:00
Jeff Atwood
586ce668f8 FEATURE: prevent 0 length setting in message len 2014-08-29 13:20:23 -07:00
Jeff Atwood
72293073f6 UX: better copy on mailing_list_mode pref 2014-08-29 13:07:36 -07:00
Neil Lalonde
6b41c6b335 add permalinks route constraint 2014-08-29 11:28:16 -04:00
cpradio
5ca96e741d UX: Add keyboard bidning for incoming/updated topics 2014-08-29 09:44:26 -04:00
cpradio
096bc0c0ae Merge branch 'keyboard-binding-new-topics-banner' into dismiss-keyboard-bindings 
Conflicts:
	app/assets/javascripts/discourse/lib/keyboard_shortcuts.js
 2014-08-29 09:36:34 -04:00
cpradio
3f085c3fd3 Change the Dismiss keybindings to use 'x' instead of 'd' 2014-08-29 09:22:47 -04:00
cpradio
ede9d1e057 Change the Dismiss keybindings to use 'x' instead of 'd' 2014-08-29 08:46:35 -04:00
cpradio
e4ce995369 FIX: Changed Dismiss New and Dismiss Posts to use d + r because p is reserved for the profile menu and n is reserved for the notifications menu 2014-08-29 08:11:23 -04:00
cpradio
ed8d828ff1 FIX: Added keyboard bindings for dismiss buttons 2014-08-29 08:04:57 -04:00
Sam
911b8647cf FIX: Revert permalink support until implemented correctly 2014-08-29 17:06:14 +10:00
Jeff Atwood
2c7d694c34 UX: extremely confusing copy on setting 2014-08-28 23:09:37 -07:00
Sam
b7e8bcda07 FIX: strip leading/trailing spaces from developer emails 2014-08-29 12:21:33 +10:00
Sam
c07d76677d Merge pull request #2701 from riking/email-pr-ssl 
Rename POP3 settings, fix multisite SSL state leak
 2014-08-29 10:02:05 +10:00
Jeff Atwood
bfb9fc4e99 FEATURE: reduce user edit window from 1y to 6m 2014-08-28 15:47:38 -07:00
Robin Ward
9e2c72e277 Allow restoring from backups in development mode even if the setting is 
off.
 2014-08-28 17:02:48 -04:00
Neil Lalonde
14890a6002 FEATURE: add a way to map arbitrary urls to a topic, post, or category. Useful for sites that have migrated to Discourse and want to redirect from their old site to Discourse with 301 redirects. 2014-08-28 15:58:24 -04:00
riking
9090df63ba Fix pop3 settings in locale file 2014-08-28 10:45:40 -07:00
Luca Daniel
2cf92dbe7b Add translation for Romanian. 2014-08-28 14:01:14 +03:00
Arpit Jalan
be8249f113 Update Translations 2014-08-28 08:52:11 +05:30
Robin Ward
0ae3c327de Add a message to the staff logs indicating why a user was purged 2014-08-27 16:05:07 -04:00
Arpit Jalan
3a76f9e79f FIX: allow localization in timestamp 2014-08-27 20:57:06 +05:30
Jeff Atwood
fa10aa4945 COPY: add quotes around badge for clarity 2014-08-26 23:54:13 -07:00
Jeff Atwood
d50b34b825 "earned" vs "you were granted" 2014-08-26 23:46:48 -07:00
Sam
16c34c206d FEATURE: verbose localization option 2014-08-27 14:12:11 +10:00
cpradio
1678a91a60 Add shortcuts for Profile Menu and Hamburger Menu 
Added shortcuts of p and = for the profile and hamburger menu
https://meta.discourse.org/t/keyboard-shortcuts-wish-list/15952
 2014-08-26 20:30:20 -04:00
riking
e28ef099a4 Fix pop3 SSL state leaking over multisite 2014-08-26 17:03:58 -07:00
riking
6d357c9c23 Rename pop3s settings to pop3, remove 'insecure' 2014-08-26 17:03:58 -07:00
Arpit Jalan
02d05ca2ab Update Translations 2014-08-26 23:07:10 +05:30
Robin Ward
ec0480233c Merge pull request #2685 from riking/lazyyt-fix 
Add dash and plus signs to Twitter key allowed chars
 2014-08-26 11:15:29 -04:00
Robin Ward
105959c402 Merge pull request #2696 from riking/errors 
Fix "Server Error: [missing {{code}} value]" page
 2014-08-26 11:14:57 -04:00
Jeff Atwood
d63c6292b3 change "Visit Profile" to just "Profile" 2014-08-26 00:37:10 -07:00
Sam
3ea76815e4 Merge pull request #2686 from meglio/ru-plurals 
Update RU pluralization to use 3 keys: one, few, other (as by Transifex)
 2014-08-26 12:42:59 +10:00
riking
5261f2e751 Fix "Server Error: [missing {{code}} value]" page 
The translation was expecting a non-existent parameter.
 2014-08-25 17:20:48 -07: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
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
Sam
de7888cd97 reopen logs on usr1 2014-08-25 10:49:13 +10:00
riking
2e62cb7825 Add dash and plus signs to Twitter key allowed chars 2014-08-24 17:05:30 -07:00
Sam
56a0a40175 Merge pull request #2677 from keskuskentta/fi_locale 
Add Finnish
 2014-08-25 08:44:00 +10:00
Jeff Atwood
146eec53c0 move email_domains_white/blacklist to login cat 2014-08-24 02:06:51 -07:00
Jeff Atwood
db0b6703a3 better copy on S3 upload settings 2014-08-23 17:01:05 -07: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
Régis Hanol
77ba2015eb FEATURE: new disable_emails site setting 2014-08-23 11:07:37 +02: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
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
Jeff Atwood
f171af5fe5 minor copyedit 2014-08-22 12:49:02 -07: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
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
Sam
492aca05c2 FIX: authorized callback deprecated 2014-08-22 11:05:20 +10:00
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
31cc6ea633 Merge pull request #2633 from zohararad/master 
Add RTL support to Discourse CSS Theme
 2014-08-22 10:23:21 +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
Arpit Jalan
2e89ee953e Update Translations 2014-08-21 23:44:58 +05:30
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
21b18b1253 remove the "view all {number}.." from mobile cat 2014-08-20 13:51:10 -07:00
Régis Hanol
8a20d05ba5 FEATURE: backup without uploads 2014-08-20 18:53:58 +02: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
86fcc72546 minor top copy tweak 2014-08-20 01:09:32 -07:00
Jeff Atwood
f8ae2f5378 update new user tips for less columns , emoji 2014-08-19 14:28:34 -07:00
Jeff Atwood
9c7bc57121 clarify on flag reply "more" indicator 2014-08-19 12:40:39 -07:00
Robin Ward
96afbd6656 TRIVIAL: Don't show 06 Aug, show 6 Aug 2014-08-19 14:46:35 -04: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
Jeff Atwood
107ac88f15 add back in "by default" on new/latest edu 2014-08-18 15:01:09 -07:00
Robin Ward
14c765ef11 UX: Tweak logic for showing times in topic entrance popup 2014-08-18 17:14:50 -04:00
Neil Lalonde
13891292d3 FIX: a missing quote in server.en.yml 2014-08-18 17:10:04 -04:00
Jeff Atwood
57becf156b improvement to site_settings help text 2014-08-18 14:03:40 -07:00
Jeff Atwood
004749871f copyedit for new/latest "teaching" empty pages 2014-08-18 13:50:09 -07: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
db4abe76db CLEANUP: Remove dead resetRead code path 2014-08-18 14:35:33 -04:00
Jeff Atwood
b3d99a638c fix inverted post-to-like copy 2014-08-18 11:25:56 -07: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
Arpit Jalan
8c2476100b Update Translations 2014-08-18 20:47:59 +05:30
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
b4e38e5646 updated checks of environment with Rails.env by Rails.env methods 2014-08-18 15:36:47 +05:30
Jeff Atwood
d09b30775c better copy on a few default topics 2014-08-18 01:51:44 -07:00
Jeff Atwood
d73a961b3a correct wiki help text 2014-08-18 00:28:39 -07:00
Jeff Atwood
e2aa3e9616 better description of hidden flagged content 2014-08-17 23:27:05 -07:00
Jeff Atwood
ad17a315ec clarify flag-to-hide second round requires staff 2014-08-17 23:02:15 -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
e291138cf1 Unknown format is not interesting 2014-08-18 13:10:22 +10:00
Sam
e0a82d3088 FIX: rate limit password reset email 2014-08-18 10:55:30 +10: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
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
dbf1a8b766 clarify on /top behavior 2014-08-16 12:57:23 -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
Jeff Atwood
7e5678abd5 /admin/docker --> /admin/upgrade 2014-08-15 12:31:43 -07:00
Arpit Jalan
8d7f4c1944 FEATURE: add additional fields in user list export 2014-08-16 00:39:28 +05:30
Arpit Jalan
e98a6cf993 Update Translation 2014-08-15 23:32:14 +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