Commit Graph

1258 Commits

Author SHA1 Message Date
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 d3fe8f65a2 Add tooltip to avatars of people who liked a post 2013-07-08 14:00:47 -04:00
Neil Lalonde ad096ac2b7 More nav links on admin users list page 2013-07-08 12:44:14 -04:00
Neil Lalonde 9b0f63627b Add blocked users count to dashboard 2013-07-08 12:44:13 -04:00
Robin Ward cfc4dda9ff FIX: OpenGraph should feature the desired post, if found in the set. 2013-07-08 12:21:39 -04:00
Sam 4b437ccd2f Merge pull request #1148 from nterray/fix_html_entities_after_editing_topic_title
Add :title as attribute for basic_topic
2013-07-07 23:45:25 -07:00
Sam f42fc3be37 Merge pull request #1150 from mcwumbly/topic-likes
little tweaks to like counts in topic list view
2013-07-07 23:39:38 -07:00
Sam 5d6ce6d17f Merge pull request #1164 from ZogStriP/add-label-for-boolean-settings
add label for boolean setting
2013-07-07 22:00:09 -07:00
Sam 3dbb4ff9bc Reorder filters on user page and name them better (All, Topics, Posts, Responses) 2013-07-08 12:12:06 +10:00
Sam ae6ad734eb remove bad console.log 2013-07-08 12:11:20 +10:00
Sam d79aa917f1 add option suppress_reply_directly_above to stop suppressing the reply directly above
added a bunch of debugging information to help diagnose weird positioning issues
2013-07-08 11:13:45 +10:00
Régis Hanol f9b2738ae1 add label for boolean setting 2013-07-08 01:43:30 +02:00
Régis Hanol 45c227c81c fix column name in admin email logs 2013-07-06 22:29:16 +02: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
Nicolas Terray d5285e2d93 Add :title as attribute for basic_topic
When we update the <title> after editing a topic, we should use the raw
`topic.title` as `topic.fancy_title` may contains some htmlentities and
will be displayed as is in the browser tab.

This fix the following issue:

