Robin Ward
ccbd3b2841
Let's default Persona to off right now, change button text
2013-03-04 12:01:20 -05:00
Robin Ward
f7c9efb101
Merge branch 'persona-integration' of git://github.com/callahad/discourse
2013-03-04 11:51:26 -05:00
Brian Kim
1f94ac154b
Fix order dependency in site_setting_spec.rb
...
The spec contained an order dependency which would cause the default
bool test to fail. You can confirm this by running the spec with the
option "--order rand" a couple times. This dependency was caused by
surprising behavior in SiteSetting::setting as shown below:
SiteSetting.setting(:bool_setting?, false)
SiteSetting.refresh!
SiteSetting.bool_setting? #=> false
SiteSetting.random_setting = true
SiteSetting.bool_setting? #=> true
SiteSetting.setting(:bool_setting?, false)
SiteSetting.refresh!
SiteSetting.bool_setting? #=> true!
The spec is merely desriptive, and I have labeled what I think could be
possible bugs.
2013-03-04 11:18:05 -05:00
Jonas Stendahl
2be3bec5c7
Updated swedish client strings.
2013-03-04 17:05:22 +01:00
Robin Ward
3287dcf754
Merge pull request #345 from tms/fatten-up-static-pages
...
Don't double-up on #main-outlet when static content is preloaded
2013-03-04 06:45:55 -08:00
Robin Ward
3588734b14
Merge pull request #346 from ZogStriP/patch-2
...
update vagrant documentation
2013-03-04 06:43:41 -08:00
Neil Lalonde
40f5b9170d
Merge pull request #347 from ZogStriP/put-a-gear-button-on-it
...
added the gear icon to the "Admin" button on the user page
2013-03-04 06:27:37 -08:00
Sam
e6ffc07745
Merge pull request #350 from kubabrecka/extract_strings3
...
some more extracted strings for translation
2013-03-04 04:36:31 -08:00
Kuba Brecka
9bf5e31f94
some more extracted strings for translation
2013-03-03 23:00:16 +01:00
Régis Hanol
ccb715fba3
update both the title & the category when editing the first post
...
using the "edit this post" action beneath the post.
2013-03-03 19:21:29 +01:00
Régis Hanol
d7edca203c
added the gear icon to the "Admin" button on the user page
2013-03-03 18:04:02 +01:00
Régis Hanol
43042d65bc
update vagrant documentation
...
to deal with eventual troubles while downloading the box
2013-03-03 16:58:45 +01:00
tms
f46c819956
Don't double-up on #main-outlet when static content is rendered through Ember
2013-03-03 10:47:40 -05:00
Kuba Brecka
778cad5d2f
implement translations into static pages (FAQ, TOS) + an example of CZ translation
2013-03-03 16:27:32 +01:00
Robin Ward
af865ee223
Merge pull request #338 from ZogStriP/updated-gemfile-lock
...
updated Gemfile.lock to take into account the rb-inotify's version bump
2013-03-03 06:42:22 -08:00
Robin Ward
5f67b11967
Merge pull request #341 from ZogStriP/patch-1
...
better french traduction...
2013-03-03 06:41:28 -08:00
Régis Hanol
2d00f97d98
better french traduction...
...
... regarding the minimum entropies
2013-03-03 12:59:40 +01:00
tms
fba50c3f7a
Position the selected post more reliably below the header
2013-03-03 00:43:08 -05:00
Régis Hanol
cd0a95c641
updated Gemfile.lock to take into account the rb-inotify's version bump
2013-03-03 01:49:22 +01:00
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
