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

429 commits

Author SHA1 Message Date
Sam
e7e70d14da Merge pull request #2591 from BenLubar/benlubar-edit-history-public 
add profile option for edit history visibility
 2014-07-30 14:09:10 +10:00
Sam
87dd681497 FEATURE: setting suppress reply when quoting 2014-07-30 10:55:49 +10:00
Régis Hanol
bddffa7f9a FEATURE: flag dispositions normalization 
All flags should end up in one of the three dispositions
  - Agree
  - Disagree
  - Defer

In the administration area, the *active* flags section displays 4 buttons
  - Agree (hide post + send PM)
  - Disagree
  - Defer
  - Delete

Clicking "Delete" will open a modal that offer to
  - Delete Post & Defer Flags
  - Delete Post & Agree with Flags
  - Delete Spammer (if available)

When the flag has a list associated, the list will now display 1
response and 1 reply and a "show more..." link if there are more in the
conversation. Replying to the conversation will NOT give a disposition.
Moderators must click the buttons that does that.

If someone clicks one buttons, this will add a default moderator message
from that moderator saying what happened.

The *old* flags section now displays the proper dispositions and is
super duper fast (no more N+9999 queries).

FIX: the old list includes deleted topics
FIX: the lists now properly display the topic states (deleted, closed,
archived, hidden, PM)
FIX: flagging a topic that you've already flagged the first post
 2014-07-28 19:28:07 +02:00
Ben Lubar
ac8c2e1e07 discourse#2591 2014-07-27 12:12:36 -05:00
Ben Lubar
44dc4b4a17 add profile option for edit history, visible only when edit history is disabled globally. 2014-07-26 23:04:46 -05:00
Neil Lalonde
fcaeb885e5 FIX: don't show the option to notify yourself in the flag dialog 2014-07-25 16:37:03 -04:00
Sam
ec03d135fa FEATURE: allow advanced badge options in admin screen 
clean up serializer, allow simplistic preview
 2014-07-24 18:28:23 +10:00
Sam
0f9678fe49 FIX: faster update of all badges 
Introduced badge triggers, introduced concept of badge that happens due to a post but has the post hidden

Delta badge grant happens once a minute, backed by redis
 2014-07-23 11:46:07 +10:00
Sam
b9a7d945c3 Improve badge grouping UI 
Start work on triggers
 2014-07-23 11:43:17 +10:00
Sam
c8284170ad FEATURE: badge grouping UI 
FIX: not loading more badges on badge show page
 2014-07-18 15:46:36 +10:00
riking
19b757b058 FEATURE: Hide deleted posts by default for staff 2014-07-17 10:40:15 -07:00
Robin Ward
f06f8abedd Merge pull request #2537 from ligthyear/group-member-management-on-user 
Improved Group Member Management on User Administration
 2014-07-17 11:00:05 -04:00
Sam
bfb37054e8 Badge Grouping work in progress 2014-07-17 16:11:10 +10:00
Neil Lalonde
5c70d878a7 FEATURE: show a reason why a category can't be deleted 2014-07-16 15:43:51 -04:00
Robin Ward
fb8dda7f42 FIX: We should use category_id instead of category_name to perform 
operations, now that the subcategory names are not unique.
 2014-07-16 15:40:35 -04:00
Régis Hanol
7dcf2a2c4f FEATURE: show the user's flagged/deleted posts 2014-07-16 21:04:55 +02:00
Sam
e347eea629 FEATURE: show user what badges they have 2014-07-16 17:55:08 +10:00
Sam
88469721b9 FEATURE: Allow admins to disable specific badges 2014-07-14 17:40:36 +10:00
Benjamin Kampmann
ac3f1ba3d6 Improved Group Member Management on User Administration 
Allows for a quick and easy group membership management on the
user-administration page. Uses the select2 UI component to
autosuggest other groups, remove existing ones and lock in automatic
groups.
 2014-07-13 20:11:38 +02:00
