github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-28 01:23:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
45,536 Commits 214 Branches 500 Tags 960 MiB
8e0b1ee74d
Commit Graph

45536 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin Ward
97a2d6d0fe Merge pull request #366 from ZogStriP/moar-globalization 
globalizing the image selector modal
 2013-03-05 06:41:49 -08:00
Robin Ward
cd4d908023 Merge pull request #363 from ZogStriP/autofocus 
autofocus the input in the "insert image" dialog when clicking on...
 2013-03-05 06:39:16 -08:00
Robin Ward
de1dd9c651 Merge pull request #368 from kubabrecka/cs_faq 
CZ translation of FAQ
 2013-03-05 06:37:30 -08:00
Robin Ward
7b861e5a6f Merge pull request #364 from baus/master 
Set reasonable nginx defaults for proxying to thin.
 2013-03-05 06:36:17 -08:00
Robin Ward
31fc96157e Merge pull request #360 from kubabrecka/docs_typos 
typo fixes in docs
 2013-03-05 06:35:29 -08:00
Kuba Brecka
9573847caf CZ translation of FAQ 2013-03-05 11:22:08 +01:00
Kuba Brecka
5afd6cc8a1 extract some strings from views/modal 2013-03-05 08:30:47 +01:00
Régis Hanol
5b456a6a3f globalizing the image selector modal 2013-03-05 03:38:12 +01:00
Régis Hanol
61dcd61a5e autofocus the input in the "insert image" dialog when clicking on the "on the web" tab 2013-03-05 03:09:13 +01:00
Régis Hanol
c72f65879f Repeated click on header icons should close popped out dropdowns 2013-03-05 02:44:34 +01:00
Régis Hanol
239cbd2d58 enforce coding convention 
replaced every `and` by `&&` and every `or` by `||`
 2013-03-05 01:42:44 +01:00
Kuba Brecka
3f4c9c3c16 typo fixes in docs 2013-03-05 00:06:50 +01:00
Robin Ward
f544e1d4f7 Crap, we can't use Ember.Handlebars because some places don't use Ember (such as autocomplete.js) 2013-03-04 17:39:21 -05:00
Neil Lalonde
3fdc59b1d9 Raise an error in production env if host_names is using production.localhost 2013-03-04 16:07:02 -05:00
Robin Ward
9c0b4572a3 Updated helpers, upgraded Ember to latest master. 2013-03-04 15:25:30 -05:00
Robin Ward
4385a174a2 Merge branch 'keep-title-and-category-in-sync' of git://github.com/ZogStriP/discourse 2013-03-04 15:25:24 -05:00
Neil Lalonde
fbeee1b13d Add a point about host_names in the troubleshooting doc 2013-03-04 15:18:58 -05:00
Robin Ward
e669b10966 Merge pull request #355 from dracula2000/site_setting_spec_fix 
Fix order dependency in site_setting_spec.rb
 2013-03-04 11:53:17 -08:00
Robin Ward
ccf8e1e87f Merge pull request #354 from jyggen/master 
Updated swedish client strings.
 2013-03-04 11:52:18 -08:00
Robin Ward
9a66c416af Merge pull request #343 from kubabrecka/localize_static_pages 
implement translations into static pages (FAQ, TOS) + an example of CZ translation
 2013-03-04 11:51:28 -08:00
Robin Ward
09e9e34b8b Merge pull request #340 from tms/post-scroll-peekaboo 
Position the selected post more reliably below the header
 2013-03-04 11:40:00 -08:00
Alexander
d6e665f888 Caching for topic/category RSS feeds 
Using anonymous_etag() now
 2013-03-04 11:21:01 -08:00
Robin Ward
35d5c899dd Merge pull request #321 from tijmenb/fix-hosts-in-oneboxer 
Fix display hosts in oneboxer
 2013-03-04 11:04:02 -08:00
Robin Ward
8c914e869d Merge pull request #317 from goshakkk/contrib-coding-style 
Add basic coding style guidelines to CONTRIBUTING.md
 2013-03-04 10:58:09 -08:00
Robin Ward
51f6ae69c9 Check when logging in whether a auth provider is enabled, including specs 2013-03-04 13:44:41 -05:00
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