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

2513 commits

Author SHA1 Message Date
Sam
1eb1756dcf Merge pull request #1419 from mguillemot/non_editable_username_and_email 
Enable/disable the possibility of editing user's nickname or email
 2013-09-15 19:24:35 -07:00
Kris Aubuchon
045b1b0d96 fixed history modal, topic progress now sticky to last post, edits heatmap is back, date/edit links now grey 2013-09-14 23:28:28 -04:00
Matthieu Guillemot
3ba1f20674 New site settings to enable/disable the possibility of editing user's nickname or email address 2013-09-14 21:34:21 +09:00
Robin Ward
10c4dee67c Merge branch 'master' of git://github.com/awesomerobot/discourse into awesomerobot-master 
Conflicts:
	app/assets/stylesheets/mobile/topic-post.css.scss
	app/assets/stylesheets/mobile/topic.css.scss
 2013-09-14 00:39:08 -04:00
Kris Aubuchon
e1b11c62ea reintroducing the post progress indicator, fixing gutter links, reducing white space between posts 2013-09-13 23:03:29 -04:00
Neil Lalonde
f86aead49e Disable custom stylesheets on mobile for now. 2013-09-13 14:54:57 -04:00
Neil Lalonde
8de91e3789 Also put a class on html element for desktop view 2013-09-13 14:54:57 -04:00
Robin Ward
c365bd0070 Notify users posting sequential replies that there's a better way to do it. 2013-09-13 13:49:34 -04:00
Robin Ward
5d8cfd69f7 FIX: JSHint errors 2013-09-13 12:29:57 -04:00
Robin Ward
7d9a84b496 New User Education goes through a server side ComposerMessages check. Composer message for users 
who don't have avatars.
 2013-09-13 12:23:53 -04:00
Neil Lalonde
32163bc356 Show post number in share dialog when clicking post date 2013-09-13 10:35:22 -04:00
Neil Lalonde
5071d71294 Don't show custom header on mobile view 2013-09-12 18:46:35 -04:00
Neil Lalonde
8f12212942 Remove duplicate css. Kris and I fixed the same thing. I imported variables.scss so we can use $red and $bookmarkColor 2013-09-12 18:08:12 -04:00
Neil Lalonde
e3c68bc500 Merge pull request #1432 from awesomerobot/master 
fixing bookmarks and blockquotes for mobile
 2013-09-12 14:41:15 -07:00
vagrant
4fbd011f39 fixing bookmarks and blockquotes for mobile 2013-09-12 16:00:53 -04:00
Neil Lalonde
90aaa27b98 Fix modal button spacing on mobile 2013-09-12 15:09:45 -04:00
Neil Lalonde
c260ae622d Fix closing a modal on mobile 2013-09-12 15:09:45 -04:00
Neil Lalonde
f0eede077d Show bookmark colours on mobile 2013-09-12 15:09:44 -04:00
Neil Lalonde
57dc8ed9f6 Add margin to auto-close message on mobile 2013-09-12 15:09:44 -04:00
Robin Ward
3fcd331d43 Add records that indicate a user's avatar has been checked 2013-09-12 14:58:20 -04:00
Sam
00951e0578 remove "via sitename" from senders 2013-09-12 15:38:18 +10:00
Sam
fc203b7c2c fix broken text when clicking share at the bottom 2013-09-12 11:47:41 +10:00
Sam
aa26f9b2ad I need to figure out how to make a .try variant that does not call respond_to. 2013-09-12 11:29:44 +10:00
Neil Lalonde
bded4b26fa Ask admins to fill in site_description on the dashboard, and send it to the hub 2013-09-11 16:32:49 -04:00
Neil Lalonde
4fa11f159f Add site setting site_description. If filled, it will be used in meta description tag for teh white hat SEO 2013-09-11 15:33:27 -04:00
Robin Ward
06ea8140aa New job (default off) to detect whether users have uploaded custom avatars by contacting Gravatar. 2013-09-11 15:14:18 -04:00
Robin Ward
fcff4e80d1 New user_stats table to keep track of queried information on a user. 
This is information that is not usually needed when representing a user
and is in a separate table with a has one relationship to avoid querying
it all the time.
 2013-09-11 14:50:26 -04:00
Neil Lalonde
fe3693cdef Merge branch 'master' of github.com:discourse/discourse 2013-09-11 10:20:27 -04:00
Sam
def4f15795 Merge pull request #1427 from awesomerobot/master 
Reducing margins on mobile view
 2013-09-11 00:36:57 -07:00
Sam
e26b3662ee drafts were saving but client was failing to parse 2013-09-11 16:18:46 +10:00
Sam
efb15af209 not needed, already in private section 2013-09-11 16:18:17 +10:00
Sam
8516059025 remove global check 2013-09-11 15:58:55 +10:00
Kris Aubuchon
a8bc789b81 reducing margins on mobile 2013-09-10 23:56:55 -04:00
Sam
681ff74cb8 Revert "inject currentUser into controllers & routes" 
This reverts commit 7ec34b205a.
 2013-09-11 13:26:46 +10:00