Sam
2f8d139ec0 BUGFIX: incorrect ordering in category permissions 
FEATURE: UI for categories that we allow badges on
 2014-07-10 12:02:16 +10:00
Sam
8fcc019ff8 FIX: only allow badge title selection if it exists 2014-07-09 15:31:49 +10:00
Sam
6bbb083d47 FEATURE: support "unlisted" badges. 2014-07-03 17:44:36 +10:00
Régis Hanol
9abef57312 BUGFIX: staff counters weren't taking into acount deleted posts/actions 2014-07-02 22:33:18 +02:00
Neil Lalonde
292e9bb611 TL3: Add requirements for min all-time topics viewed, and min all-time posts read 2014-07-01 13:34:57 -04:00
Sam
bc44bfcdf2 Work in progress backfill for like badges 2014-07-01 22:01:15 +10:00
Régis Hanol
15120bb583 FEATURE: add staff counters on user profile 2014-06-30 22:46:47 +02:00
Robin Ward
e22688a204 FEATURE: Can upload images to categories 2014-06-30 14:14:00 -04:00
Sam
777371bf14 Merge pull request #2480 from vikhyat/badge-system 
Add consistency check to revoke invalid badges
 2014-06-30 14:13:12 +10:00
Neil Lalonde
807bfbd9bb FEATURE: Trust level 3 promotion and demotion. Job is disabled for now. 2014-06-27 18:42:03 -04:00
Vikhyat Korrapati
2e52f795ea Backend changes to support improved badge pages. 2014-06-28 01:24:00 +05:30
Neil Lalonde
b69bc5a5f5 Trust level 3 measurements redone 2014-06-26 17:33:22 -04:00
Andrew Bezzub
386d1e231a move profile_background from User to UserProfile 2014-06-26 12:30:07 -04:00
Neil Lalonde
27fb65b562 Add uncategorized_description site setting 2014-06-24 17:45:34 -04:00
Arpit Jalan
7e946a718e Make bookmarks menu appear all the time 2014-06-23 10:21:33 +05:30
Robin Ward
8a4e96645c FEATURE: Can click to expand hidden posts to see the good stuff! 2014-06-20 17:07:12 -04:00
Vikhyat Korrapati
e0fd1f6f5e Add ability to specify custom font awesome icon for badges. 2014-06-19 16:56:18 +05:30
Régis Hanol
00117c18c3 FEATURE: dismissable banner topic 2014-06-18 20:05:19 +02:00
Sam
fed8f7c6f2 BUGFIX: muted categories showing up in new via message bus 2014-06-18 11:21:40 +10:00
Andrew Bezzub
9ffd173873 move bio to UserProfile from User 2014-06-13 14:55:32 -04:00
Jeff Atwood
6ceebc3f1c Merge pull request #2435 from techAPJ/add-bookmark-menu 
FEATURE: Add Bookmarks menu to user dropdown
 2014-06-12 03:28:40 -07:00
Arpit Jalan
aed2483bb9 FEATURE: User Bookmarks Menu 2014-06-12 01:54:54 +05:30
Sam
03087679f0 FEATURE: Support custom preferences for users, injected by plugins 2014-06-11 15:50:37 +10:00
Sam
62abb873df FEATURE: support serializing user custom fields by plugins 2014-06-11 11:57:22 +10:00
Andrew Bezzub
0a42901c40 do not use try in UserSerializer for fields coming from UserProfile 2014-06-07 13:30:35 -07:00
Andrew Bezzub
7db31adf35 move website from User to UserProfile 2014-06-06 21:54:32 -07:00
Robin Ward
651def63e5 Return the current user's custom fields 2014-06-05 16:16:45 -04:00
Régis Hanol
0df666277d BUGFIXES: properly deal with bookmarks and deleted posts 
BUGFIX: removing a bookmark from the activity feed was busted for deleted posts
BUGFIX: delete associated user actions when deleting a post
 2014-06-04 17:41:11 +02:00