> Incorrect HTML title after editing title/category of topic
> http://meta.discourse.org/t/incorrect-html-title-after-editing-title-category-of-topic/8136
2013-07-05 23:22:52 +02:00
Robin Ward 2e7eee7ebd FIX: Clear state when you abandon. 2013-07-05 13:55:33 -04:00
Robin Ward d1a0b5dd44 FIX: Editing a title would not clear it out on your next edit. 2013-07-05 13:04:54 -04:00
Robin Ward 11bb9aafc7 Extra tests for composer 2013-07-05 13:04:49 -04:00
Neil Lalonde 84ce04dfa5 Use POST for send_activation_email action 2013-07-05 12:26:46 -04:00
Sam 363e1010c4 never double load the stream. 2013-07-05 21:23:01 +10:00
Régis Hanol 7c82d6d4d0 FIX: new users are allowed to upload images to your servers 2013-07-05 00:44:18 +02:00
Robin Ward e58d09a463 FIX: If the progress docked and you jumped to the top it could dissappear. 2013-07-04 17:35:20 -04:00
Robin Ward 2d821d1ff4 Clicking the #site-logo will refresh the latest list. 2013-07-04 17:31:06 -04:00
Robin Ward 4a3bc1fb43 More Javascript Tests + Fixtures. Also a rake task to crawl them. 2013-07-04 16:20:43 -04:00
Robin Ward 28c168fc2b FIX: Unintended edits with composer 2013-07-04 13:35:15 -04:00
Neil Lalonde c157c61d0e Use the same time ago formating in embedded post as other posts 2013-07-04 10:08:44 -04:00
Robin Ward ea11286ab6 Merge pull request #1131 from novemberkilo/feature/temporary-boost-trust-levels
Feature: Admin can modify user trust levels
2013-07-04 06:57:59 -07:00
Navin c065fad546 Refactor setting originalTrustLevel to model. 2013-07-04 13:01:01 +02: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
Navin b90a79d40a Move setting originalTrustLevel from a CP to setupController 2013-07-04 09:32:12 +02:00
Robin Ward 06e5615088 OOPS! Robin self-flaggelated. 2013-07-03 19:13:13 -04:00
Sam f08e9d8822 Merge pull request #1142 from ZogStriP/fix-can-no-longer-paste-image-in-chrome-post-editor
FIX: can no longer paste image in Chrome post editor
2013-07-03 16:08:51 -07:00
Robin Ward f5d6b41f91 FIX: posts weren't being marked as last read correctly 2013-07-03 19:03:11 -04:00
Régis Hanol 5a56af03bc FIX: can no longer paste image in Chrome post editor 2013-07-04 00:39:23 +02:00
Robin Ward 4331bba549 FIX: Quotes with text against them had the wrong spacing 2013-07-03 18:26:08 -04:00
Robin Ward 44cd5505d3 FIX: Repeatedly editing a post was popping up abandon dialog 2013-07-03 15:57:23 -04: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 ba0bd934ba FIX: Links to images in posts won't go through the Discoruse router 2013-07-03 14:06:34 -04:00
Robin Ward b0e10673a2 FIX: Small bugs with progress indicator 2013-07-03 12:31:00 -04:00
Robin Ward ffac22a143 FIX: Support underscores in autocomplete widget 2013-07-03 11:48:59 -04:00
Robin Ward c7ac11458b FIX: Removed some leftover posts references outside of the stream 2013-07-03 11:29:29 -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
Navin 3da37506da Back end - temporary boosting of trust levels 2013-07-03 10:30:40 +02:00
Navin f92d9cec47 Front end mods to use combobox for selecting user's trust level 2013-07-03 10:30:32 +02:00
Sam d3cfb56000 buggy is reply directly below 2013-07-03 16:48:55 +10: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
Neil Lalonde 0270ee0d98 Add classes to td's in suggested topics 2013-07-02 17:03:23 -04:00
Robin Ward 22e6b3f466 FIX: When moving topics to an existing topic, say it's an existing topic in the moderator message. 2013-07-02 15:47:15 -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
Neil Lalonde 075ed1ab53 Refactor user blocking code; hide the Block button in admin 2013-07-02 14:42:53 -04:00
Robin Ward 1308dbbef7 FIX: Quote popup broke in refactor 2013-07-02 13:36:38 -04:00
Robin Ward a04924deea FIX: Progress wasn't docking properly 2013-07-02 13:10:38 -04:00
Robin Ward 064efa1671 FIX: Progress bar updates faster 2013-07-02 12:46:49 -04:00
Robin Ward 5770879472 Refactor: Move Topic Details into better objects, identity map, tests, query string filters 2013-07-02 10:36:46 -04:00
Sam c3f64f99b3 fix up messed up routes 2013-07-02 15:21:26 +10:00
Jeff Atwood 68d98ec94e user titles are massively overstyled
LETS FIX IT
2013-07-01 17:19:15 -07:00
Sam 54fed60ecb firefox / concurrency fix, would not navigate correctly to a post.
posts can be in the DOM in a non-ready state between willInsertElement and didInsertElement