Neil Lalonde
e8ef55c446 Rename StaffActionLog to UserHistory 2013-09-10 22:01:20 -04:00
Sam
e420ce3da3 fix regression, 2 people liked this text not expanding correctly 2013-09-11 11:24:42 +10:00
Robin Ward
30eed4c8b4 FIX: Showing suggested topics when composing a reply 2013-09-10 20:00:04 -04:00
Robin Ward
f2a1ef8d7d FIX: When expanding embedded replies, adjust the scroll position to not lose your place 2013-09-10 17:15:07 -04:00
Neil Lalonde
cc2acafc9a Enable mobile view. Use local storage to remember whether you chose mobile or desktop view. Mobile device detection needs to be replaced with a better solution. 2013-09-10 16:44:17 -04:00
Robin Ward
2319924206 Adds a class that can detect whether a user has uploaded a custom avatar 2013-09-10 15:39:11 -04:00
Robin Ward
886787b157 Remove extra comma 2013-09-10 12:31:58 -04:00
Robin Ward
0de96a6059 Adds support for dynamic composer messages. 2013-09-10 12:30:56 -04:00
Sam
bcf0203497 fix encoding bug 2013-09-10 16:01:36 +10:00
Sam
162d94aa02 improve secure_category_id query 2013-09-10 14:29:02 +10:00
Sam
df5f9d66e5 bugfix: when expanding "1 person flagged for moderation" target post is not clickable 2013-09-10 09:51:33 +10:00
Neil Lalonde
78c15d5810 Move the unique post key storage code into the Post model 2013-09-09 16:17:31 -04:00
Neil Lalonde
48ee89940e Merge pull request #1423 from einarj/nickname_registration_service 
Nickname registration service object
 2013-09-09 11:37:56 -07:00
Robin Ward
84a8a358c3 Trivial: Rename dialect action to block quotes rather than simple quotes 2013-09-09 14:11:56 -04:00
Robin Ward
49910b860b FIX: Regression that removed the ability to quote code 2013-09-09 13:20:03 -04:00
Neil Lalonde
199584824b Don't show approval on admin user page if the site doesn't require approval of users (must_approve_users) 2013-09-09 12:24:26 -04:00
Robin Ward
360b8e32ca Merge pull request #1404 from ZogStriP/admin-can-always-upload-a-file 
staff can always upload a file
 2013-09-09 08:55:47 -07:00
Robin Ward
fc4f5a36c6 Merge pull request #1418 from goshakkk/inject-current-user 
Inject currentUser into controllers & routes
 2013-09-09 08:54:34 -07:00
Neil Lalonde
b73f4e9864 Put category description in meta description tag 2013-09-09 11:38:09 -04:00
Einar Jonsson
724b3aadcf Extracted nickname registration out of the UsersController and into its 
own service.
 2013-09-09 09:26:50 +00:00
Gosha Arinich
7ec34b205a inject currentUser into controllers & routes 
Through Ember's DI, instead of doing so via a mixin.
 2013-09-07 19:34:25 +03:00
Régis Hanol
eae30d7816 staff can always upload a file 2013-09-07 10:49:11 +02:00
Robin Ward
b87a78f7b2 Merge branch 'master' of github.com:discourse/discourse 2013-09-06 18:01:33 -04:00
Robin Ward
c8ad977c8a Revert "Merge pull request #1215 from Elegios/composer_use_category_id" 
This reverts commit 763859d439, reversing
changes made to b62caf80fb.
 2013-09-06 18:00:57 -04:00
Neil Lalonde
2ea6a61a17 Show post number in the share dialog 2013-09-06 17:34:31 -04:00
Robin Ward
a9f3489237 FIX: Don't onebox links with labels unless the labels are the same as the URL 2013-09-06 16:47:26 -04:00
Robin Ward
94917f47ed Remove brackets from username_filters[] URL 2013-09-06 15:58:54 -04:00
Neil Lalonde
eef34eea80 Fix IE9 bug in browser-update. Unable to get value of the property 'insertBefore': object is null or undefined 2013-09-06 14:57:26 -04:00
Robin Ward
763859d439 Merge pull request #1215 from Elegios/composer_use_category_id 
Make the composer and TopicCreator use category id instead of category name
 2013-09-06 11:55:27 -07:00
Robin Ward
b62caf80fb Merge pull request #1402 from LaunchAcademy/fix_index_out_of_range_error 
FIX: Index out of range error
 2013-09-06 11:53:59 -07:00
Régis Hanol
45b838009c proper content-disposition header when downloading attachments 2013-09-06 19:23:56 +02:00
Neil Lalonde
eae7e75611 FIX: recover post by a non-staff user fails because the post is not unique. Uniqueness check shouldn't happen when recovering a deleted post. 2013-09-06 11:50:15 -04:00
Sam
641c51367a fix broken build 
hack to allow for PMs with no users for flagging needs
 2013-09-06 18:03:30 +10:00
