Commit Graph

3503 Commits

Author SHA1 Message Date
Neil Lalonde 5b559d9631 Pinned uncategorized topics span the title and category column in topic lists 2014-02-06 14:38:04 -05:00
Neil Lalonde 113057bfa9 Comma needs to die 2014-02-06 11:57:45 -05:00
Régis Hanol 9b3740a7c6 Merge pull request #1909 from codedinc/shortenUrl-fix
Fix shortenUrl helper to not crash when URL doesn't include any "/".
2014-02-06 16:35:11 +01:00
macournoyer 8bf872e92e Fix shortenUrl helper to not crash when URL doesn't include any "/". 2014-02-06 10:12:38 -05:00
Régis Hanol c4cfd5a7fe BUGFIX: unbind the file uploader when closing the composer 2014-02-06 12:54:06 +01:00
Régis Hanol 58202baa62 BUGFIX: show the draft on top page 2014-02-06 11:39:43 +01:00
Régis Hanol a710773bb4 BUGFIX: do not override default browser keyboard shortcuts behavior 2014-02-06 11:07:33 +01:00
Régis Hanol 6d3c3a02cb Merge pull request #1900 from ballistiq/allow_user_activation_on_create
Whitelist :active param so that we can automatically create users that a...
2014-02-06 09:56:00 +01:00
Régis Hanol f2a75aaf26 Merge pull request #1908 from riking/docker-link
Extract version check in dashboard to own template
2014-02-06 09:54:03 +01:00
Jeff Atwood f2c017ac1a Merge pull request #1910 from awesomerobot/master
previous restricted badge fix broke restricted badges in titles, this fixes it
2014-02-05 22:26:59 -08:00
Kris Aubuchon 00e941ff07 previous restricted badge fix broke restricted badges in titles, this fixes it 2014-02-06 00:30:44 -05:00
Sam d132fd0609 add full-name class for styling 2014-02-06 15:53:49 +11:00
riking 7c12aeb848 Extract version check in dashboard to own template 2014-02-05 17:22:10 -08:00
Neil Lalonde 14018ec07c FIX: topic and post counts on /categories page should include sub-categories 2014-02-05 18:39:49 -05:00
Sam e1f293ad66 FEATURE: new scheduler
Removed sidetiq, introduced new scheduler

- add basic UI
- add schedule discover
- add scheduling in initializer
2014-02-06 10:26:16 +11:00
Sam 447816fe39 Merge pull request #1824 from riking/patch-2
Fix group matching SQL query
2014-02-06 08:07:13 +11:00
Sam 7ea2cee3aa Merge pull request #1898 from awesomerobot/master
removing :focus style until I figure out a better fix; also fixing restricted badge alignment
2014-02-06 08:03:34 +11:00
Robin Ward aff16f372b FIX: Show a nicer error when a user tries to access a category they
can't see.
2014-02-05 15:33:52 -05:00
Robin Ward 1dac3cfd64 API endpoint for retrieving the current user 2014-02-05 13:46:24 -05:00
Robin Ward af5254d3b4 FIX: Remove `canvas` tag. 2014-02-05 12:22:36 -05:00
Kris Aubuchon e42374d6f6 aligning content within restricted-badges 2014-02-04 21:52:48 -05:00
Kris Aubuchon 3ae7c14b85 Merge remote-tracking branch 'upstream/master' 2014-02-04 21:49:34 -05:00
Régis Hanol 759c18d9f5 FEATURE: HOME/END should always take you to the correct spot 2014-02-04 23:25:27 +01:00
Robin Ward 8adb08a9ca FIX: Don't allow `<button>` in posts either. 2014-02-04 16:29:00 -05:00
Leonard Teo c13aa8852b Whitelist :active param so that we can automatically create users that are active via API 2014-02-04 15:40:30 -05:00
Régis Hanol 4fb274fb9d BUGFIX: history link doesn't work on deleted posts 2014-02-04 20:05:50 +01:00
Robin Ward 36683ff1e3 FIX: Searching for spaces wouldn't stop spinning 2014-02-04 13:19:36 -05:00
Robin Ward abffcd9f94 FIX: Blacklist `<textarea>` 2014-02-04 12:48:33 -05:00
Robin Ward 359f03ca73 FIX: Topic drafts weren't showing up properly. 2014-02-04 12:11:19 -05:00
Kris Aubuchon 706ed270f6 removing :focus style until I figure out a better fix 2014-02-04 11:50:14 -05:00
Kris Aubuchon 2486050792 fixing :focus style 2014-02-04 11:49:22 -05:00
Neil Lalonde dc77e7e27c You must give a reason for suspending a user 2014-02-04 11:03:35 -05:00
Sam 612001aa74 BUGFIX: deleted categories would mess up watching/tracking prefs 2014-02-04 15:14:31 +11:00
Jeff Atwood 43c698282c Merge pull request #1895 from awesomerobot/master
adding basic :focus style back in
2014-02-03 19:37:14 -08:00
Sam 9bfe0e5a0e BUGFIX: anon had skewed column titles 2014-02-04 13:29:16 +11:00
Kris Aubuchon 3212af4746 adding basic :focus style back in - some tweaks still needed, but this makes tabbing through content functional 2014-02-03 20:58:23 -05:00
Sam 5267e5bea6 BUGFIX: emails sent from "2 replies" as opposed to correct user 2014-02-04 12:56:28 +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 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
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 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 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