codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-24 16:18:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
12361 commits 7 branches 179 tags 87 MiB
Commit graph

7172 commits

Author SHA1 Message Date
Sam
4f4c49f702 Merge pull request #3031 from oblakeerickson/activate_return_json 
Have activate user return json
 2014-12-09 10:12:42 +11:00
Robin Ward
4de412365e The {{i18n}} helper should use quotes when looking up keys, always. 2014-12-08 16:36:18 -05:00
Régis Hanol
63d4932549 Merge pull request #3032 from awesomerobot/master 
adding max-height for embedded video
 2014-12-08 21:48:19 +01:00
Kris Aubuchon
448acc627b adding max-height for embedded video 2014-12-08 15:39:36 -05:00
Robin Ward
5fd3f2547c FIX: Fix rerendering issues on some components. 2014-12-08 14:47:49 -05:00
Blake Erickson
1d0eccf710 Have activate user return json 
- Change activate user from admin controller to return json
- Test that it returns json
- Remove unnessary test from log_out spec

This commit was created so that when you activate a user through the api
it returns a json response.
 2014-12-08 11:16:57 -07:00
Robin Ward
7069ee16e2 FIX: Javascript error when uploading backup 2014-12-08 12:38:36 -05:00
Sam
3547c20aa7 add toolbar to pick emoji family, bump up number to 60 2014-12-08 16:45:24 +11:00
Sam
23163422e6 correct positioning when emoji is added 2014-12-08 14:22:54 +11:00
Sam
555b783864 Add shortcuts support for emoji toolbar 
(CTRL E to open, ESC to close)
 2014-12-08 13:32:26 +11:00
Sam
fdecd69228 Merge pull request #3026 from oblakeerickson/legacy_avatar 
Remove legacy avatar code
 2014-12-08 11:03:55 +11:00
Sam
a7659490c6 Merge pull request #3028 from tytkal/arabic_support 
Arabic support
 2014-12-08 11:03:12 +11:00
Sam
4082076e0d Merge pull request #3029 from bear-metal/master 
Introduce support for being able to dump Rails heap after script/bench.rb runs
 2014-12-08 11:01:08 +11:00
