Commit graph

4889 commits

Author SHA1 Message Date
Sam
4cc1b88d91 Merge branch 'scroll_work' 2013-03-24 17:31:10 -07:00
Sam
988a712c77 correct multisite functionality for omniauth 2013-03-24 17:21:18 -07:00
Sam
deb603f41c Merge pull request #547 from kid0m4n/convert-ruby-1-9-syntax
Convert a lot of :a => b to a: b and bring peace to the world
2013-03-24 16:43:17 -07:00
Karan Misra
5dfb04e4b3 Convert a lot of :a => b to a: b and bring peace to the world 2013-03-25 05:07:36 +05:30
Sam
36a069488e Merge pull request #492 from sbauch/email-whitelist
added email whitelist SiteSetting feature to replicate email blacklist S...
2013-03-24 16:35:24 -07:00
Sam
ca997721b1 Merge pull request #532 from kubabrecka/fix_duplicate_tokens
fix duplicate auth_token in development database images
2013-03-24 16:32:48 -07:00
Sam
b1d1ab7d2b Merge pull request #559 from ZogStriP/fix-exception-when-wrong-resource-type-in-url
[fixes #391] exception when wrong resource type in URL
2013-03-24 16:16:34 -07:00
Régis Hanol
0da8f35659 [fixes #391] exception when wrong resource type in URL 2013-03-24 22:25:24 +01:00
Neil Lalonde
ff3028de07 Fix a typo and add a step to DEVELOPER-ADVANCED.md 2013-03-24 16:46:28 -04:00
Robin Ward
3cb729df21 Merge pull request #546 from ZogStriP/improve-i18n-spec-speed
prevent double work in the i18n integrity specs
2013-03-24 08:28:04 -07:00
Robin Ward
5b9ff91e88 Merge pull request #553 from buddhamagnet/issue-352-missing-template
Add render nothing to refresh_browsers method
2013-03-24 08:27:18 -07:00
Robin Ward
1a52150525 Merge pull request #554 from ZogStriP/update-vagrant-guide
added GIT dependency to VAGRANT guide
2013-03-24 08:26:46 -07:00
Jeff Atwood
6689f72dfd first-child removes whitespace from top of posts
MUST REMOVE SCRIPT METAMORPH FROM COOKED FOR THIS TO WORK!
2013-03-24 03:03:46 -07:00
Jeff Atwood
a001232ff3 move h1-h6 margins into topic-body 2013-03-24 02:26:54 -07:00
Jeff Atwood
a7dfcc54e8 fix h4 style issue on topic map 2013-03-24 02:07:37 -07:00
Jeff Atwood
85c0a8e396 margin tweak no longer necessary 2013-03-24 02:01:07 -07:00
Jeff Atwood
e0a119ba36 remove a TON of unused bootstrap classes 2013-03-24 01:44:42 -07:00
Jeff Atwood
0c8a803144 fix the CSS problem with paras under headings 2013-03-24 00:49:42 -07:00
Jeff Atwood
f14cf4c97e reduce read time required for basic user to 15m 2013-03-23 23:52:34 -07:00
Jeff Atwood
f10eafe2e1 Merge pull request #555 from ZogStriP/fix-email-notification-for-different-user-being-mentionned
FIX: Email notification for different user being mentioned
2013-03-23 18:07:59 -07:00
Régis Hanol
7d43058d20 FIX: Email notification for different user being mentioned 2013-03-24 01:57:00 +01:00
Régis Hanol
27d2645595 added GIT dependency to VAGRANT guide 2013-03-23 23:26:17 +01:00
buddhamagnet
baef69d08c add render nothing to refresh_browsers method 2013-03-23 21:37:37 +00:00
Robin Ward
81c099a37c Merge pull request #551 from kubabrecka/cs_update
cs translation update
2013-03-23 13:57:43 -07:00
Robin Ward
1a80412b43 Merge pull request #552 from kubabrecka/extract_strings_reports
extract hardcoded strings from admin reports
2013-03-23 13:56:23 -07:00
Kuba Brecka
274d665f35 extract hardcoded strings from admin reports 2013-03-23 18:06:28 +01:00
Kuba Brecka
e38565ed1d cs translation update 2013-03-23 17:52:45 +01:00
Kuba Brecka
0e27af8473 implement MemInfo.mem_total on Mac OS X 2013-03-23 16:57:47 +01:00
Robin Ward
030ecfaa71 Fix bug where new posts wouldn't load after hitting the bottom if you'd filtered 2013-03-23 11:18:38 -04:00
Robin Ward
842760e50e Bump up best of to top 20% 2013-03-23 11:14:07 -04:00
nverba
0c7579ec9f Update Sidekiq and config 2013-03-23 14:49:50 +00:00
Régis Hanol
c98d58378c prevent double work in the i18n integrity specs 2013-03-23 15:49:31 +01:00
Robin Ward
cb9106c3a7 Merge pull request #535 from ZogStriP/keep-french-l10n-up-to-date-2013-03-22
keep French l10n up to date [ci skip]
2013-03-23 07:38:03 -07:00
Robin Ward
3d210f143b Merge pull request #538 from kubabrecka/i18n_spec
adding i18n integrity check for valid YAML and valid content
2013-03-23 07:37:35 -07:00
Robin Ward
38d00767e6 Merge pull request #541 from kubabrecka/extract_string
extract hardcoded string into locales
2013-03-23 07:35:24 -07:00
Robin Ward
7642f56e35 Merge pull request #542 from kubabrecka/translation_status2
translation status script, take 2
2013-03-23 07:34:32 -07:00
Robin Ward
6eba6ad520 Merge pull request #544 from kid0m4n/fix-formatting-1
topic_poster.rb: Fix formatting of the attributes return value
2013-03-23 07:33:32 -07:00
Karan Misra
3f27ffca9f topic_poster.rb: Fix formatting of the attributes return value 2013-03-23 19:09:01 +05:30
Kuba Brecka
2d405be467 translation status script, take 2 2013-03-23 12:14:59 +01:00
Sam
7b6f54a3db Merge pull request #540 from kubabrecka/remove_gitkeep
remove unnecessary .gitkeep files
2013-03-23 03:26:17 -07:00
Kuba Brecka
5de0d85595 extract hardcoded string into locales 2013-03-23 11:24:04 +01:00
Sam
bceb124da6 correct line endings 2013-03-23 03:19:26 -07:00
Sam
40b2f0f7d9 update better errors
allow me to pass a special IP address in dev mode so I can debug ( set TRUSTED_IP )
2013-03-23 03:16:49 -07:00
Jeff Atwood
38285b6219 for PMs, switch to envelope glyph instead of lock 2013-03-23 02:46:50 -07:00
Kuba Brecka
4424328bff remove unnecessary .gitkeep files 2013-03-23 10:45:40 +01:00
Kuba Brecka
624649ddc2 adding i18n integrity check for valid YAML and valid content 2013-03-23 08:57:31 +01:00
Sam
ae2cfa325c so subtle ... 2013-03-22 20:28:39 -07:00
Sam
35a9051f56 cleanup 2013-03-22 20:18:10 -07:00
Sam
4907d162ef Merge pull request #534 from kubabrecka/cs_update
update cs translation
2013-03-22 19:28:50 -07:00
Sam
c20aa07725 Merge pull request #536 from nverba/heroku-doc
Added mandrill email example and Gemfile step to HEROKU.md
2013-03-22 19:28:01 -07:00