Commit graph

6778 commits

Author SHA1 Message Date
Robin Ward
704f1bf80b Merge pull request #1889 from et/remove-invalid-comment
Remove invalid comment.
2014-01-31 14:26:37 -08:00
Robin Ward
45f19dbbf6 Merge pull request #1891 from codedinc/better-pill
Improve bluepill sample config
2014-01-31 14:25:57 -08:00
macournoyer
9afe262942 Improve bluepill sample config.
Add stop_command to use `thin stop`.
Fix stdout & stderr being redirected to the wrong log file.
Rename PID file name to use a dash (like the log file).
2014-01-31 16:09:35 -05:00
Neil Lalonde
3a6c3ee65d Add two rake tasks: db:rebuild_indexes and import:remove_backup 2014-01-31 15:30:47 -05:00
Neil Lalonde
e6096b4524 Revert "Try secure: true again" It's definitely broken 2014-01-31 15:02:57 -05:00
Neil Lalonde
ad34a297fd Try secure: true again 2014-01-31 14:17:14 -05:00
Vikhyat Korrapati
daa14cda40 ignore exclude_category from the menu if we are trying to view the category. 2014-01-31 22:35:19 +05:30
Eric Thomas
bc32a825e2 Remove invalid comment.
This was added in 1076aa50a8 when
ember-rails was installed from a revision number. This was changed to
use the latest gem release in ad6705cca7
2014-01-31 08:21:32 -07:00
Régis Hanol
ae401f0dc7 BUGFIX: JSON requests don't exclude categories from filters 2014-01-31 14:36:00 +01:00
Régis Hanol
59253c937e Merge pull request #1888 from velesin/search_integration_tests
Adds JS integration tests for search
2014-01-31 03:39:55 -08:00
Wojciech Zawistowski
73253ce32e Adds JS integration tests for search 2014-01-31 01:53:08 -05:00
Sam
51c06dea03 BUGFIX: hidden posts not absent from context 2014-01-31 16:37:40 +11:00
Sam
d83548964c BUGFIX: invited to pm email was using wrong key 2014-01-31 16:37:24 +11:00
Sam
8a15e89d9d better var names 2014-01-31 16:37:05 +11:00
Sam
44dc578ff9 FEATURE: task for global rewrite, used post migration to multisite 2014-01-31 14:53:25 +11:00
Sam
c555538db4 BUGFIX: stop testing on 2.1 it segfaults
As much I love Ruby 2.1 we can not test it till segfaults are fixed
2014-01-31 12:42:04 +11:00
Sam
b33faa85c0 BUGFIX: raise on fail 2014-01-31 12:23:37 +11:00
Sam
4825bf7e02 REFACTOR: clean up mechanism 2014-01-31 11:40:25 +11:00
Sam
9fc3a335cc BUGFIX: don't leak out a transaction if fails 2014-01-31 11:38:33 +11:00
Neil Lalonde
f71c8bb533 Revert "Add secure flag to cookie" 2014-01-30 18:53:48 -05:00
Neil Lalonde
4e158b2316 Add secure flag to cookie 2014-01-30 17:07:08 -05:00
Robin Ward
fc36a87e72 FIX: Invalid ruby code for universal google analytics 2014-01-30 15:45:24 -05:00
Robin Ward
f5019be477 Support for a /last route to go to the last post in a topic. 2014-01-30 15:24:04 -05:00
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