Sam
9e9c41ac52 FEATURE: admins can clear screend emails if needed 2014-06-02 16:53:00 +10:00
Sam
5e526c033d BUGFIX: missing avatar on user pages 2014-06-02 12:59:54 +10:00
Sam
69ffce72a0 Remove dead code 2014-05-30 14:50:03 +10:00
Sam
fe594f5d1e Merge pull request #2372 from vikhyat/badge-system 
Multiple grant badges
 2014-05-30 10:18:00 +10:00
Catrin
772a304fc2 dropdown on categorypage 2014-05-29 18:18:27 -04:00
Neil Lalonde
e6841d0849 FIX: user avatar urls need to be absolute in wordpress api 2014-05-29 17:19:49 -04:00
Sam
5adc486cef BUGFIX: missing avatars in topic map 
Cleanup uneeded column
 2014-05-29 14:59:14 +10:00
Neil Lalonde
9aba666d3f Also warn admins when there aren't at least 50 posts 2014-05-28 13:33:48 -04:00
Robin Ward
7c22d738b6 FEATURE: Add a location field to a user's profile 2014-05-27 13:54:04 -04:00
Sam
f733d5532f BUGFIX: broken like expansion 2014-05-27 19:43:19 +10:00
Sam
504cfcff96 Fix specs for avatars 
Implement avatar picker
Correct avatar related jobs
 2014-05-27 10:08:03 +10:00
Sam
6c1c8be794 Work in progress, keeping avatars locally 
This introduces a new model to store the avatars and 3 uploads per user (gravatar, system and custom)

user can then pick which they want.
 2014-05-27 10:08:03 +10:00
Robin Ward
5284fb7cbc New Setting: Don't jump to new posts when replying 2014-05-26 16:39:03 -04:00
Robin Ward
fc3ce934f5 Show categories on the user streams for topics. 2014-05-26 13:49:57 -04:00
Vikhyat Korrapati
d208e4d517 Multiple grant badges. 2014-05-21 12:54:55 +05:30
Robin Ward
3211c60bbe FEATURE: A new site setting public_user_custom_fields which allows you 
to whitelist custom fields that will be exposed to the Ember client
application.
 2014-05-14 14:39:01 -04:00
Neil Lalonde
4980cff802 Add descriptions. Make all the actions buttons. Add a revert button to colors. Add a new variable: quaternary. 2014-05-14 10:19:00 -04:00
Neil Lalonde
c4d3aa3d47 Theming: a UI to choose some base colors that are applied to all the site css. CSS compiled outside of asset pipeline. 2014-05-14 10:18:12 -04:00
Wojciech Zawistowski
960d64930c Wiki Post 2014-05-13 08:53:11 -04:00
Régis Hanol
bc3de84ebf FEATURE: remove bookmark button in activity feed 2014-05-12 09:33:26 +02:00
Régis Hanol
9125453628 FEATURE: add the first 3 participants in a private message 2014-05-12 09:32:49 +02:00
Sam
c683fab2a1 Adjust username styling 2014-05-12 11:28:24 +10:00
Erick Guan
a4aeb21f0c Add regular notification level into topic_view_serializer for the user who enter the new topic 2014-05-06 16:42:18 +08:00
Régis Hanol
c21d3f41d0 BUGFIX: only redirect new users to top page once 
Actually, new users will still be redirected to the top page during the first 30 seconds of their first visit.
 2014-05-05 19:00:40 +02:00