Régis Hanol
fe007d08b3 FIX: remove links and html 'hellips' from topic/post summaries 2014-12-08 00:23:53 +01:00
Lourens Naudé
fb60daa867 Introduce support for dumping Rails process heap at the end of a benchmark run 2014-12-07 22:55:37 +00:00
khalid al-hussayen
9fc0a3f6f9 add arabic local files 2014-12-07 23:05:24 +03:00
Blake Erickson
e9e88c9b82 Remove legacy avatar code 
- Remove method that was only left around because the
  [api](https://github.com/discourse/discourse_api/pull/53) called it
- Modify test to use new route instead of legacy route

https://meta.discourse.org/t/legacy-route-for-avatars/22838/2
 2014-12-07 06:13:14 -07:00
Sam
c05203d449 typo 2014-12-07 16:43:26 +11:00
Sam
16c2562e57 Add more logging aroung blank posts 2014-12-07 16:39:30 +11:00
Régis Hanol
929ff00741 FIX: use excerpt instead of the summary 2014-12-06 18:48:39 +01:00
Régis Hanol
dec881ac9d Merge pull request #3024 from oblakeerickson/avatar_return_json 
Have pick_avatar return json.
 2014-12-06 18:20:42 +01:00
Blake Erickson
a61519eebf Have pick_avatar return json. 
I'm working on writing a test in the discourse_api gem for uploading
avatars and the pick method needs to return a json response.

I also added a test to make sure json is returned.
 2014-12-06 09:26:32 -07:00
Régis Hanol
86c4c947a3 FIX: drastically simplify auto-close topic logic 
Get rid of this nonsensical maximum-flow algorithm :fired:
 2014-12-06 16:29:54 +01:00
Robin Ward
da4e19af5b Deprecations for future ember, {{outlet}} names need strings 2014-12-05 17:06:20 -05:00
Robin Ward
72749a24e1 FIX: Broken HTML (thanks HTMLbars) 2014-12-05 17:03:08 -05:00
Neil Lalonde
0f37ce1083 FIX: share popup on mobile layout went outside of viewport, and z-index was behind user avatars. Use a real link on touch devices instead of a text input. 2014-12-05 16:21:07 -05:00
Régis Hanol
cd170ca548 FEATURE: auto-close topics based on community flags 2014-12-05 19:37:43 +01:00
Sam
357a12f78e FEATURE: work-in-progress emoji selector toolbar item 2014-12-05 17:19:17 +11:00
Sam
bc772233a7 ramp it down to 1 second, already handled on server so it will hold you back 2014-12-05 09:58:50 +11:00
Sam
3faa220dbc ramp down "Forgot password" disable down to 5 seconds. 2014-12-05 09:56:46 +11:00
Robin Ward
50b75084bd Merge pull request #3025 from awesomerobot/master 
fixing loading spinner alignment and striping
 2014-12-04 17:13:22 -05:00
Robin Ward
5f6f85b182 FIX: Disable loading below HTML, we have our own spinner for that and it 
broke scrolling on some custom CSS.
 2014-12-04 17:12:47 -05:00
Kris Aubuchon
d8c8264b4e fixing loading spinner alignment and striping 2014-12-04 17:05:47 -05:00
Neil Lalonde
917a91eb40 FIX: permalink redirect support for url's with extensions in them, like .html and .php 2014-12-04 16:39:10 -05:00
Robin Ward
dd7b3d313e FIX: Selecting default option without changing HTML markup. 
I also filed a bug on Ember.js with details on the error.
 2014-12-04 15:21:47 -05:00
Robin Ward
5ec77d4be4 FIX: If a category can't be found, don't include it in the list 2014-12-04 13:04:58 -05:00
Robin Ward
5492bbe11c FIX: Couldn't click delete topic button due to missing action 2014-12-04 11:49:53 -05:00
Robin Ward
e035b07e92 Put Ember 1.8.1 + fixes back. 2014-12-04 08:51:35 -05:00
Sam
8f4e8fe8f2 FIX: only show "new pm" in pm tab when looking at your own profile 2014-12-04 13:50:36 +11:00
Sam
4aa0d88c6c FEATURE: search private messages option 2014-12-04 13:50:36 +11:00
Kris Aubuchon
96ae3eccb3 making some adjustments to how posts are laid out so they don't break at small widths 2014-12-03 20:20:19 -05:00
Régis Hanol
b4363de280 FIX: reload current page when deleting a user 2014-12-03 16:03:42 +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
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
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
ea269ccfb2 rename purge_inactive to purge_unactivated 2014-12-02 21:36:25 -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
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
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
b547be44b2 Better error message output 2014-12-01 14:53:37 -05: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
Jeff Atwood
003d32babe decrease size of cat color stripe in digests a bit 2014-11-29 03:58:44 -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
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
5b90ceb71d FEATURE: rolls up 1.2.*.* IP ranges when number of entries > 10 2014-11-27 19:29:30 +01:00
Jeff Atwood
31b769d4fa remove unneeded mobile footer left margin 2014-11-27 03:35:05 -08:00
Jeff Atwood
4589f28676 remove unwanted global text input font sizing 2014-11-27 02:13:15 -08:00
Jeff Atwood
c3a47aee70 use shorter Export button copy 2014-11-26 23:57:18 -08:00
Sam
013f1a6dd0 FEATURE: allow creating admin and moderator accounts via SSO 2014-11-27 12:39:00 +11:00
Sam
800ae5265f Add admin and moderator state to sso provider 2014-11-27 12:24:37 +11:00
Régis Hanol
4e735e8aab FIX: roll up staff action wasn't working 2014-11-27 01:12:56 +01:00
Sam
3fd4fc679e a few missing spots 2014-11-27 11:02:54 +11:00
Sam
5c965dcb0b FEATURE: show card when clicking on avatar in admin user list 2014-11-27 10:46:32 +11:00
Robin Ward
8366fcd78f FIX: Don't lose focus on site settings text field (was changing routes 
during filtering)
 2014-11-26 18:01:45 -05:00
Robin Ward
257bde8e2b FEATURE: "Suspect" users list in admin. 2014-11-26 13:58:16 -05:00
Régis Hanol
10b5032188 FIX: auto-closing attribution when a TL4 user auto-closes a topic 2014-11-26 19:51:07 +01:00
Régis Hanol
27d78332c4 FEATURE: restrict some user fields for TL0 users when viewed by anonymous users 2014-11-26 19:20:03 +01:00
Robin Ward
cb124d5836 UX: Consolidate "Admins" and "Moderators" into "Staff" on admin users 
list
 2014-11-26 13:10:12 -05:00
Robin Ward
a3e53e0d28 Use far fewer admin user list routes, instead pass the query as a 
parameter.
 2014-11-26 13:05:49 -05:00
Régis Hanol
41deea6892 Merge pull request #3006 from awesomerobot/master 
fixing reply-tab bug and user profile background adjustment
 2014-11-26 16:53:57 +01:00
