github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-28 02:43:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
22,248 Commits 214 Branches 500 Tags 960 MiB
e600dca268
Commit Graph

22248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Régis Hanol
e600dca268 Merge pull request #4763 from vvanpo/fork-master 
JSON API parsing error on CSRF exception: single quotes in ['BAD CSRF'] is invalid JSON
 2017-03-17 09:19:10 +01:00
Guo Xiang Tan
b49bf889f6 SECURITY: Disallow symlinks when restoring uploads. 2017-03-17 14:27:01 +08:00
Guo Xiang Tan
566f367fc3 FIX: Don't migrate custom emojis that are no longer valid. 
* Warn about failed migration in logs.
 2017-03-17 08:28:24 +08:00
Victor van Poppelen
9e60f9f093 JSON API parsing error on CSRF exception: single quotes in ['BAD CSRF'] is invalid JSON: 
https://meta.discourse.org/t/json-api-parsing-error-single-quotes-used-for-errors-like-bad-csrf/58869
 2017-03-16 16:47:18 -07:00
Neil Lalonde
ad8a579c79 UX: banner enabled/disabled posts should be small posts, not full-size posts 2017-03-16 17:31:37 -04:00
Jeff Atwood
63c8b23690 minor copyedits in guidelines 2017-03-16 13:36:27 -07:00
Robin Ward
1957d12670 SECURITY: Don't use backticks for exporting your archive 2017-03-16 16:24:59 -04:00
Neil Lalonde
36ae27fa43 Merge pull request #4724 from mcwumbly/socialcast-import-tags-categories 
FEATURE: Socialcast Importer: Set category and tags based on group
 2017-03-16 12:39:31 -04:00
Neil Lalonde
fb96cf3aae Merge pull request #4761 from joebuhlig/fix-tl3-requirements-route 
FIX: Add route for user TL3 requirements page
 2017-03-16 12:13:08 -04:00
Neil Lalonde
22f197c153 FEATURE: subcategory list style: boxes with featured topics 2017-03-16 11:54:45 -04:00
Sam
2c952e1981 Merge pull request #4760 from nbianca/fix_topic_title 
Fixes duplicated title in header after edit
 2017-03-16 11:49:45 -04:00
Bianca Nenciu
f8a31d927f Fixes duplicated topic title in header after edit. 2017-03-16 17:34:39 +02:00
Robin Ward
fd591257a8 Merge pull request #4759 from kennym/support-ports-for-ip-addresses-in-embedding 
FIX: Allow ports for embed host IPs
 2017-03-16 11:23:42 -04:00
Joe Buhlig
8d06833e51 FIX: Add route for user TL3 requirements page 2017-03-16 10:05:28 -05:00
Guo Xiang Tan
9f299b6842 Use after_commit since after_save runs within the transaction as well. 2017-03-16 16:02:34 +08:00
Guo Xiang Tan
299b92b4d7 Fix broken user created event trigger. 2017-03-16 15:36:27 +08:00
Guo Xiang Tan
5169ef8814 Fix broken specs. 2017-03-16 15:05:28 +08:00
Guo Xiang Tan
bf78c228f4 FIX: User created web hook being enqueued before record has been saved. 
* Improve web hook tests as well.
 2017-03-16 14:44:09 +08:00
Guo Xiang Tan
bb85795934 FIX: Leave group membership button not updating. 
https://meta.discourse.org/t/leave-group-button-on-groups-page-doesnt-give-any-feedback/57359/4
 2017-03-16 11:33:55 +08:00
Guo Xiang Tan
65c000ad74 FEATURE: Track views on user profile card as profile views. 2017-03-16 10:59:08 +08:00
Guo Xiang Tan
0a87547cbc Fix broken tests. 2017-03-16 10:22:15 +08:00
Erick Guan
cfbfea0596 FEATURE: Allow easier customization to the web hook event serialization. 2017-03-16 10:09:05 +08:00
Guo Xiang Tan
bbc85e1e29 Merge pull request #4750 from discourse/group_login_registration_flow 
FEATURE: Redirect to groups page and apply group actions upon login/s…
 2017-03-16 09:50:56 +08:00
