Commit Graph

30842 Commits

Author SHA1 Message Date
Chris Baus 71984bf01a Update nginx.sample.conf 2013-03-02 12:53:42 -08:00
Robin Ward dfafadfe41 Merge pull request #327 from tms/name-changing
Change the name displayed in the header on profile update
2013-03-02 08:10:26 -08:00
Robin Ward 6c97e5ad09 Merge pull request #333 from goshakkk/refactor-incoming-link
Move IncomingLink callbacks into their own methods
2013-03-02 08:09:13 -08:00
Robin Ward a0218ffece Merge pull request #320 from jk779/secret_token
Get secret_token from ENV['SECRET_TOKEN'] (e.g. for Heroku)
2013-03-02 08:04:00 -08:00
Robin Ward 96ccc6816e Merge pull request #323 from ZogStriP/patch-3
trying to get jshint to work on travis
2013-03-02 08:03:14 -08:00
Robin Ward f2b4d4568c Merge pull request #325 from ZogStriP/patch-5
bumped rb-inotify gem version
2013-03-02 08:01:15 -08:00
Robin Ward 59b0299a27 Merge pull request #331 from goshakkk/enum-spec-valid
Make Enum#valid? specs test the right thing
2013-03-02 08:00:46 -08:00
Robin Ward e145a81809 Merge pull request #334 from kubabrecka/minor_tos_fixes
minox TOS HTML fixes
2013-03-02 07:58:51 -08:00
Robin Ward 9a7b29e608 Merge pull request #335 from jk779/ugly_test_output
Removed Strange Test-Output
2013-03-02 07:57:47 -08:00
Robin Ward 02e0cfd74c Merge pull request #336 from kubabrecka/cs_server_translation
server side of Czech language localization + update of client side + update of pseudo-localization
2013-03-02 07:55:49 -08:00
Kuba Brecka 821ad9f51d server side of Czech language localization + update of client side + update of pseudo-localization 2013-03-02 14:22:53 +01:00
Michael Berg 50dcaa0205 Removed Strange Test-Output 2013-03-02 12:23:40 +01:00
Kuba Brecka 77eafc62cb minox TOS HTML fixes 2013-03-02 10:56:11 +01:00
Gosha Arinich 5066682e7a move IncomingLink callbacks into their own methods 2013-03-02 12:33:29 +03:00
Gosha Arinich 28bc5a6c89 make Enum#valid? specs test the right thing 2013-03-02 10:40:32 +03:00
Michael Berg 5e95dfb1c9 Removing unnecessary Rails.env check 2013-03-02 05:58:05 +01:00
tms 66a7b3162f Change the name displayed in the header on profile update 2013-03-01 22:46:33 -05:00
Régis Hanol 505d8f565b bumped rb-inotify gem version
as per the recommendations given by guard
2013-03-02 02:18:40 +01:00
Régis Hanol fb17c451ce trying to get jshint to work on travis 2013-03-02 01:22:35 +01:00
Tijmen Brommet ba04e72a99 Fix weirdly indented code 2013-03-02 00:48:49 +01:00
Tijmen Brommet eaef66a423 Fix display host for onebox 2013-03-02 00:46:55 +01:00
Michael Berg de154f3ef1 Get secret_token from ENV['SECRET_TOKEN'] (e.g. for Heroku) 2013-03-01 23:55:49 +01:00
Robin Ward 9858beb6af Missed reference to `type` 2013-03-01 17:33:23 -05:00
Robin Ward d78a2b2b91 Removed unused `type` parameter in site settings. Remove hardcoded date reference in en.yml 2013-03-01 17:27:59 -05:00
Robin Ward 9a2588c46d Update SiteSettingExtension to use new Enum class 2013-03-01 17:21:13 -05:00
Robin Ward 5cf69baf56 Add specs for Enum class 2013-03-01 17:05:39 -05:00
Neil Lalonde 5c986be753 Send forum title and hostname along with version check 2013-03-01 16:02:06 -05:00
Gosha Arinich a1e462101d add basic coding style guidelines to CONTRIBUTING.md 2013-03-01 23:32:41 +03:00
Robin Ward 3901ddd153 Fix jshint issue with `[^]` in regexp. 2013-03-01 15:16:21 -05:00
Robin Ward d410f043a9 Merge pull request #290 from alxndr/category-rss
RSS for topics in a category
2013-03-01 12:01:26 -08:00
Dan Callahan 7c87359e02 Make Persona configurable 2013-03-01 14:00:56 -06:00
Dan Callahan 23d812a4ab Use AJAX for submitting Persona credentials.
Fixes issue with needing to unblock popups.
2013-03-01 14:00:56 -06:00
Dan Callahan ef8cf2f734 Add basic Persona functionality
1. No session integration yet, so automatic login/logout events are suppressed.

2. Popup blockers must be disabled: submits form to target="_blank"
2013-03-01 14:00:56 -06:00
Dan Callahan 81c545539e Add (ui-only) Persona button to login modal 2013-03-01 14:00:53 -06:00
Robin Ward 72cbb948b8 Fixes broken "From" header in Private Message emails. 2013-03-01 14:56:52 -05:00
Robin Ward 7c68224763 Merge pull request #309 from goshakkk/enums
Introduce Enum
2013-03-01 11:34:48 -08:00
Dan Callahan fd4d384dc1 Add Mozilla Persona Omniauth Gem and initializer 2013-03-01 13:29:47 -06:00
Robin Ward d2596c3c4c Remove unusued site_settings, show checkbox in UI for boolean values, remove restrict_access
boolean to avoid locking yourself out by setting access_password to empty string. Minor
UI tweaks.
2013-03-01 14:27:41 -05:00
Gosha Arinich 0c99dea153 introduce Enum 2013-03-01 21:16:36 +03:00
Alexander fd240c1967 RSS for topics in a category
Creates a new route for category RSS
2013-03-01 09:52:59 -08:00
Robin Ward 0c8c41b131 Merge pull request #287 from nverba/settings
fixed SiteSettings without defaults Type of Null
2013-03-01 08:46:18 -08:00
Robin Ward 25494529d2 Merge pull request #314 from kubabrecka/extract_strings2
extracting some more hardcoded strings
2013-03-01 08:36:46 -08:00
Kuba Brecka 9993e0e665 extracting some more hardcoded strings 2013-03-01 17:04:13 +01:00
Robin Ward b66b17bf19 Merge pull request #300 from goshakkk/cleanup
Minor cleanup, using AR querying DSL over raw SQL in some places
2013-03-01 07:52:34 -08:00
Robin Ward 27ba923fd4 Merge pull request #307 from kubabrecka/html_syntax_fixes
some minor HTML syntax fixes
2013-03-01 07:39:03 -08:00
Robin Ward 1bcb15f583 Merge pull request #308 from kubabrecka/en_missing_translations
adding some missing translations in the EN locale
2013-03-01 07:32:52 -08:00
Robin Ward 2106d72d4c Merge pull request #304 from ZogStriP/minimum-character-count
Quoting another reply won't satisfy the minimum character count (fixes #180)
2013-03-01 07:30:26 -08:00
Robin Ward 5599638e60 Merge pull request #312 from ZogStriP/patch-2
updated sublime-project settings
2013-03-01 07:23:54 -08:00
Robin Ward c3b0cf0744 Merge pull request #303 from kirushik/gravatar_https
Secure gravatar
2013-03-01 07:12:56 -08:00
Régis Hanol 0d117a9191 updated sublime-project settings
'default_line_ending' is set to LF so it doesn't break line-ending-sensitive specs on Windows (like oneboxer's)
2013-03-01 15:23:10 +01:00