Commit Graph

6554 Commits

Author SHA1 Message Date
Sam 5267e5bea6 BUGFIX: emails sent from "2 replies" as opposed to correct user 2014-02-04 12:56:28 +11:00
Sam 176bf41efd therubyracer now ships with my timeout fix, no need for a forked gem 2014-02-04 11:14:04 +11:00
Sam 1556548ff6 BUGFIX: JS errors could crash our process 2014-02-04 11:14:04 +11:00
Neil Lalonde 06cdb1f070 Remove keyboard shortcuts link from site map menu 2014-02-03 18:08:42 -05:00
Neil Lalonde fa3927d0f6 Add group icon to category badges in composer and edit topic title 2014-02-03 17:57:14 -05:00
Robin Ward 3bc821aff5 Don't list subcategories when creating a new category. 2014-02-03 16:26:51 -05:00
Neil Lalonde 1b66876c08 Show group icon in category badges if the category has restricted access 2014-02-03 15:28:41 -05:00
Robin Ward bf951689e8 FIX: Don't allow moving a category with children underneath another
category (creating grandchildren)
2014-02-03 15:09:35 -05:00
Robin Ward b9989dd24b Updates onebox 2014-02-03 12:16:42 -05:00
Robin Ward 9606ae5dcb FIX: search context was missing when searching inside a category 2014-02-03 11:38:11 -05:00
Robin Ward ea9ff108c5 Move updating title count to the view, to ensure the topic list is
visible when it happens.
2014-02-03 10:46:19 -05:00
Régis Hanol d2974c2a15 BUGFIX: proper handling of top_menu_items 2014-02-03 16:08:00 +01:00
Régis Hanol 632cd44c2f Fixed some JSHint warnings 2014-02-03 11:33:14 +01:00
Régis Hanol 659589e563 BUGFIX: make_list should only look for lists 2014-02-03 11:31:02 +01:00
Sam 458f6424ff Revert "BUGFIX: notifying on new topics when topic list is not visible"
Was causing load more topics not to show up

This reverts commit f7bf4b2dc3.
2014-02-03 19:23:07 +11:00
Sam d0a6dd88df FEATURE: exclude muted categories from the latest and new tabs 2014-02-03 16:05:49 +11:00
Sam f7bf4b2dc3 BUGFIX: notifying on new topics when topic list is not visible 2014-02-03 14:50:51 +11:00
Sam 6205240a56 minor style fix 2014-02-03 14:50:19 +11:00
Sam 60c5eb63ce FEATURE: collapse replies to topics
when you get two replies to a topic they are now collapsed as opposed to getting two notificatons.
2014-02-03 13:59:14 +11:00
Régis Hanol 854fdae7cd Merge pull request #1892 from vikhyat/plugin-tests
Add rake task for running plugin tests.
2014-02-02 08:09:12 -08:00
Régis Hanol 4ecd7e97be Merge pull request #1893 from jk779/german_translation
German Client Translation updated (client.de.yml)
2014-02-02 08:08:09 -08:00
Michael Berg fab72bcdbe German Translation updated (client.yml)
German Locale - starred
2014-02-02 15:47:57 +01:00
Vikhyat Korrapati 102352e205 Add rake task for running plugin tests. 2014-02-02 01:52:53 +05:30
Régis Hanol 5958e710c0 Merge pull request #1890 from vikhyat/hidden-category-fix
ignore exclude_category from the menu if we are trying to view the category
2014-01-31 20:54:16 -08:00
Robin Ward 0fca760126 FIX: Jump to bottom was broken by the `/last` path. 2014-01-31 17:55:40 -05:00
Robin Ward 3deb055110 Update onebox gem 2014-01-31 17:34:15 -05:00
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