Commit Graph

1442 Commits

Author SHA1 Message Date
Robin Ward b54054c1d3 No idea why these tests weren't failing for me in guard when I pushed last time. Fixed! 2013-04-01 14:54:53 -04:00
Robin Ward 4e6b62b1f5 Much faster development mode reloading. 2013-04-01 14:32:24 -04:00
Robin Ward 1e6f8dc93a Include uncategorized pinned topics on 'Hot' 2013-04-01 13:49:35 -04:00
Robin Ward 79c986dd92 Fix issue with duplicate slugs 2013-04-01 12:26:51 -04:00
Robin Ward e4d190d856 XSS fix for category descriptions 2013-04-01 12:01:27 -04:00
Robin Ward 4c5ab8d688 Update Discourse to Ember 1.0 RC2 2013-04-01 11:26:24 -04:00
Neil Lalonde 083ab0465c re issue #603: Better instructions showing that code is at /vagrant in vagrant image 2013-04-01 10:52:49 -04:00
Robin Ward f429e95d4e Merge pull request #601 from kubabrecka/split_multiple_pluralization
split i18n strings where there are 2 pluralizable variables
2013-04-01 07:49:05 -07:00
Robin Ward 0fc86a9869 Merge pull request #605 from kubabrecka/i18n_pluralization
implement pluralization for server-side and js
2013-04-01 07:48:10 -07:00
Neil Lalonde 68710be564 Merge pull request #610 from PragTob/ReportsRemoveDuplication
Battling code duplication in the Report class
2013-04-01 07:39:44 -07:00
Robin Ward f9ea1a448d Merge pull request #600 from kubabrecka/consistent_topic_count
make sure Category.topic_count is consistent with week/year stats
2013-04-01 07:37:07 -07:00
Robin Ward f8931d371c Merge pull request #609 from katiefenn/docked_topic_progress_bug
Topic progress does change its X coordinate when switching between static and float views
2013-04-01 07:31:00 -07:00
Robin Ward 8f518a2496 Merge pull request #604 from wpp/refactor_suggest_username
Improve suggest_username method in user class
2013-04-01 07:25:27 -07:00
Robin Ward b61907fbf3 Merge pull request #593 from ZogStriP/get-quote-reply-button-working-on-ios
Get the "quote reply" button working on iOS
2013-04-01 07:20:49 -07:00
Robin Ward 75d5049c0a Merge pull request #606 from ZogStriP/better-client-side-upload
improved images upload on the client side
2013-04-01 07:11:26 -07:00
Robin Ward 865cf011a2 Merge pull request #561 from ZogStriP/fix-quote-reply-gets-in-the-way
FIX: "Quote Reply" button gets in the way
2013-04-01 07:04:46 -07:00
Tobias Pfeiffer 3324f0f2d2 Battling code duplication in the Report class
* the reports mainly followed the same structure but with
  different classes, so I took the code and a class as its
  parameter
* the method on which reports.data is generated may change
  but mostly is count_per_day so made that optional
* grouped the refactored methods to the top, some unrefactored
  methods remain but those are a bit harder to refactor, and not
  as reusable so I'd like to get this through first