didInsertElement takes care of the scrolling, ignore analysing anything about that post until its properly inserted
2013-07-01 12:27:46 +10:00
Sam 8c053b8e83 Performance fix, avoid expensive animations, they slow down scrolling 2013-07-01 12:27:46 +10:00
Sam 158488a820 Merge pull request #1115 from mfeckie/stop-faqs-looking-hideous
Make the FAQ fonts match rest of site
2013-06-30 19:26:44 -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
Régis Hanol 31bf1c4b2e FIX: can't drag selected text 2013-06-28 23:10:39 +02:00
Neil Lalonde 2d6118297d Changes to tiny date format to remove mon and show short format dates instead 2013-06-28 13:10:04 -04:00
Sam 87f7bd921b minor tweak for name splitter (split on number) 2013-06-28 16:15:13 +10:00
Sam e63bfd2f4c improve the breakUp user name algorithm, add some tests 2013-06-28 13:56:38 +10:00
Jeff Atwood 40c9014634 make flag reply reply-ier 2013-06-27 16:01:48 -07:00
Neil Lalonde 948fc62b4a Handle configurable routes for statics in static_controller.js. Make it better when we can use ember's new async routing. 2013-06-27 13:01:12 -04:00
Neil Lalonde 94b8286819 Configurable FAQ url 2013-06-27 12:10:43 -04:00
Sam 1dd6699bf2 fix jshint 2013-06-27 17:19:11 +10:00
Sam 6145e99baa navigate to message fixed, changed to button
added spec to catch this regression in future
2013-06-27 16:59:07 +10:00
Sam 87e9e9d437 fix broken link for admin user in flags 2013-06-27 16:59:07 +10:00
Sam 274d8cbc0b if the title is the same as the value for a number, do not display it 2013-06-27 16:59:07 +10:00
Régis Hanol 689b296204 FIX: urls in BBCode tags weren't working 2013-06-27 00:42:11 +02:00
Neil Lalonde 6b58713fa6 Fix title attributes on post info 2013-06-26 16:27:18 -04:00
Jeff Atwood a0031f2a0d minor style tweaks to flags layout 2013-06-26 12:10:07 -07:00
Neil Lalonde b1d0f30379 Fix AdminUser bulkApprove; add a way to approve a user without sending them the welcome email for cases when must_approve_users is enabled and there are existing users 2013-06-26 13:24:30 -04:00
Robin Ward 89f182899f Support for custom Privacy Policies 2013-06-26 10:59:36 -04:00
Sam 5a4279f2ab if for some reason user was nuked don't kill the old flag page 2013-06-26 18:05:15 +10:00
Sam 827830d7ea move each flag to its own row inside a nested table. 2013-06-26 17:01:58 +10:00
Sam 48d7a33157 Flag UI now displays deleted status for post/topic correctly on old flags
Commented out a spec that was failing in order random, with a TODO
2013-06-26 16:18:50 +10:00
Sam 148d2f2cd4 bug fixes 2013-06-26 16:00:17 +10:00
Régis Hanol d3eae56e71 soften the lightbox overlay 2013-06-26 02:44:20 +02:00
Neil Lalonde b2d300fe0b Add ability to give users a title. Show them under usernames beside posts. Needs love from a designer. 2013-06-25 18:39:20 -04:00
Robin Ward 62daeedf08 Merge pull request #1092 from ZogStriP/rolling-back-markdown-conversion-pipeline-order-changes
reverting changes to the markdown conversion pipeline order
2013-06-25 08:20:10 -07:00
Régis Hanol 573c4b41f0 reverting changes to the markdown conversion pipeline order 2013-06-25 17:13:41 +02:00
Neil Lalonde 8ee00b4d5e Make the reply-on-which-topic modal bigger 2013-06-25 10:50:36 -04:00
Sam 4c51f36db2 was dropping off the last key when inviting a user by email. 2013-06-25 17:53:12 +10:00
Sam 1106eb9902 correct the category chooser to properly convert any html in category descriptions to text 2013-06-25 17:22:56 +10:00
Jeff Atwood 1ac7c28680 add method='post' to JS injected login form 2013-06-24 21:42:08 -07:00
Neil Lalonde 008f3b4785 Use tiny date format on posts 2013-06-24 18:46:58 -04:00
Jeff Atwood d9a8419d68 Merge pull request #1087 from ZogStriP/fix-posts-rebake
Fix posts rebake
2013-06-24 15:32:14 -07:00
Régis Hanol 3d2ef18bb7 move BBCode formating before the markdown conversion 2013-06-24 22:25:08 +02:00
Neil Lalonde e12dff2c31 New bootbox renders all the buttons backwards. :< 2013-06-24 15:29:58 -04:00
Neil Lalonde c79ab3fc2e Change modal that asks which topic you want to reply in; upgrade bootbox.js 2013-06-24 15:01:07 -04:00
Robin Ward 1b8c9d2efd Merge pull request #1077 from jamesaanderson/jump-to-last-post-in-best-of-mode-fix
Jump to last post in "Best of" mode fix
2013-06-24 06:26:44 -07:00
Jeff Atwood ab74bbfc8e we use wrench for admin not cog
NO WIRE COAT HANGERS!! NO WIIIIREEE COOAATT HANNGGERSS
2013-06-24 01:22:40 -07:00
James Anderson c6113f6701 Jump to last post in "Best of" mode fix
http://meta.discourse.org/t/jump-to-last-post-does-not-work-in-best-of-mode/7626/
2013-06-23 12:12:37 -07:00
Sam 47fd1c5228 more left over code removed 2013-06-23 15:33:35 +10:00
Sam 25bb8cf382 remove dead uncalled code 2013-06-23 15:28:38 +10:00
James A. Anderson 9c617d051e Correctly resize big images in preview
http://meta.discourse.org/t/correctly-resize-big-images-in-preview/4426/4
2013-06-21 18:13:52 -04:00
Jeff Atwood 028af5fec6 move top H1 sizing CSS rule down for precedence 2013-06-21 11:31:00 -07:00
Robin Ward 82c21868f3 Moved JSHint into Qunit suite. It's much harder to forget about now! 2013-06-21 14:07:11 -04:00
Régis Hanol 787555431c add lightbox overlay 2013-06-21 18:30:57 +02:00
Robin Ward bb908d5913 Email parsing uses Traditional Markdown Linebreaks by default. Added JS tests for line breaks. 2013-06-21 11:37:26 -04:00
Robin Ward 601c35fc58 Merge pull request #1067 from adkron/feature/supress_to_suppress
Correct spelling of suppress
2013-06-21 07:08:12 -07:00
Jeff Atwood bcf54be780 incorrect nesting of #each on /admin/flags 2013-06-21 00:40:20 -07:00
Jeff Atwood a9c251e71a restructure /admin/flags rows a bit 2013-06-21 00:29:54 -07:00
Jeff Atwood 6de1e16595 add icons to the flag action buttons 2013-06-21 00:12:17 -07:00
Amos L King 777e8c2012 Correct spelling of suppress
supress => suppress

