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

2631 Commits

Author SHA1 Message Date
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
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