Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,704 Commits 187 Branches 500 Tags 848 MiB
Commit Graph

289 Commits

Author SHA1 Message Date
Robin Ward 29519ece23 Merge branch 'add-audio-onebox' of git://github.com/jamesaanderson/discourse into jamesaanderson-add-audio-onebox 
Conflicts:
	app/assets/stylesheets/application/compose.css.scss
	app/assets/stylesheets/application/topic-post.css.scss
 2013-07-26 11:30:40 -04:00
Neil Lalonde d579e4c5d5 Prevent category badges from wrapping on white space 2013-07-26 10:11:00 -04:00
James Anderson d7d3be1130 Add audio onebox 
http://meta.discourse.org/t/audio-html5-tag/8168
 2013-07-25 19:03:23 -07:00
Robin Ward 0317cf9608 Show topics as a list of topics on the User Stream. 2013-07-25 15:56:20 -04:00
Robin Ward c9c6a8fd9d User stream now uses eyeline for loading more content. 2013-07-23 16:06:26 -04:00
Neil Lalonde 44bebf255d Fix layout of category badges on categories page and in combobox 2013-07-23 15:05:37 -04:00
Sam 9c5734b773 tone down badges for the love of all that is good 2013-07-23 12:44:20 +10:00
Jeff Atwood d68f30c09d flatten and simplify default category badge styles 2013-07-22 00:11:34 -07:00
Jeff Atwood 5bb2090b81 fix way too tall line-height for user titles 2013-07-21 23:54:10 -07:00
Robin Ward 7a6f1b5aff Color moderator actions on user stream 2013-07-18 17:24:51 -04:00
Robin Ward 5a5e9d0fd1 Merge pull request #1206 from BrentleyJones/fixed_modals 
FIX: Modal dialogs now truly center and work at all screen sizes (mobile), now with working Bootbox
 2013-07-17 06:59:48 -07:00
Sam 2573935155 improve security UI 2013-07-17 15:10:49 +10:00
Brentley Jones f26b479458 FIX: History modal having custom (old) setting of min height and width. 
It is functional, but it no longer resizes down. I would look at making this fluid or having a style for mobile.
 2013-07-16 21:05:33 +00:00
Brentley Jones a03e933eb6 Fix spacing 2013-07-16 19:16:22 +00:00
Brentley Jones e060e952b5 Accidently removed some styles in the merge 2013-07-16 19:06:33 +00:00
Brentley Jones 5e08427dd3 Merge branch 'master' into fixed_modals 
Conflicts:
	app/assets/javascripts/discourse/templates/modal/modal.js.handlebars
	app/assets/stylesheets/application/modal.css.scss
 2013-07-16 18:58:49 +00:00
Brentley Jones cc28a4ddc3 FIX: Bootbox modals were not coming through properly. Temp have them use the old way of displaying. Will look into how to have them be the same as the "fixed" way. 2013-07-16 18:32:35 +00:00
Robin Ward 2577d76e4f Revert "Merge pull request #1201 from BrentleyJones/fixed_modals" 
This reverts commit 7e889c4e24, reversing
changes made to e9d37f395f.
 2013-07-16 13:38:01 -04:00
Robin Ward 7e889c4e24 Merge pull request #1201 from BrentleyJones/fixed_modals 
FIX: Modal dialogs now truely center and work at all screen sizes (mobile)
 2013-07-16 07:31:17 -07:00
Sam dc3079db37 fix mucked up styling, glyph should be inside the hyperlink so it gets color 2013-07-16 18:01:34 +10:00
Sam 352ac9e60c Finalize read only and post only categories, finished off UI work 2013-07-16 15:46:11 +10:00
Brentley Jones d1ab694920 FIX: Modal dialogs now truely center and work at all screen sizes (mobile) 2013-07-16 03:40:15 +00:00
Robin Ward ed60f24502 Merge pull request #1194 from ZogStriP/uploads 
[Upload] Great deal of renaming
 2013-07-15 07:06:18 -07:00