Kris Aubuchon
1524612719 fixing reply-tab bug and user profile background adjustment 2014-11-26 10:49:50 -05:00
Régis Hanol
d7ef4f1edd remove useless 'puts' 2014-11-26 16:40:03 +01:00
Régis Hanol
37a9164fa0 FIX: click counter for attachments 2014-11-26 13:05:43 +01:00
Sam
c10e3df012 FEATURE: implement SSO provider on Discourse so Auth can be farmed to it 
FEATURE: pass return_sso_url to SSO endpoints, for easier return
 2014-11-26 17:26:27 +11:00
Robin Ward
81eedf3a12 No need to call it Discourse.TopicRoute -- that is done automatically 
by the compatibility layer. cc @ZogStrIP
 2014-11-25 18:21:21 -05:00
Robin Ward
220f2424b5 FIX: Load order issue / header category badge when not surpressed 2014-11-25 18:13:38 -05:00
Sam
d171d6db19 FEATURE: export sso data if sso is enabled 2014-11-26 09:43:28 +11:00
Robin Ward
4c9f55d1e1 FIX: Suspended users should have links stripped from their profiles. 2014-11-25 16:14:39 -05:00
Régis Hanol
183c93904d FIX: don't show the banner topic on error page 2014-11-25 19:09:17 +01:00
Régis Hanol
515b616d30 ooops. forgot the args :fired: 2014-11-25 18:45:45 +01:00
Régis Hanol
05727e89e0 Merge pull request #3003 from techAPJ/patch-2 
upload bulk invite csv file to /public/uploads/csv
 2014-11-25 18:10:09 +01:00
Arpit Jalan
c5229a0268 upload bulk invite csv file to /public/uploads/csv 2014-11-25 22:25:09 +05:30
Régis Hanol
0588292dcf Merge pull request #2999 from riking/fix_top_referrers_topic_count 
FIX: Topic referrals by user were wrong
 2014-11-25 17:46:44 +01:00
Régis Hanol
e23a25994d FEATURE: clean up unmatched email/ip entries after a year 2014-11-25 17:12:49 +01:00
riking
728e8a262c FIX: Admin panel referral stats not counting topics correctly 
Due to what seems to be a bug in ActiveRecord, the distinct: true option
is not recognized on counts with string column names. This commit fixes
that by moving the DISTINCT into the count string.

For robustness, the integration spec for IncomingLinksReport was
rewritten to be an actual integration spec, running the actual interface
on actual fake data.
 2014-11-24 12:16:52 -08:00
Jason W. May
adb570fe53 use limit & offset for pagination of group members 2014-11-24 12:12:48 -08:00
Robin Ward
d3510bff04 Merge pull request #3001 from techAPJ/patch-1 
FEATURE: add topic status namespace in RSS feed
 2014-11-24 14:45:59 -05:00
Arpit Jalan
55e2126b1e FEATURE: add topic status namespace in RSS feed 2014-11-25 00:52:26 +05:30
Régis Hanol
7b0ae702e7 FEATURE: log a new staff action when rolling up banned IP addresses 2014-11-24 19:48:54 +01:00
Régis Hanol
2c38f969cc UX: add confirm dialog when rolling up IP ban entries 2014-11-24 19:38:47 +01:00
Régis Hanol
d3d517108d FIX: display total number of other accounts with the same IP address in the IP lookup dialog 2014-11-24 19:34:04 +01:00
Régis Hanol
7b1c001932 FIX: limit other accounts deletion to 50 accounts otherwise it'll feel too slow 2014-11-24 18:05:40 +01:00
Régis Hanol
7f9747f55c moar camelCase 2014-11-24 18:04:34 +01:00
Robin Ward
17b6d3a2fe FIX: Mailing list mode was not checking for user deleted posts 2014-11-24 11:43:40 -05:00
Régis Hanol
1023191315 FEATURE: roll up function for 123.456.789.* ranges 2014-11-24 17:25:48 +01:00
Robin Ward
a91d5fc726 Merge pull request #2981 from karreiro/share_bug 
FIX: Sharing link stood visible after using browser’s back button
 2014-11-24 10:29:46 -05:00
Régis Hanol
7611eb4e78 UX: bold all the entries in the screened IP list that are more than a single IP 2014-11-24 11:26:29 +01:00
Régis Hanol
23a97bffbe FIX: make IP lookup available to moderators 2014-11-24 11:08:13 +01:00
Sam
0111cb4cc2 FEATURE: serialize the fact we are https in about 2014-11-24 17:54:17 +11:00
Sam
1c498eb491 FEATURE: API endpoint for inviting an admin 2014-11-24 15:42:56 +11:00
Sam
c139498235 Merge pull request #2997 from awesomerobot/master 
fixing the reply-to tab z-index bug
 2014-11-24 13:03:12 +11:00