Régis Hanol
4642218662 FEATURE: add private messages counters in user activity feed 2014-05-02 22:53:58 +02:00
Neil Lalonde
dc0a758ec6 FIX: quote whole post button was broken 2014-04-30 14:21:43 -04:00
Neil Lalonde
f61f29439e Track the ip address where user was registered 2014-04-29 14:37:56 -04:00
Vikhyat Korrapati
b4e037dfb2 Allow badges to be marked as "titleable". 2014-04-28 10:30:38 +05:30
Robin Ward
cdd2101e4f FIX: Don't hotlink links for new users 2014-04-24 18:36:02 -04:00
Neil Lalonde
feaaf55a0c Theming: color scheme editing. Unfinished! Doesn't have any effect on css files yet. 2014-04-24 16:49:12 -04:00
Sam
05efc8df16 BUGFIX: likes would cause whole post to re-render 2014-04-24 12:42:04 +10:00
Robin Ward
af877781b7 Allow admins to choose if groups are visible or not. 2014-04-22 16:43:46 -04:00
Vikhyat Korrapati
843023d7c9 Fix user_badges n+1 query. 2014-04-17 21:58:05 +05:30
Vikhyat Korrapati
b62606e7f1 Remove color_hexcode column from badge_types. 2014-04-17 05:36:29 +05:30
Vikhyat Korrapati
3136217fc1 Add badge page. 2014-04-17 01:57:57 +05:30
Vikhyat Korrapati
acfcf0b64e Add /badges route that lists all defined badges. 2014-04-16 18:42:06 +05:30
Vikhyat Korrapati
4c0f85650e Display badge count in the user admin page. 2014-04-16 18:08:10 +05:30
Vikhyat Korrapati
e0a4959dc9 Sort featured badges by badge type first, followed by grant count. 2014-04-16 18:08:10 +05:30
Neil Lalonde
91bfd47419 FIX: don't show contents of hidden posts when quoting the post and when replying as new topic. Also don't allow public to view edit history of hidden posts. 2014-04-15 12:49:08 -04:00
Sam
d3810ba3bc Merge pull request #2212 from vikhyat/badge-system 
Show badges in the poster expansion card
 2014-04-14 10:54:43 +10:00
Vikhyat Korrapati
89b9f9e2cb Fix badge serialization issue. 2014-04-11 07:33:17 +05:30
Vikhyat Korrapati
3f4c5ed451 Show badges in the poster expansion card. 2014-04-11 06:59:11 +05:30
Sam
97269fc918 FEATURE: education panel on pinning at bottom of topics 2014-04-10 15:53:58 +10:00
Sam
b9d4edd91a FEATURE: display unpinned state, allow unpinning by clicking on pin 2014-04-10 10:59:02 +10:00
riking
1540a3d5e5 Allow changing ownwership of posts by admins 2014-04-08 01:47:42 -07:00
Robin Ward
7e3ea5d644 Support for crawling topic links 2014-04-07 14:08:34 -04:00
Robin Ward
f5c7ccb4e6 New field: Whether or not to include an expandable first post for 
embedded content.
 2014-04-02 10:26:46 -04:00
Robin Ward
539890afdf Let's not show tons of extra information about invites unless you're the 
person who invited them.
 2014-03-21 14:16:11 -04:00
Neil Lalonde
0b1550f9d4 Add excerpt column to topics table to remove N+1 query in ListableTopicSerializer 2014-03-18 15:24:29 -04:00
Sam
fe63db7953 Merge pull request #2115 from vikhyat/badge-system 
Initial badge system implementation
 2014-03-17 10:06:37 +11:00
Sam
f4c2fef407 Merge pull request #2121 from LessonPlanet/disable-name-edit-for-sso 
Adding name to the list of uneditable items in preferences UI
 2014-03-17 10:05:11 +11:00
Régis Hanol
2b5e4c3919 BUGFIX: revision numbers were unbound in revision history UI 2014-03-14 17:25:02 +01:00
Vikhyat Korrapati
9b26c8584e Initial badge system implementation. 2014-03-14 21:49:26 +05:30
Forest Carlisle
e904b2faad Adding name to the list of uneditable items in preferences UI 
* If enable_names,  enable_sso, and sso_overrides_name settings are true.
  * Added serialization of can_edit_name so the UI has access to the right.
 2014-03-13 13:26:40 -07:00
