codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-12-01 03:17:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
4772 commits 7 branches 179 tags 87 MiB
Commit graph

1646 commits

Author SHA1 Message Date
Sam
13527a1df7 Merge pull request #1448 from velesin/remove_redundant_presence 
Remove duplicate mixing in of Discourse.Presence
 2013-09-20 14:22:10 -07:00
Wojciech Zawistowski
58ba8a0e49 remove unnecessary (empty) view class 
Discourse.ApplicationView does not provide any functionality above what
already automatically happens via Ember's "convention over
configuration" behavior and is therefore redundant.
 2013-09-20 17:52:38 +02:00
Robin Ward
e3a56864dd Changes to support Spoiler Alert plugin 2013-09-19 18:01:30 -07:00
Neil Lalonde
147887bc63 Remove duplicate list.js.handlebars 2013-09-19 16:52:57 -07:00
Neil Lalonde
5b455152d0 Add wrench icon to Edit Category button 2013-09-19 16:41:52 -07:00
Neil Lalonde
0a07b37ae9 Add email icon to password reset email button 2013-09-19 16:37:37 -07:00
Neil Lalonde
95257a192a Remove posts icon and make post count bold in mobile topic lists 2013-09-19 16:24:46 -07:00
Neil Lalonde
01180e78cc Use two lines per topic list item on mobile 2013-09-19 14:36:38 -07:00
Wojciech Zawistowski
7da10c0149 Remove duplicate mixing in of Discourse.Presence 
AdminEmailIndexController and AdminEmailPreviewDigestController explicitely mix in Discourse.Presence, but they extend base classes Discourse.Controller and Discourse.ObjectController that already mix in Discourse.Presence, so this explicit inclusion is redundant.
 2013-09-18 18:40:57 +02:00
Kris Aubuchon
79b8991ed8 fixing blockquote on mobile 2013-09-18 11:05:23 -04:00
Kris Aubuchon
c60912f714 mobile: blockquote title fix 2013-09-18 00:37:56 -04:00
Kris Aubuchon
05c4173723 mobile: suggested topics will now fill the viewport width 2013-09-17 23:46:12 -04:00
Kris Aubuchon
9808ae2970 mobile: reduce vertical space between posts, prevent titles from wrapping 2013-09-17 23:32:11 -04:00
Neil Lalonde
21b018192f Style categories page for mobile 2013-09-17 17:02:10 -04:00
Neil Lalonde
fdc7267ad9 Add margin to topic list footer message 2013-09-17 16:40:23 -04:00
Neil Lalonde
be71dbfd94 Topic list styling for mobile 2013-09-17 16:07:14 -04:00
Neil Lalonde
c04613f269 Fix resolver for mobile templates 2013-09-17 16:07:14 -04:00
Neil Lalonde
0fafe124db Add enable_mobile_theme site setting. Uncheck it to disable the mobile theme. 2013-09-17 11:25:37 -04:00
Robin Ward
2baf5fda8e Merge pull request #1438 from Elegios/composer_use_category_id 
Make the composer and TopicCreator use category id instead of category name
 2013-09-17 08:03:48 -07:00
Viktor Palmkvist
37673e3412 Make the composer and TopicCreator use category id instead of category name 
Also fixes #1171
Includes backwards compatibility for topic creation
 2013-09-17 12:13:19 +02:00
David Celis
279b1fbf48 Better padding for spoiler text 
With no padding currently surrounding [spoiler] text, the white text
gets close enough to the white post background that it's a bit more
difficult to read than it reasonably could be. Pad spoiler text with 2px
to alleviate this difficulty.

Signed-off-by: David Celis <me@davidcel.is>
 2013-09-16 12:49:38 -07:00
Neil Lalonde
e4e8d2fc34 Allow switching between mobile and desktop view on any device. 2013-09-16 14:26:20 -04:00
Neil Lalonde
13f17b2a5c Add ability to customize css and header for mobile 2013-09-16 12:28:02 -04:00
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
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
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
Sam
fc203b7c2c fix broken text when clicking share at the bottom 2013-09-12 11:47:41 +10: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
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
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
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
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
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
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
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
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
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
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
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
Robin Ward
46efbac40e Add "Unread" filter to messages tab. Rename the other two views. 2013-08-30 12:32:05 -04:00
Robin Ward
63f2187d72 FIX: Don't do intraword italics when prefixed by a forward slash 2013-08-30 10:56:41 -04:00
Robin Ward
df5cbf76e0 Move insideGroup into the helper, not the class for grouped each 2013-08-30 10:44:34 -04:00
Eric Kelly
b70a38f485 FIX: Index out of range error 
Fixes 'index out of range error' that occurs when viewing a user's
profile page when they haven't yet posted a reply or created a topic
and is @mentioned in a topic.
 2013-08-30 00:43:54 -04:00
