Commit graph

2432 commits

Author SHA1 Message Date
Neil Lalonde
67b262b93e Merge branch 'master' of github.com:discourse/discourse 2015-01-29 17:39:52 -05:00
Neil Lalonde
644c7a4675 FEATURE: Add an option to show custom user fields on profiles. Default is to not show them. 2015-01-29 17:38:39 -05:00
Jeff Atwood
4a2786dbf2 better copy on enable names setting 2015-01-29 13:42:15 -08:00
Sam
844467015d FEATURE: allow simple selection for category badge styles
clean up category badge styling
2015-01-29 17:49:14 +11:00
Neil Lalonde
c340255732 Merge pull request #3141 from techAPJ/patch-2
Update Translations
2015-01-28 14:16:09 -05:00
Arpit Jalan
c710d105a0 Update Translations 2015-01-29 00:26:53 +05:30
Régis Hanol
cd2c9edb46 FIX: 🐛 upload on IE9 wasn't working :'(
- FIX: make sure we set a default name to a pasted image only on Chrome (the only browser that supports it)
- FIX: use ".json" extension to uploads endpoints since IE9 doesn't pass the correct header
- FIX: pass the CSRF token in a query parameter since IE9 doesn't pass it in the headers
- FIX: display error messages comming from the server when there is one over the default error message
- FIX: HACK around IE9 security issue when clicking a file input via JavaScript (use a label and set `visibility:hidden` on the input)
- FIX: hide the "cancel" upload on IE9 since it's not supported
- FIX: return "text/plain" content-type when uploading a file for IE9 in order to prevent it from displaying the save dialog
- FIX: check the maximum file size on the server 💥
- update jQuery File Upload Plugin to v. 5.42.2
- update JQuery IFram Transport Plugin to v. 1.8.5
- update jQuery UI Widget to v. 1.11.1
2015-01-28 19:43:20 +01:00
Sam
3483c8318f FEATURE: logging out logs you out everywhere
can be disabled by changing the setting "log_out_strict" to false
2015-01-28 12:56:41 +11:00
Jeff Atwood
a82c50d584 copy fixup on badge boolean checks 2015-01-27 13:24:07 -08:00
Jeff Atwood
5078a68b14 improve group email membership copy again 2015-01-27 09:54:51 -08:00
Arpit Jalan
12c82bed59 Disable digest emails site setting 2015-01-27 22:41:36 +05:30
Jeff Atwood
20411649e1 remove needless email test footer 2015-01-26 17:24:43 -08:00
Jeff Atwood
0472012dae copy improvements on auto-email group joining 2015-01-26 14:43:32 -08:00
Jeff Atwood
246c376f48 Merge pull request #3131 from pda/hmac-not-encryption
sso_secret: cryptographically authenticate, not encrypt.
2015-01-26 14:28:55 -08:00
Paul Annesley
bf2bbfb06e sso_secret: cryptographically authenticate, not encrypt.
The sso_secret is an input to HMAC, which is a hash-based message
authentication code, not encryption.
2015-01-26 13:52:02 -08:00
Arpit Jalan
5c2ee8ec2a FEATURE: suppress digest emails for users not seen on the site for more than (n) days. 2015-01-26 22:04:02 +05:30
Jeff Atwood
20a0a2f60b minor copyedit 2015-01-25 01:22:40 -08:00
Sam
ba186b25a7 FEATURE: optional top level bookmarks tab 2015-01-25 15:53:11 +11:00
Régis Hanol
e300945879 FEATURE: split group admin in 2 tabs (custom & automatic)
FIX: clear the user-selector when adding new members
2015-01-21 20:52:48 +01:00
Arpit Jalan
a144e61440 Update Translations 2015-01-21 22:58:30 +05:30
Robin Ward
f3c9310e12 Merge pull request #3117 from techAPJ/patch-1
FEATURE: rate limit invites for non-staff users
2015-01-20 10:45:00 -05:00
Arpit Jalan
5e751ce90a FEATURE: 🎁 rate limit invites for non-staff users 2015-01-20 01:12:24 +05:30
Alex Williams
23fe0cfb4e Fix spelling in contact_email_missing message. 2015-01-19 10:52:02 -05:00
Arpit Jalan
7687c95e7b UX: add file size in CSV export notification 2015-01-19 19:21:53 +05:30
Jeff Atwood
d0a32b28b9 remove max_stars_per_day site setting 2015-01-19 00:07:26 -08:00
Jeff Atwood
8fe2dd9186 copy improvement on invites 2015-01-19 00:03:22 -08:00
Erick Guan
eedb977c58 Fix guidelines_topic anchor point 2015-01-17 21:45:36 +08:00
riking
1ab0d6bd82 FEATURE: Log username changes by staff
Also fix the tests for changing username
2015-01-17 02:26:12 -08:00
Jeff Atwood
91e0c0e034 copyedit on disable emails 2015-01-15 12:17:28 -08:00
Régis Hanol
20d2908c50 FEATURE: add a global notice whenever emails are disabled (disable_emails site setting) 2015-01-15 19:32:19 +01:00
Arpit Jalan
2aff46532c Update Translations 2015-01-14 21:22:13 +05:30
Régis Hanol
6734a51b6a move SiteText.{head,top,bottom} to SiteCustomization 2015-01-14 12:15:53 +01:00
Arpit Jalan
7771d2fb31 remove enable_email_names setting 2015-01-13 13:35:40 +05:30
Jeff Atwood
3cea85e09a correct "is is" copy 2015-01-12 17:30:14 -08:00
Robin Ward
f3b72f5d96 Revert "move SiteText.{head,bottom} to SiteCustomization and remove redundant SiteText.top"
This reverts commit 6ee2849df6.
2015-01-12 20:21:22 -05:00
Jeff Atwood
962eb78104 change from "Avatar" to "Profile Picture" 2015-01-12 17:13:18 -08:00
Jeff Atwood
c6db713707 better "just for you" copy on pin/unpin 2015-01-12 16:57:41 -08:00
Régis Hanol
6ee2849df6 move SiteText.{head,bottom} to SiteCustomization and remove redundant SiteText.top 2015-01-12 19:59:43 +01:00
Régis Hanol
52c4968bf2 Merge pull request #3091 from techAPJ/update-translations
Update Translations
2015-01-12 16:13:02 +01:00
Régis Hanol
f0f1afff03 FIX: forgot i18n associated with bookmark button (:fired:) 2015-01-12 16:05:17 +01:00
Arpit Jalan
8f06e8f708 Update Translations 2015-01-12 19:53:52 +05:30
Régis Hanol
c681b353f2 FEATURE: bookmark topic button 2015-01-12 12:10:15 +01:00
Jeff Atwood
dc0ecc8f2c add better enable_sso description 2015-01-12 00:54:24 -08:00
Jeff Atwood
c2e716cd88 use active tense on email settings 2015-01-23 16:29:15 -08:00
Régis Hanol
256519dddf FEATURE: automatic group membership based on email address 2015-01-23 18:25:43 +01:00
Erick Guan
22d580fe76 allow to translate image's exceprt 2015-01-23 17:58:14 +08:00
Jeff Atwood
e948dc88d1 Merge pull request #3120 from techAPJ/patch-3
FIX: months were not getting translated
2015-01-22 04:22:33 -08:00
Arpit Jalan
91d36b2532 FIX: months were not getting translated 2015-01-22 15:46:52 +05:30
Jeff Atwood
356ad4459b add unhandled flags to the contact email help 2015-01-22 00:30:30 -08:00
Jeff Atwood
af2dde9996 clarify that image logos not *required* 2015-01-09 14:25:00 -08:00