* Overall I believe this patch enhances maintainability :-)
2013-04-01 15:26:58 +02:00
katiefenn 2a18c9c600 Topic progress does change its X coordinate when switching between static and float views 2013-04-01 11:50:01 +01:00
Sam dce2847b4f Merge pull request #597 from ZogStriP/fix-s3-image-upload
FIX: S3 image upload
2013-04-01 03:12:58 -07:00
Sam 128bba302f Merge pull request #588 from mark-rushakoff/admin-title-tooltip
Add admin title to trophy tooltip in admin users list
2013-04-01 03:11:37 -07:00
Sam 7043ab906f Merge pull request #602 from knoxmic/master
FIX: Autocomplete, missing charcode for correct term
2013-03-31 23:52:02 -07:00
Régis Hanol 72989dca7c improved images upload on the client side 2013-04-01 03:19:21 +02:00
Kuba Brecka af0a772629 implement pluralization for server-side and js 2013-03-31 19:55:02 +02:00
Philipp Weissensteiner c34f476b31 Improve suggest_username method in user.rb
The suggest_username method showed up on codeclimate
so I thought I'd give it some love and make it more readable.
In the process removed trailing whitespaces and had to fix a
terrible spelling error :)
2013-03-31 19:01:11 +02:00
Robin Ward b99befc5c2 Merge pull request #598 from kubabrecka/html_title
let <title> contain site name instead of just "Discourse"
2013-03-31 07:49:20 -07:00
Robin Ward 876493bd31 Merge pull request #595 from nverba/patch-1
Added Autoscaler guide to advanced heroku deployment
2013-03-31 07:47:50 -07:00
knoxmic 182f794466 fix autocomplete charcode '0' and 'z' 2013-03-31 16:00:21 +02:00
Kuba Brecka 1c50c99e9a split i18n strings where there are 2 pluralizable variables 2013-03-31 14:20:02 +02:00
Kuba Brecka d50b5e1fd8 make sure Category.topic_count is consistent with week/year stats 2013-03-31 13:22:05 +02:00
Kuba Brecka db56d2bc97 let <title> contain site name instead of just "Discourse" 2013-03-30 23:16:59 +01:00
Robin Ward 5bf3a0eaf3 Merge pull request #591 from potthast/german-l10n
Updated German l10n.
2013-03-30 12:11:25 -07:00
Robin Ward 9288be750f Merge pull request #594 from kubabrecka/cs_update22
update cs translation
2013-03-30 12:10:43 -07:00
Robin Ward 8d20c65d6b Merge pull request #596 from ZogStriP/keep-french-l10n-up-to-date-2013-03-30
keep French l10n up to date
2013-03-30 12:10:13 -07:00
Neil Lalonde 92aa0f45d2 Show trends on some dashboard numbers 2013-03-30 14:07:35 -04:00
Régis Hanol 0aff5042e5 FIX: S3 image upload 2013-03-30 17:56:25 +01:00
Régis Hanol f5567c10e3 keep French l10n up to date 2013-03-30 16:25:08 +01:00
nverba e437147add Added Autoscaler guide to advanced heroku deployment
This was the proposed change to add an optional step for including and configuring the Autoscaler Gem in the HEROKU.md doc. I've included a pastable version of the Sidekiq initializer file that only adds the autoscaler middleware in production.
2013-03-30 13:21:53 +00:00
Kuba Brecka 1349b24c4a update cs translation 2013-03-30 13:43:06 +01:00
Régis Hanol b7a7d8b006 Get the "quote reply" button working on iOS 2013-03-30 02:52:52 +01:00
Shawn Holmes 853c13f705 Update VAGRANT.md
Added link to Vagrant download page
2013-03-29 15:17:50 -06:00
Neil Lalonde d0f810dee5 Don't request list of problems from server as often if there weren't any problems 2013-03-29 16:05:29 -04:00
Neil Lalonde 25073e873f Fetch the list of problems more frequently on the admin dashboard 2013-03-29 15:48:26 -04:00
Régis Hanol 5ea35ff393 FIX: "Quote Reply" button gets in the way 2013-03-29 19:34:45 +01:00
Martin Potthast 328b31d10e Updated German l10n. 2013-03-29 19:07:34 +01:00
Robin Ward df85201298 Adjust hot to include more recent topics 2013-03-29 13:33:31 -04:00
Neil Lalonde 436515ec6c Dashboard checks for facebook, twitter, and github configs 2013-03-29 13:32:40 -04:00
Robin Ward 92eaa69df9 Merge pull request #589 from goshakkk/user-admin-scope
Create the User.admins and User.moderators scopes
2013-03-29 10:06:28 -07:00
Robin Ward 83ab544e0c Merge pull request #580 from kubabrecka/typo_fix0
typo fix in client.en.yml
2013-03-29 10:05:28 -07:00
Robin Ward de8f525701 Merge pull request #582 from kubabrecka/add_es_js
adding "es" translation js file
2013-03-29 10:04:24 -07:00
Robin Ward 9f16309904 Merge pull request #581 from kubabrecka/cs_update21
update cs translation
2013-03-29 10:04:07 -07:00