Neil Lalonde
82bc6b677f Add link in hamburger menu to switch between mobile and desktop views 2013-08-29 15:19:28 -04:00
Robin Ward
380a6c9e9d FIX: Blockquotes prefixed by spaces 2013-08-29 15:18:27 -04:00
Robin Ward
c99cf64d70 FIX: Quoting within code blocks. 2013-08-29 14:42:31 -04:00
Robin Ward
1204eb62c3 FIX: Escape contents when using the quote tool. 2013-08-29 14:15:05 -04:00
Robin Ward
45b9f8048a Documentation update to dialect 2013-08-29 13:59:41 -04:00
Robin Ward
eb5830f3b0 FIX: Make getURL available to plugins while they are starting up in a similar load order 
to the client app.
 2013-08-29 13:11:12 -04:00
Robin Ward
425b59d381 FIX: Don't name two routes the same. It breaks in Ember RC8. 2013-08-29 12:26:05 -04:00
Robin Ward
3cec95a2c3 Better API for parsing out blocks in the parser. 2013-08-29 11:47:44 -04:00
Sam
2c61828668 saving dialog somehow vanished during refactoring 
better error handling for posts that fail to save
 2013-08-29 17:06:27 +10:00
Neil Lalonde
4827634df9 rename application.css.erb to desktop.css.erb 2013-08-28 16:41:05 -04:00
Robin Ward
6029a77efb A nicer API for dealing with text replacements in Discourse's parser pipeline 2013-08-28 16:15:50 -04:00
Neil Lalonde
2b2c83ffb7 remove console.log 2013-08-28 15:53:42 -04:00
Neil Lalonde
c2088f5b5d Use moment.js in auto close js 2013-08-28 15:37:39 -04:00
Robin Ward
eeef24b9da Allow basic emoticons to work too. 2013-08-28 15:27:03 -04:00
Neil Lalonde
e3aafc154b Restructure the app/assets/stylesheets directory 2013-08-28 13:58:44 -04:00
Robin Ward
af18cc87fd Better documentation for new Dialect helpers. Migrated emoticon support to new helper format. 2013-08-28 13:55:08 -04:00
Robin Ward
550ef104c6 FIX: Markdown references within a list were not working properly. 2013-08-28 13:06:41 -04:00
Robin Ward
f7ad80ff7b A couple of important markdown fixes. 2013-08-28 11:14:31 -04:00
Sam
61281a3c81 invite only forums had very wonky logic, invited users were not being activated, invite_only forums were still registering users 2013-08-28 17:18:31 +10:00
Robin Ward
8f94760cd4 Better API for adding on to our Dialect 2013-08-27 18:17:34 -04:00
Régis Hanol
96772af35b FIX: avatar thumbnail won't save after upload 2013-08-27 23:01:35 +02:00
Neil Lalonde
b84c7e4efb Store mobile flag in Discourse.Session instead of Discourse 2013-08-27 16:50:50 -04:00
Neil Lalonde
3cfc9a7bba Create a mobile css manifest 2013-08-27 16:40:30 -04:00
Neil Lalonde
009dec833f Use Discourse.Resolver to load mobile templates when they exist 2013-08-27 13:41:36 -04:00
Robin Ward
73489b652e FIX: Allow intra-word underscores. 2013-08-27 12:25:05 -04:00
Neil Lalonde
89265c3a8b FIX: BAD CSRF on login. Don't check csrf in the fake login form since it doesn't actually do anything. 2013-08-27 11:31:14 -04:00
Robin Ward
07328e5e4b FIX: Navigating to a new topic after editing one was leaving edit controls open. 2013-08-27 11:29:30 -04:00
Sam
7787770758 leftover console.log 
jshint is upset
 2013-08-27 16:02:36 +10:00