Neil Lalonde
283dc7dd2d Trust level 4: add ability to edit any post and see edit history 2014-03-13 10:47:49 -04:00
Neil Lalonde
3175c85fa6 FIX: pin/unpin button in topic admin menu needs to ignore whether the admin user cleared the pin 2014-03-12 14:47:15 -04:00
Robin Ward
055b367e2b Add link counts to alt tags of their badges. 2014-03-07 14:43:29 -05:00
Régis Hanol
8214536614 BUGFIX: don't show redirect reason if you aren't redirected 
Move the redirect to top page logic server-side and make sure the reason
is not shown when top is not in the navigation menu (top_menu).
 2014-03-07 18:58:53 +01:00
Sam
b19400726f BUGFIX/FEATURE: store topic changes in post revisions 
History + edit notifications for title and category changes
 2014-03-07 19:00:36 +11:00
Régis Hanol
bce4130d39 Merge pull request #2036 from ArmedGuy/profile-backgrounds 
FEATURE: Profile Backgrounds
 2014-03-05 16:00:49 +01:00
Johan Jatko
98c479c3c4 FEATURE: Profile Backgrounds 
Shares a modified codebase with avatars called "user_image"
 2014-03-05 15:10:44 +01:00
Benjamin Kampmann
d32cb55837 Add public-inbox to Email-In-Feature 
- Adds the advanced option to accept email from non-users per category email-address
 - Adds tests covering the new feature
 - Adds UI to configure this feature in the frontend
 2014-02-28 16:53:58 +01:00
Benjamin Kampmann
37cea49459 Add Email-In-Per-Category 
- allow the configuration of an inbox-email-address per category
 - post emails to that email into that category instead of global

 - Adds UI for configuration
 - Adds Documentation for configuration
 - Adds Tests for new feature
 2014-02-28 16:53:58 +01:00
Robin Ward
9267c162a1 FIX: Showing Unread(1) when you weren't tracking the topic. Also 
includes performance fix when having MANY new or unread topics.
 2014-02-26 15:39:45 -05:00
Jonathan Allard
c513725f26 Allow users to toggle interface language in their preferences 2014-02-18 14:53:59 -05:00
Neil Lalonde
6c23a1903e FIX: show ip address with mask again on /admin/logs/screened_ip_addresses 2014-02-18 10:33:08 -05:00
Régis Hanol
aac4b55926 FEATURE: do not redirect to top page when number of topis is low 2014-02-17 14:28:12 +01:00
Neil Lalonde
35dae76bbd Log when and why an email was not sent in email_logs 2014-02-14 13:06:39 -05:00
Neil Lalonde
42fb9d4fb1 Avoid calling can_delete_account twice 2014-02-14 13:06:39 -05:00
Régis Hanol
e7472dc374 readonly mode 2014-02-13 13:31:13 -08:00
Régis Hanol
93dd619080 Backup serializer 2014-02-13 13:31:13 -08:00
Neil Lalonde
8711762143 Users who have made no more than one post can delete their own accounts from their user preferences page. 2014-02-13 13:52:06 -05:00
Robin Ward
f73a3f252a FIX: Don't allow parent categories to be deleted. Also, remove 
duplicated logic and rely on the server response for `can_delete`
status.
 2014-02-12 17:24:25 -05:00
Robin Ward
a929eda8ba NEW: Add user name and title to group posts. 2014-02-12 14:23:10 -05:00
Neil Lalonde
6bbc3ec3e0 Add a way to flag a topic 2014-02-12 12:57:55 -05:00
Sam
750d3a6b18 BUGFIX: ensure topic_view exists before attempting to access it 2014-02-11 10:23:47 +11:00
Robin Ward
b61df08d1b FEATURE: Admin selector to choose a primary group for a user, display it 
and apply a CSS class to their posts.
 2014-02-10 17:00:15 -05:00
