Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,253 Commits 214 Branches 500 Tags 886 MiB
Commit Graph

6253 Commits

Author SHA1 Message Date
Jeff Atwood 5d865f0a1d Merge pull request #1886 from schmatz/patch-1 
Added note about db:migrate step failure and improved formatting
 2014-01-30 11:47:25 -08:00
Robin Ward 2acb517f44 Revert "Merge pull request #1878 from balinterdi/patch-2" 
This reverts commit bfddc5a191, reversing
changes made to 8f1e754bf2.
 2014-01-30 14:32:41 -05:00
Michael Schmatz 9222399c30 Changed backup filename to match 2014-01-30 11:04:24 -08:00
Michael Schmatz 8eedfd6c70 Added note about db:migrate step failure and improved formatting 2014-01-30 10:55:43 -08:00
Robin Ward bfddc5a191 Merge pull request #1878 from balinterdi/patch-2 
Simplify usage of unbound i18n helper
 2014-01-30 10:46:21 -08:00
Robin Ward 8f1e754bf2 Merge pull request #1883 from velesin/ember_integration_tests_jshint_fix 
Modifies JSHint config to enable new Ember e2e tests syntax
 2014-01-30 10:45:17 -08:00
Robin Ward b4fef88412 Merge pull request #1884 from velesin/search_controller_refactoring 
refactors Discourse.SearchController
 2014-01-30 10:44:53 -08:00
Robin Ward 6f23870327 Bulk close operation 2014-01-30 12:44:40 -05:00
Robin Ward e9664d5cfa Merge pull request #1885 from schmatz/master 
Fixed 'devloper' typo in quickstart config file
 2014-01-30 09:27:19 -08:00
Robin Ward 7564d9a20c Server side implementation for bulk editing categories 2014-01-30 11:44:29 -05:00
Robin Ward b315a5c28f Delegate bulk operations to a `TopicsBulkAction` object. 2014-01-30 11:44:29 -05:00
Robin Ward 0c73eb8ce1 Front end code is complete for changing categories of topics in bulk 2014-01-30 11:44:29 -05:00
Robin Ward 6ee266c7ee Modal for performing a bulk operation 2014-01-30 11:44:29 -05:00
Robin Ward 1696cde2ff Toggle button for bulk selection of topics 2014-01-30 11:44:29 -05:00
Michael Schmatz 9da657382c Fixed 'devloper' typo in quickstart config file 2014-01-30 08:35:07 -08:00
Jeff Atwood dc24226893 better help for category names, prefer 1 word 2014-01-30 01:31:35 -08:00
Sam ed45a1dce3 FEATURE: new scheduler so we can deprecate sidetiq 
This is a work in progress, should have it finished tomorrow.
 2014-01-30 16:21:38 +11:00
Sam 43ceaae7ba PERF: optimise featuring of topics and users 
Previously this would delete all features and recreate, causing
uneeded network traffic and db pain
 2014-01-30 10:32:20 +11:00
Neil Lalonde 29c3767b7f Don't need to show date in smaller font when MMM Y format 2014-01-29 17:10:39 -05:00
Neil Lalonde b5d0031105 Topic list dates formatting changes: use Dec '12 and Jan 21 2014-01-29 15:45:06 -05:00
Wojciech Zawistowski 5b897bc6a4 refactors Discourse.SearchController 2014-01-29 20:53:08 +01:00
Wojciech Zawistowski 015e5ae8a0 Modifies JSHint config to enable new Ember e2e tests syntax 2014-01-29 20:29:53 +01:00
Neil Lalonde 946e837542 Add twitter to Onebox.options 2014-01-29 14:14:07 -05:00
Neil Lalonde d343e9f360 Add DiscourseLocalOnebox 2014-01-29 14:14:07 -05:00
Robin Ward 30abc6b291 Appropriate Onebox style 2014-01-29 14:14:07 -05:00
Robin Ward e453bfa073 Work in progress: Swap out onebox code for onebox gem 2014-01-29 14:14:07 -05:00
Jeff Atwood a4e28eadd0 Merge pull request #1882 from awesomerobot/master 
making @mention background darker in blockquotes
 2014-01-29 10:17:48 -08:00
Neil Lalonde 6ea257d0b1 FIX: use actions in user_stream_view.js 2014-01-29 12:29:05 -05:00
Neil Lalonde c8bc9bd5db Show discourse logo as system user avatar 2014-01-29 12:29:05 -05:00
Robin Ward 9117470f27 REMOVE: `discourse_poll` has not worked for over a year now. Let's 
remove it.
 2014-01-29 12:00:21 -05:00
Robin Ward 2892153712 REMOVE: Get rid of the `hotness` control for good. 2014-01-29 11:54:34 -05:00
Kris Aubuchon a09dc916ee making @mention background darker in blockquotes 2014-01-29 09:43:24 -05:00
Régis Hanol 79b8269aa0 Merge pull request #1881 from frabrunelle/master 
remplacer conversation par discussion (French locale)
 2014-01-29 06:03:48 -08:00
Régis Hanol e6b4ba8ad6 BUGFIX: link to attachments when using S3 2014-01-29 12:31:44 +01:00
Francis Brunelle 94846f6a0a remplacer conversation par discussion (French locale) 2014-01-29 06:20:46 -05:00
Régis Hanol d0c55010aa BUGFIX: clicking on links to the same domain was broken 2014-01-29 11:31:36 +01:00
Jeff Atwood ecbcbf0a44 Merge pull request #1880 from awesomerobot/master 
fixing some gutter link spacing that was bothering me
 2014-01-28 22:23:24 -08:00
Sam 0a0ed44248 BUGFIX: avoid trasactions in test 2014-01-29 17:08:42 +11:00
Sam cce5fb3303 BUGFIXES: improved performance of import an export 
we no longer generate the entire dump in memory, instead we generate one table at a time
added some basic progress
 2014-01-29 16:49:01 +11:00
Kris Aubuchon 8cc2167b9b fixing some gutter link spacing that was bothering me 2014-01-28 21:39:09 -05:00
Sam 538a83e619 Merge pull request #1879 from mcneel/master 
Trying again to merge changes to Chinese localizations done by Kelvin
 2014-01-28 15:21:44 -08:00
Neil Lalonde 947d896a8c FIX: when filling suggested topic list, don't try to add topics that have already been added, and topics that are category descriptions 2014-01-28 18:15:46 -05:00
sbaer 644c17d260 Trying again to merge changes to Chinese localizations done by Kelvin 2014-01-28 15:11:23 -08:00
Robin Ward 42117c684f Remove `console` from .jshintrc. If we need our app to log, use 
`Ember.Logger` instead.
 2014-01-28 17:13:34 -05:00
Robin Ward 4626519cdc Use an `itemController` for topic lists. This will make bulk operations 
easier.
 2014-01-28 15:12:26 -05:00
Robin Ward 52ff68f74f REFACTOR: Change `didInsertElement` to `on('didInsertElement')` 2014-01-28 14:49:08 -05:00
Balint Erdi 8fb5fe75c8 Simplify usage of unbound i18n helper 2014-01-28 19:06:11 +01:00
Régis Hanol a00af3cfbd Merge pull request #1877 from frabrunelle/master 
minor corrections for French locale
 2014-01-28 05:32:58 -08:00
Francis Brunelle ca1695406b minor corrections for French locale 2014-01-28 07:27:14 -05:00
Régis Hanol 8ccf519db3 Mark features as experimental 
while we're fixing issues:

 - Keyboard shortcuts
 - Favcount
 2014-01-28 00:39:11 +01:00