Sam
32e3e3f382 update annotations 2013-09-06 17:38:50 +10:00
Sam
2ce4468aa5 rename system_username to site_contact_username , system_user is a special user with -1 id that is only used for certain admin tasks 
for example system_user will autoclose stuff if needed, it will delete stubs and be the target for flag pms
 2013-09-06 17:28:37 +10:00
Sam
41a1b6942d notify moderators now goes to the "community" user, that saves our poor mods from a flood of pms 
if any staff respond to a pm they are automatically added to the list of recipients and will start
getting email notifications
 2013-09-06 14:07:23 +10:00
Neil Lalonde
cbe38075ac Fix asset compile problems 2013-09-05 18:04:45 -04:00
Robin Ward
63be950e5f FIX: Quotes inside a list 2013-09-05 17:04:01 -04:00
Neil Lalonde
f47400fe2d Make post body have font-size 14px again 2013-09-05 16:45:38 -04:00
Neil Lalonde
9b526364ed Merge branch 'mobile' 2013-09-05 16:29:27 -04:00
Neil Lalonde
66d1cacdbd Hide flag modal while flag is submitted 2013-09-05 16:29:13 -04:00
Neil Lalonde
a3f3b086f3 Don't show mobile view unless mobile_view=1 param is used. Still more work to do. 2013-09-05 16:28:57 -04:00
Neil Lalonde
c0b3a0ec45 Merge .deleted-user-avatar into mobile topic-post 2013-09-05 16:28:16 -04:00
Robin Ward
38fb727c00 JSHINT: missing comma 2013-09-05 16:05:04 -04:00
Neil Lalonde
17585c7152 Merge branch 'mobile' of https://github.com/awesomerobot/discourse into mobile 2013-09-05 16:03:06 -04:00
Neil Lalonde
45d7765936 Merge branch 'master' into mobile 2013-09-05 15:54:22 -04:00
Robin Ward
2d6759d5a0 Add cancel button to delete replies dialog 2013-09-05 15:54:16 -04:00
Kris Aubuchon
b8493b024b adding missing files back in 2013-09-05 15:37:07 -04:00
Neil Lalonde
c2f37d36ab Hide flag modal while flag is submitted 2013-09-05 15:14:07 -04:00
Kris Aubuchon
80c4e02335 new mobile styles, some structure changes 2013-09-05 12:09:40 -04:00
Neil Lalonde
cde631cbd1 Change default of notify_mods_when_user_blocked to false 2013-09-05 11:27:24 -04:00
Robin Ward
71c1b8b9b9 When deleting a post as staff, ask if you want to delete direct replies too 2013-09-05 11:03:34 -04:00
Robin Ward
f157ec1f91 Select +Replies for bulk operations 2013-09-05 11:03:29 -04:00
Sam
c9321cae7f Our JS includes belong at the top of the file, that way we can start 
downloading and parsing them earlier and not wait for the rest of the page

Our noscript stuff belongs at the bottom, we should not hold off any js work
while noscript is downloading
 2013-09-05 10:41:11 +10:00
Neil Lalonde
d76486a48b Topic can have null user_id when user was nuked 2013-09-04 15:42:24 -04:00
Neil Lalonde
117fc8db58 Change the way nuked users' posts are handled. Allow null in the user_id column of posts. Show these posts in the posts stream. 2013-09-04 15:42:21 -04:00
Robin Ward
1a6170a47c Merge pull request #1407 from einarj/extract_fake_admin_method 
Extracted a fake_admin method
 2013-09-04 07:59:03 -07:00
Sam
61d3e43744 better split logic for names starting with capitols eg: ABBob should split to AB Bob 2013-09-04 15:02:04 +10:00
Neil Lalonde
b47eedba00 Add min_trust_to_create_topic setting to require a certain trust level before users can start new topics 2013-09-03 19:12:22 -04:00
Neil Lalonde
dc1efd6c78 If mobile view, don't switch to small logo in the header when scrolled down in a topic 2013-09-02 16:26:12 -04:00
Neil Lalonde
07e6956917 Restructure login form for mobile 2013-09-02 16:02:52 -04:00
Neil Lalonde
1fa6144067 Add span.btn-text around 'Reply' text in the post menu 2013-09-02 15:55:35 -04:00
Einar Jonsson
e06356ebbe Extracted a fake_admin method 2013-08-30 17:39:31 +00:00
Robin Ward
46efbac40e Add "Unread" filter to messages tab. Rename the other two views. 2013-08-30 12:32:05 -04:00
Robin Ward
232f5bd743 Merge pull request #1403 from einarj/use_topic_delegators 
Replaced delegator methods with Forwardable def_delegator in Topic
 2013-08-30 08:15:10 -07:00
Robin Ward
63f2187d72 FIX: Don't do intraword italics when prefixed by a forward slash 2013-08-30 10:56:41 -04:00