Amos King @adkron <amos.l.king@gmail.com>
2013-06-20 23:44:27 -05:00
Régis Hanol da6f627c2f add background color on suggested topics list header 2013-06-20 23:22:46 +02:00
Neil Lalonde 42564c9ce7 Mods can edit categories 2013-06-20 15:09:31 -04:00
Robin Ward 3257bef387 Category List and Topic View Integration Test 2013-06-20 15:02:26 -04:00
Jeff Atwood 6a9a294b09 add back dynamic h1 sizing, but ONLY top title 2013-06-20 11:39:58 -07:00
Robin Ward d78898443d Oops: Forgot debugging information in scrolling handlers 2013-06-20 14:32:22 -04:00
Robin Ward a8b5716421 FIX: Coudln't scroll while on Qunit page due to browser bindings 2013-06-20 14:29:59 -04:00
Robin Ward cc90939aa8 Merge pull request #1056 from cezarcp/text_logo
Allow to use a text logo when logo_url setting is set to an empty value
2013-06-20 10:00:47 -07:00
Neil Lalonde 88a9e13510 Don't create globals in i18n.js 2013-06-20 12:47:50 -04:00
Neil Lalonde 94853f0295 Fix length check of pm body; refactor composer length and title length validation 2013-06-20 12:33:34 -04:00
Cezar 132b0498ed added a conditional that checks if the logo_url setting is empty. In that case, the logoHTML function returns a header tag with the site_title as its content 2013-06-20 12:28:52 -03:00
Jeff Atwood a546472775 remove extra box around TH on topic lists
this is mostly to make /categories less visually noisy
2013-06-20 01:39:32 -07:00
Sam cb1b956ac2 we need overflow auto on code blocks 2013-06-20 17:46:18 +10:00
Sam 08df4c41cc Merge branch 'master' of github.com:discourse/discourse 2013-06-20 17:42:29 +10:00
Sam 4a8a663a67 flagging workflow changes per http://meta.discourse.org/t/we-need-an-archive-flag-notification-button/7450 2013-06-20 17:42:15 +10:00
Jeff Atwood 6424a3d3e1 remove max-width on h1, seems unnecessary? 2013-06-19 16:31:18 -07:00
Jeff Atwood da582fc202 switch bookmark from yellow to blue 2013-06-19 16:01:39 -07:00
Neil Lalonde 8b9b87f42e Remove extra padding at top of posts 2013-06-19 14:30:05 -04:00
Neil Lalonde 3e0f47705a Remove some extra padding on the right of post info 2013-06-19 13:35:44 -04:00
Sam 6491bda4ab fix the positioning for replies
fix stubs
2013-06-19 18:23:01 +10:00
Sam 6a9484155d oops forgot to reorder this 2013-06-19 17:04:34 +10:00
Sam 31bcabd5e1 minor UI fixes for site customisations 2013-06-19 15:18:22 +10:00
Sam e7d6b25998 shuffle around the topic metadata so we don't need absolute positioning 2013-06-19 14:44:36 +10:00
Neil Lalonde 66c18a0bec I missed one td that needs the activity class 2013-06-18 18:53:34 -04:00
Neil Lalonde 21efbc7d92 Edits link is same colour as date when at lowest heatmap level 2013-06-18 18:45:26 -04:00
Neil Lalonde b7efd0be50 Move post date and edits link to top right of content area 2013-06-18 17:35:37 -04:00
Neil Lalonde c9556b4bb8 Remove bookmark from top right of post; move its functionality to the post menu button 2013-06-18 17:35:37 -04:00
Robin Ward 60fce196c7 More Qunit tests including a CLI runner 2013-06-18 13:44:20 -04:00
Robin Ward 8e96299653 FIX: `Discourse.Presence` was broken on arrays. The flag button was showing for anonymous users. 2013-06-18 11:36:48 -04:00
Neil Lalonde 7544e231c5 Make edit category modal a little taller so scroll bar is not rendered 2013-06-18 11:00:20 -04:00
Sam 14e7bb4a08 improve style a tiny bit 2013-06-18 17:22:37 +10:00
Sam 80c42753e1 fix up find as you type for the invite into PM function
allow mods to remove users from a PM
2013-06-18 17:17:01 +10:00
Sam 7abb20928b Merge pull request #1033 from chrishunt/move-dynamic-favicon-to-user
Move 'dynamic favicon' setting to User preference
2013-06-17 17:31:02 -07:00
Neil Lalonde 014db4c2e9 Discourse.Site.instance now returns a singleton object; add js test for NavItem 2013-06-17 13:05:08 -04:00
Robin Ward 3c7eb3a4e8 FIX: null dates crashed the client app. `last_posted_at` was not updating properly on split topic. 2013-06-17 13:02:50 -04:00
Robin Ward c2d9d95237 FIX: Dates in the history window shouldn't wrap in spans 2013-06-17 11:56:50 -04:00
Robin Ward 797b99db7c Moved a bunch of tests to QUnit. Added basic `Discourse.Site` support to test suite. 2013-06-17 11:38:30 -04:00
Sam 2174c0d661 improve code highlight formatting, pre is still messed up though, it should wrap 2013-06-17 17:49:02 +10:00
Sam a15ab2a0a6 flag type summary 2013-06-17 17:15:56 +10:00
Sam 4714d31c01 fix scrolling while clicking up and down on search results 2013-06-17 16:23:03 +10:00
Sam 30df1b1815 fix positioning regression 2013-06-17 16:05:41 +10:00
Sam 8c7519df86 missing pluralization 2013-06-17 15:37:46 +10:00
Sam dd5cd1df4f Merge pull request #1037 from ZogStriP/imagineering
Imagineering
2013-06-16 22:01:10 -07:00
Sam f13f6adc0b cursor pointer should always be the case for <a> ... not being pointer is an exception 2013-06-17 13:43:30 +10:00
Sam 0052e78bfe render error when people attempt to save an invalid group name
hide controls when we showing an automatic group
2013-06-17 13:43:06 +10:00
Sam b97d186cb5 automatic groups should not allow you to muck with the listed users in the group 2013-06-17 12:54:25 +10:00
Sam 7c73140674 offsets for find as you type names for PMS and Groups were crazy, change it so it renders the autocomplete below. 2013-06-17 12:14:59 +10:00
Sam fe979b7299 correct suggested list trigger to perform all work AFTER it is debounced, avoids incorrect new/unread items 2013-06-17 12:00:06 +10:00
Régis Hanol 6ea91b4416 remove useless upload topic direct association 2013-06-17 02:49:33 +02:00
Chris Hunt d6069092b2 DRY up preference loading in Discourse.User#save 2013-06-15 00:05:55 -07:00
Chris Hunt 09d3800701 Move 'dynamic favicon' from Server to User pref 2013-06-14 23:58:24 -07:00
Sam ce82d18df5 fix unescaped string
improve tab "active" detection for categories
2013-06-15 15:45:22 +10:00
Neil Lalonde 06b7085287 Add classes to the th elements for everything in topic list too 2013-06-14 18:26:49 -04:00
Neil Lalonde 247ef08799 Add distinct classes to posts, likes, and views td elements in topic lists 2013-06-14 17:45:05 -04:00
Neil Lalonde 07e4cba281 Move the render replies button into the post-controls div with the other buttons 2013-06-14 17:38:43 -04:00
Neil Lalonde a650593f89 Add classes to all post menu buttons 2013-06-14 17:15:21 -04:00
Neil Lalonde 002d4b4e23 Fix for using non-ascii category name as a link in top_menu 2013-06-14 15:49:48 -04:00
Neil Lalonde f198c814a8 Add explanations for deactivate user and block user buttons in admin 2013-06-14 11:34:03 -04:00
Neil Lalonde f62c421c91 Render category descriptions differently on the categories page 2013-06-14 11:18:44 -04:00
Robin Ward 5193ddc72f Super basic test support for listing topics 2013-06-13 15:08:42 -04:00
Robin Ward cb6774a895 FIX: Impersonate was hidden when navigating to user details page in admin from list. 2013-06-13 13:47:31 -04:00
Robin Ward e29f4a3496 Work in Progress: Reply By Email:
- Add support classes and settings to enable reply by email
- Split out Email builder to be more OO, add many specs
2013-06-13 12:39:56 -04:00
Neil Lalonde 7f7ef29e42 Fix for message saying 'There are no more 29-category topics.' 2013-06-13 12:18:11 -04:00
Robin Ward 3f03ce3c8c Merge pull request #1018 from abbat/patch-1
pluralizationRules for Russian translation
2013-06-13 07:21:35 -07:00
Sam f7de9f17d5 refactor validators
add a new setting for min pm body length
use that setting for flags
scale entropy check down for pms
2013-06-13 18:18:43 +10:00
Sam 875ee62d45 we don't need these move events, they always get in the way of me profiling cause they flood the uis with event 2013-06-13 13:17:26 +10:00
Sam 28853177fd fix autoclose to work with jquery 1.9 and moment js 2013-06-13 12:03:44 +10:00
Neil Lalonde 2c68dd1c12 Put h3 footer messages inside the footer tag for easier styling 2013-06-12 13:02:48 -04:00
Anton Batenev 848bd01ecd pluralizationRules for Russian translation 2013-06-12 20:04:40 +04:00
Robin Ward a104c37d63 Experiment: QUnit for integration Ember integration tests 2013-06-12 11:56:59 -04:00
Neil Lalonde 8c888f424b Fix change username 2013-06-12 11:24:32 -04:00
Neil Lalonde 1a1115321d Remove a console.log 2013-06-12 10:45:07 -04:00
Neil Lalonde 5d7f22ed63 Include the latest class on the a tag in posters list 2013-06-12 10:45:07 -04:00
Robin Ward 1ecdd73a71 Merge pull request #1016 from abbat/master
Russian translation (draft)
2013-06-12 07:44:51 -07:00
Sam ae1f5b3de0 goodbye NaNy 2013-06-12 16:38:02 +10:00
Sam 2a43d70869 refactor 2013-06-12 16:00:43 +10:00
Sam 165751e71b compact is better 2013-06-12 15:47:58 +10:00
Sam d5b07464ea partial fix for suggested js error 2013-06-12 15:24:45 +10:00
Sam 201891f51f refactor and fix bug I introduced 2013-06-12 14:56:31 +10:00
Sam eca2931a63 double notification is not really something we need. 2013-06-12 14:14:15 +10:00
Anton Batenev f6060d5ff6 Russian translation (draft) 2013-06-12 06:58:16 +04:00
Sam 74041be23b bring back some instrumentation 2013-06-12 11:47:03 +10:00
Sam c1f6169b48 hidden and deleted state in user stream 2013-06-12 11:14:08 +10:00
Sam 6bf2f15610 use lodash cause we like lodash (faster and we can remove templating easily) 2013-06-12 10:23:47 +10:00
Sam 334194ef82 Merge pull request #1013 from ZogStriP/replaced-lightbox-with-magnific-popup
replaced colorbox with magnific popup lightbox
2013-06-11 16:58:59 -07:00
Chris Hunt 48ee32f23e Get value for each property in i18n helper 2013-06-11 16:42:12 -07:00
Régis Hanol ba3d07ddcb replaced colorbox with magnific popup lightbox 2013-06-12 00:32:48 +02:00
Robin Ward bddc9dd4b8 FIX: Replace modal with an empty view when closed. Fixes the bug where you'd edit a category, close
and then click edit again.
2013-06-11 16:41:09 -04:00
Neil Lalonde a53f958c78 Fix error when trying to edit a category with empty slug 2013-06-11 15:43:07 -04:00
Neil Lalonde 811a0df68b Make s3 region site setting a drop down 2013-06-11 14:24:04 -04:00