Sam
c4a0152dc6 recover from bad CSRF tokens without requiring a hard refresh of the browser 2013-08-27 15:56:12 +10:00
Robin Ward
6c3cb9023c FIX: Allow backticks in code blocks 2013-08-26 16:53:10 -04:00
Neil Lalonde
068a674c39 Handle overflowing values on admin logs pages 2013-08-26 16:16:27 -04:00
Robin Ward
2d45c56ba5 Replace Markdown Linebreak Regexp with node parser. 2013-08-26 15:21:23 -04:00
Robin Ward
373b525ec1 Revert "FIX: New line insertion when a line begins with []" 
This reverts commit f84630a54d.
 2013-08-26 12:46:15 -04:00
Robin Ward
f84630a54d FIX: New line insertion when a line begins with [] 2013-08-26 11:42:52 -04:00
Sam
ac905d4a08 defer persona init till after people launch the login dialog 2013-08-26 17:51:41 +10:00
Sam
fd6e86483f strip out css fade-in animation from share dialog, it was only causing trouble. Fixing it is more hassle than it is worth. inivisible elements take height so we constantly need to worry about re-positioning the hidden share dialog. 2013-08-26 16:28:42 +10:00
Sam
0b74c2da9c fix jittering on click caused by re-positioning of invisible share dialog. it does not use display:none to preserve an animation. 2013-08-26 16:09:30 +10:00
Sam
818bf1355d PluginStore for plugin specific bits of storage 
Amended plugin interfaces so they work with the vk sample
 2013-08-26 12:59:17 +10:00
Sam
011d3cf779 minor style change 2013-08-26 12:55:13 +10:00
Régis Hanol
fd7fd22932 FIX: changing another user's avatar changes yours 2013-08-25 17:33:43 +02:00
Robin Ward
b32e87c929 Merge pull request #1377 from ZogStriP/avatar-work 
Improved specs for avatar + added a warning whenever the uploaded image is not a square
 2013-08-25 07:30:34 -07:00
Régis Hanol
4c788e75f0 add a warning whenever the uploaded image is not a square 2013-08-25 00:25:47 +02:00
Robin Ward
c0b051c9f6 Show Private Messages pill as a topic list rather than individual messages. 2013-08-24 16:58:16 -04:00
Robin Ward
20e8a8a38a FIX: Don't onebox @mentions 2013-08-24 15:01:00 -04:00
Robin Ward
5e286443a8 FIX: Code blocks were trimming leading spaces sometimes when they should have only 
trimmed trailing spaces.
 2013-08-24 13:24:27 -04:00
Robin Ward
093ead7855 Support for ***bold and italics*** 2013-08-24 13:06:07 -04:00
Robin Ward
08762f5666 Merge pull request #1369 from voisintotoro/voisintotoro-branch 
PNG Files optimization
 2013-08-24 08:32:15 -07:00
Neil Lalonde
6e79197519 Enum site settings can have translatable names in dropdown. Add setting for how often users get digest emails by default: default_digest_email_frequency. 2013-08-23 17:36:25 -04:00
Régis Hanol
43a8bff652 add a site setting for allowing animated avatars 2013-08-23 18:55:02 +02:00
Neil Lalonde
6a3c849067 Fix [object Object] in staff logs details modal 2013-08-23 10:08:35 -04:00
Jeff Atwood
f36fc8c41f remove unnecessary onebox body padding 2013-08-23 02:53:14 -07:00
Jeff Atwood
5cf0c59628 remove onebox info left padding 2013-08-23 02:48:55 -07:00
Neil Lalonde
25e0c3eac1 Log IP addresses with screened emails and urls 2013-08-22 19:04:35 -04:00
Robin Ward
612c0ccccb FIX: Autolinking within a list 2013-08-22 18:03:01 -04:00
Robin Ward
513f941f50 Fixes @mentions inside of lists 2013-08-22 17:50:36 -04:00
Robin Ward
f2c4b3e37f FIX: Following a mention with a coded mention. 2013-08-22 16:13:02 -04:00
Robin Ward
6fe0d29a01 FIX: @mentions within backticks followed by proper @mentions. 2013-08-22 15:55:29 -04:00
Robin Ward
5e50c4624f FIX: New lines in code blocks were somewhat unpredictable 2013-08-22 13:46:51 -04:00
Robin Ward
0f27232711 FIX: Support inline code blocks with @mentions in them. 2013-08-22 12:18:36 -04:00
voisintotoro
1983da14c3 PNG Files optimization 2013-08-22 14:00:25 +02:00
Robin Ward
ae93fcebde FIX: Autolines were duplicating some text 2013-08-21 22:49:55 -04:00