github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 22:26:26 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
12,122 Commits 190 Branches 500 Tags 938 MiB
77a775ecd2
Commit Graph

12122 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Régis Hanol
77a775ecd2 Merge pull request #3012 from techAPJ/patch-2 
Add test for email with inline reply
 2014-12-03 15:45:04 +01:00
Régis Hanol
0f0a329e7c FIX: private message button wasn't adding the recipient (cc @gdpelican) 2014-12-03 14:55:43 +01:00
Régis Hanol
f9f54e2626 refactor fix in 67c4c90159 2014-12-03 13:00:02 +01:00
Régis Hanol
acc62f2ec2 SECURITY: prevent direct download of backups 2014-12-03 12:47:28 +01:00
Régis Hanol
8ab32396a7 Merge pull request #3009 from gdpelican/feature/new-private-message 
New Private Message button for user topics
 2014-12-03 12:17:45 +01:00
Régis Hanol
7edb88a5a8 FIX: change top score formula 
Adds more weight to `likes` (it's now the same weight as `post_count`)
 2014-12-03 11:51:49 +01:00
Régis Hanol
feb0a42d87 Merge pull request #3016 from techAPJ/patch-4 
FIX: if full user name is not provided, username should be present in em...
 2014-12-03 10:09:05 +01:00
Arpit Jalan
f84bdfdde3 FIX: if full user name is not provided, username should be present in email From header 2014-12-03 13:12:05 +05:30
Jeff Atwood
a05408ac9d minor copyedit 2014-12-02 21:39:54 -08:00
Jeff Atwood
ea269ccfb2 rename purge_inactive to purge_unactivated 2014-12-02 21:36:25 -08:00
Jeff Atwood
44c1a895b5 move two user related "other" settings to "user" 2014-12-02 21:25:48 -08:00
Sam
a8ff5fe97c Merge pull request #3002 from jmay/group-membership-api 
use limit & offset for pagination of group members
 2014-12-03 11:11:10 +11:00
Jeff Atwood
2ad0aeea2f Merge pull request #3015 from awesomerobot/master 
a few very minor visual tweaks
 2014-12-02 15:16:14 -08:00
Kris Aubuchon
ea37946d00 a few very minor visual tweaks 2014-12-02 17:10:14 -05:00
Robin Ward
c90668ae53 FIX: Better protection for invites scrolling 2014-12-02 17:03:12 -05:00
Robin Ward
008337b018 FIX: Selecting one user in admin would select them all 2014-12-02 15:30:57 -05:00
Robin Ward
67c4c90159 FIX: Clicking avatars broke for non-admins 2014-12-02 15:24:05 -05:00
Régis Hanol
461196f089 FEATURE: 'delete user' button in the user card in the admin section 2014-12-02 18:52:56 +01:00
Régis Hanol
99928cac26 FEATURE: use actual time in preference > email notifications' instruction 2014-12-02 18:15:32 +01:00
Robin Ward
87667cfe17 FIX: Editing a category definition topic was clearing its permissions 2014-12-02 11:46:21 -05:00
Régis Hanol
1210486623 FIX: editing the 1st post of a private message wasn't working 2014-12-02 16:04:45 +01:00
Régis Hanol
45820e9c4c Merge pull request #3014 from techAPJ/patch-3 
FIX: exportUsers action was deleted, so user export was failing
 2014-12-02 11:39:51 +01:00
Arpit Jalan
2ead3fca69 FIX: exportUsers action was deleted, so user export was failing 2014-12-02 16:05:43 +05:30
Jeff Atwood
3fcde72656 bit shorter max width on mobile categories 2014-12-02 00:41:51 -08:00
Jeff Atwood
0503599de7 suppress long category names on mobile 2014-12-02 00:19:42 -08:00
Jeff Atwood
e3bcd848b3 minor copyedit 2014-12-01 17:24:51 -08:00
Régis Hanol
f226e4efc0 FIX: don't error out when updating a topic with no changes 2014-12-02 02:16:30 +01:00
Robin Ward
9bdac79ba6 Make suspect report use <= 1 instead of = 0 2014-12-01 17:15:07 -05:00
Robin Ward
b547be44b2 Better error message output 2014-12-01 14:53:37 -05:00
Arpit Jalan
15c105eba5 Add test for email with inline reply 2014-12-01 23:51:14 +05:30
Régis Hanol
6d0b6b0642 Merge pull request #2974 from longhotsummer/patch-1 
Traverse symlinks to plugins in dev mode when compiling stylesheets
 2014-12-01 15:13:22 +01:00
Greg Kempe
e2fb5310d8 Traverse symlinks to plugins in dev mode when compiling stylesheets 
When developing plugins it's useful to symlink the to the plugin directory from the discourse directory, since that means the two are separate git repos.

However, Dir.glob doesn't by default traverse symlinks. This change means that the SASS compilation caching detects when any of a plugin's files have changed.
 2014-12-01 15:59:21 +02:00
Régis Hanol
64b06b360a Merge pull request #3008 from oblakeerickson/log_out_return_success 
Have log_out method return json
 2014-12-01 14:26:06 +01:00
Blake Erickson
bdc92eec70 Have log_out method return json. 
This commit helps improve the discourse_api experience so that we can
check the json response if it was a success or not. This commit also
checks that a 404 is sent instead of a 500 if a bad user_id is passed
in.
 2014-12-01 06:03:25 -07:00
James Kiesel
cc76087f59 Add new private message button on topics list 
That'll teach me to wildly refactor things.
 2014-12-02 00:53:49 +13:00
Jeff Atwood
c00c5e1024 our previous mobile avatar tap fix was incorrect 2014-12-01 03:36:25 -08:00
Régis Hanol
a3a04e06b6 fix images in readme 2014-12-01 11:38:33 +01:00
Régis Hanol
a6074af711 Merge pull request #3010 from techAPJ/patch-1 
FEATURE: switch to GitHub email_reply_parser library and parse plain tex...
 2014-12-01 11:18:24 +01:00
Régis Hanol
5f445826c5 Merge pull request #3011 from chancancode/dont_use_route 
Don't `use_route`
 2014-12-01 11:16:01 +01:00
Godfrey Chan
5352a7f53c Don't use_route 
See https://github.com/rails/rails/pull/17453 and https://github.com/rails/rails/pull/17725
 2014-11-30 21:25:54 -08:00
Sam
9defb6879b upgrade to rails master 2014-12-01 15:34:50 +11:00
Arpit Jalan
529014d56e FEATURE: switch to GitHub email_reply_parser library and parse plain text email content 2014-12-01 09:00:35 +05:30
Jeff Atwood
003d32babe decrease size of cat color stripe in digests a bit 2014-11-29 03:58:44 -08:00
Jeff Atwood
cb9507d292 tighten up title line height in digest email 2014-11-28 11:45:03 -08:00
Robin Ward
cb0e7a5724 For performance reasons, use delete_all when removing a user's email logs 2014-11-28 14:20:43 -05:00
Robin Ward
37a3e956b6 UX: Link categories in digest emails 2014-11-28 13:44:40 -05:00
Jeff Atwood
a85a3da167 move digest email featured post category underneath 2014-11-28 00:38:08 -08:00
Neil Lalonde
781807191e Version bump to v1.2.0.beta3 2014-11-27 16:48:08 -05:00
Régis Hanol
07211489f0 FIX: hide restricted profile info from TL0 users to anonymous in 'JS-off' page 2014-11-27 19:51:13 +01:00
Régis Hanol
65c106325c remove old & useless import script 2014-11-27 19:30:19 +01:00