Commit Graph

1976 Commits

Author SHA1 Message Date
Jeff Atwood b9be14101b remove margins from h3,h4 in onebox body 2013-04-01 21:23:47 -07:00
Sam 133ea0b8a0 no idea where this loading message came from but we don't seem to need it 2013-04-02 15:20:59 +11:00
Jeff Atwood 805e782845 forgot to sync untranslated languages 2013-04-01 21:15:17 -07:00
Jeff Atwood 91f9dc7267 clarify tracking: seeing counts ain't a notify 2013-04-01 21:13:38 -07:00
Sam 08af09cd7d don't pass notification email into to the default cause it freezes in a potentially incorrect value 2013-04-02 13:29:34 +11:00
Sam 6ac8911a4e critical bug, onion not whitelisted, how could this be 2013-04-02 12:11:03 +11:00
Sam 2cc6f1159c exact username match first 2013-04-02 11:58:03 +11:00
Robin Ward 2a6889c087 Removes repetitive `view.category` from the template 2013-04-01 20:56:04 -04:00
Sam 649491d85b Merge pull request #612 from PragTob/GitignoreRVMRC
Add .rvmrc to .gitignore but supply a sample file
2013-04-01 17:40:31 -07:00
Sam bb341a4aa4 Merge pull request #613 from ZogStriP/remove-console-log-in-composer-view
remove useless console.log
2013-04-01 17:39:43 -07:00
Sam f2f82ea83b Merge pull request #614 from ZogStriP/implemented-cancel-image-upload
users can now cancel image upload
2013-04-01 17:39:17 -07:00
Sam 190f7b4812 classes for logo big and small 2013-04-02 11:37:41 +11:00
Sam ade1f50f19 update pseudolocale, we really should do this in a post commit step 2013-04-02 11:23:20 +11:00
Sam e54c356dc2 Merge pull request #616 from kubabrecka/move_pseudolocale_script_into_rake
let's make the "script/generate-pseudolocalization.rb" a rake task
2013-04-01 17:21:03 -07:00
Sam 343dfaf503 Merge pull request #617 from kubabrecka/cs_pluralization_client
cs translation update - client.cs.yml correct pluralization
2013-04-01 17:20:36 -07:00
Sam ae32e3071c Merge pull request #618 from ZogStriP/keep-french-l10n-up-to-date-2013-04-01
keep French l10n up to date
2013-04-01 17:20:17 -07:00
Sam 3376ea5615 Merge pull request #619 from ZogStriP/fix-cannot-paste-text-in-composer
FIX: cannot paste text in composer
2013-04-01 17:19:49 -07:00
Sam 028d3bd19f remove problem chars from browser update 2013-04-02 11:07:41 +11:00
Régis Hanol 0cb8ea1426 FIX: cannot paste text in composer 2013-04-02 02:05:20 +02:00
Régis Hanol 7918bef7ff keep French l10n up to date 2013-04-02 01:09:08 +02:00
Sam f6ec8e01ec debug assets for debugging assets ... set to 1 in my .rvmrc 2013-04-02 09:50:00 +11:00
Sam 073125ac30 fast blank to latest 2013-04-02 09:28:26 +11:00
Sam a81b1476ca add fast blank 2013-04-02 09:25:21 +11:00
Robin Ward 61b5c0340e Convert all Ajax calls to use Discourse.ajax() 2013-04-01 18:09:23 -04:00
Neil Lalonde 5344ab2893 Remove weird characters from browser-update.js 2013-04-01 17:33:11 -04:00
Jeff Atwood 533936f3a2 increase max_mentions to 10 2013-04-01 14:31:07 -07:00
Kuba Brecka 01ed72d091 cs translation update - client.cs.yml correct pluralization 2013-04-01 23:21:17 +02:00
Kuba Brecka fd6c5c2068 let's make the "script/generate-pseudolocalization.rb" a rake task 2013-04-01 22:56:25 +02:00
Neil Lalonde acb2a18e8a Show a Please Upgrade message to people on unsupported browsers 2013-04-01 16:19:57 -04:00
Jeff Atwood 6aaaa55ced oops, left out a word 2013-04-01 12:57:22 -07:00
Jeff Atwood e1e2768412 improve Email Deliverability Test email 2013-04-01 12:55:32 -07:00
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
Régis Hanol cf9b5d1a3d users can now cancel image upload 2013-04-01 19:01:29 +02: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
Régis Hanol 54504d5b60 remove useless console.log 2013-04-01 17:33:06 +02:00
Robin Ward 4c5ab8d688 Update Discourse to Ember 1.0 RC2 2013-04-01 11:26:24 -04:00
Tobias Pfeiffer 6acbb3d434 Add .rvmrc to .gitignore but supply a sample file
* ignoring .rvmrc so people can feel to use their own and not
  accidentally commit it
* added a .rvmrc.sample file for people to get started
* fixes #608
* [ci skip]
2013-04-01 17:05:08 +02: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