Kris Aubuchon
16cdfcffb5 fixing the reply-to tab z-index bug 2014-11-23 20:51:14 -05:00
Sam
9e1e3df6c9 FEATURE: Localize SSO error messages 2014-11-24 12:16:23 +11:00
Sam
490cd6f539 Merge pull request #2989 from jmay/group-admin-incremental 
API addition: HTTP PATCH support for /groups/xxx: incremental membership changes
 2014-11-24 11:50:51 +11:00
Sam
7e3df4287f Add more logging for blank posts to detect culprit 2014-11-24 10:34:29 +11:00
Sam
d3b24b625b Add more SSO logging for failure conditions 2014-11-24 10:02:22 +11:00
Robin Ward
953ac7de8f Merge pull request #2993 from techAPJ/patch-4 
Return a promise instead of triggering bootbox in model
 2014-11-21 15:20:50 -05:00
Arpit Jalan
7455e81b31 sort screened IPs by match_count 2014-11-22 01:41:59 +05:30
Arpit Jalan
428b71687f return a promise instead of triggering bootbox in model 2014-11-22 01:16:10 +05:30
Jeff Atwood
304b96aa81 UX: suppress long cat names in cat drop down too 2014-11-21 11:40:15 -08:00
Robin Ward
727e87b78f Merge pull request #2992 from techAPJ/patch-4 
FEATURE: export screened IPs list in a CSV file
 2014-11-21 14:35:36 -05:00
Arpit Jalan
515882d224 FEATURE: export screened IPs list in a CSV file 2014-11-22 00:59:48 +05:30
Jeff Atwood
4e01046862 UX: suppress long cat names in topic lists 2014-11-21 11:13:38 -08:00
Jason W. May
6f8119ebb8 Merge branch 'master' into group-admin-incremental 2014-11-21 10:04:05 -08:00
Jason W. May
98404d19c5 check that changes param is present 2014-11-21 10:03:29 -08:00
Régis Hanol
0398ab7514 FIX: when adding an IP to the spammer list, check the broader ban list 
first

FEATURE: allow admins to search users using IP ranges
 2014-11-21 18:16:06 +01:00
Sam
d53b4ab5bc Merge pull request #2979 from techAPJ/patch-1 
FEATURE: log out user everywhere and refresh/redirect
 2014-11-21 16:59:44 +11:00
Sam
df99591f10 FEATURE: hide bookmarks but always show if post is bookmarked 2014-11-21 11:53:06 +11:00
Sam
034967328c FIX: sso with avatar override may fail on first account creation 2014-11-21 11:36:14 +11:00
Sam
508efe3029 FIX: PM title not editable 2014-11-21 11:08:20 +11:00
Régis Hanol
0cbfb43adb UX: use warning (nuke?) icon instead of trash icon 2014-11-21 00:32:06 +01:00
Régis Hanol
acb8030d12 add confirm dialog when deleting other accounts with same IP address 2014-11-21 00:31:22 +01:00
Sam
4a7e0416d1 FIX: expire stylesheet cache on save 2014-11-21 08:32:32 +11:00
Jeff Atwood
97a44b4c43 post-date can be same size as other post info 2014-11-20 12:23:21 -08:00
Robin Ward
dd1ebb535b FIX: Could not download exported data on some sites 2014-11-20 14:02:10 -05:00
Régis Hanol
b8d806ee07 FEATURE: delete all accounts from this IP in the IP lookup modal 2014-11-20 19:59:20 +01:00
Jason W. May
50de22801f API addition: HTTP PATCH support for /groups/xxx: incremental membership changes 2014-11-20 09:29:56 -08:00
Sam
73041c0e14 uniqueness constraint is not correct scoping on hidden is not fully correct 
simpler just to handle it in the DB
 2014-11-20 16:48:45 +11:00
Jeff Atwood
57ef9bb21b fix pop up composer tips display for mobile 2014-11-19 21:46:18 -08:00
Sam
e1be1e5fd9 FIX: don't crash from observer if user record is bad 2014-11-20 16:08:06 +11:00
Sam
6b10c4dc54 add support for hidden api keys, used in hosting scenarios 2014-11-20 15:38:20 +11:00
Sam
6bed4e1bf0 add allowed_ips to api_keys 
update annotations
 2014-11-20 14:53:15 +11:00