Sam
4f6cef01e4 fix build 2014-02-10 16:07:09 +11:00
Sam
5d0cae2dd1 BUGFIX: seen logic was incomplete, you can have user_data and still unseen topic 2014-02-10 15:27:46 +11:00
Neil Lalonde
130f0e19ec FIX: more protection from nil in count_with_subcategories 2014-02-07 11:38:22 -05:00
Robin Ward
3b617b04b0 FEATURE: First stab at groups page with member list 2014-02-07 10:44:51 -05:00
Robin Ward
e511e8a80b Link to groups from user profile 2014-02-07 10:44:51 -05:00
Robin Ward
2d47fe4473 Can list group members 2014-02-07 10:44:51 -05:00
Sam
227873df78 FEATURE: proper mailing list mode 
once enable_mailing_list_mode is enabled any user can elect
to get every post via email unless they opt out of category or topic
 2014-02-07 11:07:52 +11:00
Régis Hanol
58202baa62 BUGFIX: show the draft on top page 2014-02-06 11:39:43 +01:00
Neil Lalonde
14018ec07c FIX: topic and post counts on /categories page should include sub-categories 2014-02-05 18:39:49 -05:00
Neil Lalonde
c8bc9bd5db Show discourse logo as system user avatar 2014-01-29 12:29:05 -05:00
Robin Ward
2892153712 REMOVE: Get rid of the hotness control for good. 2014-01-29 11:54:34 -05:00
Neil Lalonde
90e195b2e7 More work on trust level 3 requirements page 2014-01-24 11:56:46 -05:00
Neil Lalonde
ae3b53bb76 Add a page in admin to view trust level 3 requirements for a user. Only shows for users who are currently at trust level 2. 2014-01-22 18:17:45 -05:00
Neil Lalonde
1dbc1c56b4 FIX: inviting a user again after the first invite expires will create a new invite 2014-01-21 16:56:40 -05:00
Neil Lalonde
ba74226346 FIX: invited users get clearer messaging when setting a password for the first time 2014-01-21 12:42:26 -05:00
Régis Hanol
129617b415 Lots of bugfixes 
BUGFIX: navigation bar should always activate the right tab (even when diging into a top period)
BUGFIX: /top pages titles
BUGFIX: no "edit category" button on /top page after visiting a category
BUGFIX: properly hide category columns when there is no children category (on both filter + top pages)
BUGFIX: promises not caught when scrolling down a topic list to load more of them
BUGFIX: CSS on category dropdowns
Updated `top_menu` i18n with available filters
 2014-01-18 19:27:25 +01:00
Robin Ward
4981525047 REFACTOR: Fixes poor class hierarchy for listing topics 
- Upgrades Ember to latest
- Fixes a bunch of bugs with page titles and missing "active" states
 2014-01-18 19:26:24 +01:00
Régis Hanol
3a6bffa05d FEATURE: better top pages 2014-01-14 01:09:12 +01:00
Sam
2b64118df1 Merge pull request #1782 from ligthyear/group-mention 
Allow groups to be used as aliases for user mentions
 2014-01-12 14:36:45 -08:00
Benjamin Kampmann
c743a985a4 Allow groups to be used as aliases for user mention 
when configured by the admin a group can be found through the @mentions
feature in both the compose/reply and the private message user-selectors
and once selected the mention will be replaced by the list of users in
the group
 2014-01-08 02:36:24 +11:00
Sam
f91163e146 FEATURE: added UI for tracking categories 2014-01-06 11:57:27 +11:00
Sam
2da5d2311b FEATURE: Added UI for adding and removing watched and muted categories 2014-01-02 17:59:08 +11:00
Sam
db1d01d1a2 Discourse as a Mailing List improvements 
FEATURE: context is not emailed if we previously emailed you the post
FEATURE: site setting to enable_watch_new_topics , false by default.
  When enables users can elect to watch everything by default
FIX: Custom email subjects (x quoted you in [title], x replied to [title])
  was removed, this broke email grouping. TBD, include info in footer somehow
FIX: topic user specs were messy, reduce side effects
 2013-12-30 13:02:12 +11:00
Régis Hanol
90eb6e6b8f FIX: only show edit reason when the user action is an EDIT 2013-12-27 17:17:32 +01:00
Régis Hanol
567d2bd23c add top page 2013-12-24 00:50:36 +01:00
Régis Hanol
206ef3dc08 add discourse_diff tests 2013-12-16 18:11:46 +01:00