Jeff Atwood 52fa9a5453 widen @name autocomplete dialog 20% 2013-07-15 00:42:02 -07:00
Régis Hanol 36e6345eee change the icon in the composer toolbar with a more generic upload icon 
also changed all references to "images uploads" to a "uploads"
 2013-07-14 23:44:50 +02:00
Robin Ward 19c169540c Staff can enter and view deleted topics 2013-07-11 16:39:35 -04:00
Robin Ward eba662b988 FIX: Topic Status Icons had weird margins after font awesome update 2013-07-11 12:04:39 -04:00
Régis Hanol 1f8eaa6ca3 display correct template when attachment or image 2013-07-10 22:59:53 +02:00
Robin Ward 6de1fed87a Glyph stuff: Put them on the left of the user menu, fix padding on link arrows in gutter. 2013-07-10 16:58:58 -04:00
Jeff Atwood f1a5f4ce66 left align post quotes and blockquotes 2013-07-10 13:57:52 -07:00
Sam 8367326e76 glyphs on the user stream, rename responses to replies 2013-07-10 16:35:06 +10:00
Sam 7cee5efab8 The flattening part 2, cleaned up styling so it is more consistent with the removal of border yesterday 
quote style now matches block quote style
 2013-07-10 12:17:43 +10:00
Robin Ward 72632670db FIX: Font Awesome upgrade changed padding on (+) Reply as New Topic 2013-07-09 13:34:00 -04:00
Robin Ward 82b578249c Subtle changes to border colors 2013-07-09 13:11:13 -04:00
Robin Ward 437175b102 Merge pull request #1166 from jamesaanderson/mobile-and-tablet-video-rendering-fix 
Mobile and tablet video rendering fix
 2013-07-09 06:44:49 -07:00
Jeff Atwood a6b63b2871 de-box the topic posts a bit 
I CANT TAKE IT ANY MORE AHHHHHHH
 2013-07-09 03:38:01 -07:00
James Anderson 171e703e11 Mobile and tablet video rendering fix 
http://meta.discourse.org/t/chrome-for-ipad-iphone-breaks-with-this-video-embed/7983
 2013-07-08 17:22:25 -07:00
Sam e993d6b29b upgrade font awesome to version 3.2.1, use scss instead of css for the include. 2013-07-09 10:06:57 +10:00
Neil Lalonde 9b0f63627b Add blocked users count to dashboard 2013-07-08 12:44:13 -04:00
David McClure a3eb175683 - like counts use number formatting (so 1100 is 1.1K like other counts) 
- made 'likes' column wide enough to hold 3 digit and > 999 likes
 2013-07-06 00:07:10 -07:00
Jeff Atwood 1589874cd2 use a color constant instead of hardcoding 2013-07-04 01:11:45 -07:00
Jeff Atwood b555a0d461 try colorizing the category description ala BBS 2013-07-04 01:09:03 -07:00
Neil Lalonde 115491a057 Don't overlap post date with a quote inside an embedded post. CSS could still be improved. 2013-07-03 15:11:35 -04:00
Robin Ward f328804488 Merge branch 'add-list-of-authorized-extensions' of git://github.com/ZogStriP/discourse into ZogStriP-add-list-of-authorized-extensions 
Conflicts:
	app/models/site_setting.rb
 2013-07-03 11:18:42 -04:00
Neil Lalonde bb74c8b9cf Widen the Age column on categories page to fit the new date format 2013-07-02 17:22:35 -04:00
Robin Ward 9c552c39a2 FIX: CSS for post selection was off in lower resolutions 2013-07-02 15:29:05 -04:00
Neil Lalonde 0fde2a2d54 Move post timestamp in embedded post to the top right 2013-07-02 15:10:58 -04:00
Jeff Atwood 68d98ec94e user titles are massively overstyled 
LETS FIX IT
 2013-07-01 17:19:15 -07:00
Régis Hanol 6723ba6014 Add a list of for file uploads 2013-07-01 02:19:03 +02:00
Martin Feckie e410edddaf Make the FAQ fonts match rest of site 2013-06-30 19:57:35 +08:00