Guo Xiang Tan
ca965bb455 FEATURE: Redirect to groups page after login/registration flow. 2017-03-16 09:48:51 +08:00
giorgia
576982484d FEATURE: Make admin user list sortable. 
https://meta.discourse.org/t/make-admin-users-list-sortable-suggestion/47649
 2017-03-16 09:24:15 +08:00
Vinoth Kannan
d3f07122c4 UX: 'Join Group' button position moved to group header 2017-03-16 08:40:27 +08:00
Kenny Meyer
ae957bca25 Allow ports for embed host IPs 2017-03-15 18:16:34 -03:00
Sam
61a7162c01 Merge pull request #4747 from gsambrotta/show-disable-delete-btn-cat 
Show disable delete btn cat
 2017-03-15 15:45:05 -04:00
Neil Lalonde
5c4f37a24e cdn-img will render nothing if src is null 2017-03-15 13:30:29 -04:00
Anaketa
d7dedc4649 add show/hide to tooltip 2017-03-15 17:23:52 +01:00
Anaketa
63febf391b create btn, tooltip and style it 2017-03-15 17:16:21 +01:00
Bianca Nenciu
c423544208 Changed combo-box to number inputs for min, max and step values. 2017-03-15 10:56:11 +08:00
Guo Xiang Tan
911d6abfad Merge pull request #4757 from nbianca/change_timestamp_bug 
Change timestamp only for admin.
 2017-03-15 10:44:19 +08:00
Neil Lalonde
bc31d25132 some cleanup thanks to eviltrout 2017-03-14 17:23:19 -04:00
Neil Lalonde
5c923fef58 FIX: category logo preview in settings shouldn't render it like a background image 2017-03-14 17:12:09 -04:00
Sam
7378077036 Merge pull request #4749 from cpradio/add-subcategory-class-hamburger-menu 
UX: Add subcategory class to hamburger menu items that are subcategories
 2017-03-14 17:08:35 -04:00
Bianca Nenciu
8354768d7c Change timestamp only for admin. 2017-03-14 23:07:36 +02:00
Neil Lalonde
889902256b FIX: encoded characters shown in category boxes 2017-03-14 14:51:11 -04:00
Sam
8ac7e6a605 Merge pull request #4753 from cpradio/plugin-outlet-user-preferences 
DEV: Add plugin-outlet to allow SSO sites to put a message on the User Preferences page
 2017-03-14 10:32:09 -04:00
Guo Xiang Tan
685c26961f Fix randomly failing specs. 2017-03-14 16:28:05 +08:00
Guo Xiang Tan
58de40154d Bump EMOJI_VERSION to clear cache. 2017-03-14 15:31:01 +08:00
Guo Xiang Tan
6312b8b7e4 Fix failing specs. 2017-03-14 14:58:22 +08:00
Guo Xiang Tan
d173473509 Fix randomly failing specs. 2017-03-14 14:43:48 +08:00
Guo Xiang Tan
6a6113fcea Merge pull request #4682 from tgxworld/store_custom_emoji_as_uploads 
FIX: Store custom emojis as uploads.
 2017-03-14 14:14:18 +08:00
Guo Xiang Tan
324b346bb1 FIX: Restore was not redirecting to logs route. 2017-03-14 14:00:18 +08:00
Guo Xiang Tan
1a7e954e09 FIX: Store custom emojis as uploads. 
* Depending on a hardcoded directory was a flawed design
  which made it impossible to debug when custom emojis go
  missing.
 2017-03-14 13:07:18 +08:00
Guo Xiang Tan
99943ec769 Make eslint happy. 2017-03-14 11:52:15 +08:00
Guo Xiang Tan
83d2e63771 Make eslint happy. 2017-03-14 11:47:35 +08:00
Guo Xiang Tan
8e45322b09 FIX: Only group admins can see group edit page. 2017-03-14 11:45:58 +08:00
cpradio
a5af9a834f DEV: Add plugin-outlet to allow SSO sites to put a message on the User Preferences page 2017-03-13 18:26:00 -04:00