github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 20:26:35 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
910 Commits 190 Branches 500 Tags 938 MiB
621f946193
Commit Graph

239 Commits

Author SHA1 Message Date
Robin Ward
0c5ca30188 Merge pull request #361 from ZogStriP/enforce-coding-convention 
enforce coding convention
 2013-03-05 07:25:19 -08:00
Robin Ward
0c41e80f41 Merge pull request #367 from kubabrecka/extract_strings5 
extract some strings from views/modal
 2013-03-05 06:43:01 -08:00
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
7b861e5a6f Merge pull request #364 from baus/master 
Set reasonable nginx defaults for proxying to thin.
 2013-03-05 06:36:17 -08: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
239cbd2d58 enforce coding convention 
replaced every `and` by `&&` and every `or` by `||`
 2013-03-05 01:42:44 +01: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
ccf8e1e87f Merge pull request #354 from jyggen/master 
Updated swedish client strings.
 2013-03-04 11:52:18 -08: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
Jonas Stendahl
2be3bec5c7 Updated swedish client strings. 2013-03-04 17:05:22 +01:00
Kuba Brecka
9bf5e31f94 some more extracted strings for translation 2013-03-03 23:00:16 +01:00
Régis Hanol
2d00f97d98 better french traduction... 
... regarding the minimum entropies
 2013-03-03 12:59:40 +01:00
Chris Baus
71984bf01a Update nginx.sample.conf 2013-03-02 12:53:42 -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
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
5e95dfb1c9 Removing unnecessary Rails.env check 2013-03-02 05:58:05 +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
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
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
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
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
Alexander
fd240c1967 RSS for topics in a category 
Creates a new route for category RSS
 2013-03-01 09:52:59 -08:00
Kuba Brecka
9993e0e665 extracting some more hardcoded strings 2013-03-01 17:04:13 +01:00
Kuba Brecka
5f2215290e adding some missing translations in the EN locale 2013-03-01 09:19:25 +01:00
Neil Lalonde
72edc9262b Add a comment about host_names in database.yml for production servers 2013-02-28 17:13:07 -05:00
Neil Lalonde
c9140a2441 Add a nag to update often 2013-02-28 16:19:22 -05:00
Robin Ward
b6f69ed57f Merge pull request #299 from kubabrecka/cs_client_localization 
client (js) side of Czech language localization
 2013-02-28 12:25:00 -08:00
Robin Ward
04f0105daf Fix locale path for precompiling assets 2013-02-28 15:06:04 -05:00
Robin Ward
628927a79f Added Site Setting to change locale. 2013-02-28 14:34:38 -05:00
Robin Ward
e37c7f1e1d Merge branch 'js-l10n-support-take1' of git://github.com/kubabrecka/discourse 2013-02-28 14:34:13 -05:00
Neil Lalonde
a3b1ae7793 Remove the secret_token site_setting since it's not used 2013-02-28 14:07:26 -05:00
Kuba Brecka
c53e101822 client (js) side of Czech language localization 2013-02-28 18:41:07 +01:00
Robin Ward
93a257707e Add X-Forwarded-Proto to nginx config to support SSL. Fixes #293 2013-02-28 11:24:03 -05:00
Robin Ward
9c0cbe8311 Merge pull request #298 from nverba/login-buttons 
added option to enable/disable login buttons individually
 2013-02-28 08:13:04 -08:00
nverba
b0f3a74a1f added option to enable/disable login buttons individually 2013-02-28 03:46:56 +00:00
Robin Ward
dc8e1196fd Code to support EmberJS + Discourse Tutorial feature: Admin Reports 2013-02-27 22:40:36 -05:00
Robin Ward
a086635add Swap out "@" for "via" in email From field 2013-02-27 19:03:57 -05:00
Robin Ward
7c1ae451fe Send emails to users who are watching topics 2013-02-27 15:38:44 -05:00
Robin Ward
007118b00c Merge branch 'github-auth' of git://github.com/nverba/discourse 
Conflicts:
	config/locales/server.en.yml
	db/structure.sql
	spec/views/omniauth_callbacks/complete.html.erb_spec.rb
 2013-02-27 12:09:22 -05:00
Robin Ward
2184763d4a Merge pull request #222 from alxndr/rss-for-topics 
RSS view of topics
 2013-02-27 08:30:08 -08:00
Jeff Atwood
7087c2b847 clarify some /admin site setting descriptions 2013-02-27 00:47:47 -08:00
Kuba Brecka
acc7718c67 first attempt to serve correct localized js files as rails pipeline assets 2013-02-27 09:00:49 +01:00
Alexander
8855a0bfbe RSS of a topic via new route 
Adds TopicView#recent_posts; Post#by_newest, #with_user, #author_readable; User#readable_name
Autodiscovery tag in topic show HTML.
 2013-02-26 14:54:17 -08:00
Robin Ward
e363950bf5 Merge pull request #272 from kubabrecka/extract_some_strings 
extract some more strings into locales/*.yml
 2013-02-26 14:38:40 -08:00
Kuba Brecka
e9fb46c251 extract some more strings into locales/*.yml 2013-02-26 22:13:07 +01:00
Neil Lalonde
cd6c1de5b0 Add site settings for company name and domain, and use them in the Terms of Service 2013-02-26 15:50:42 -05:00
Robin Ward
0e087e040f Fixes title regression 2013-02-26 11:13:13 -05:00
Robin Ward
88267429c5 Remove fastclick for now -- we saw some regressions on iPad and want to make sure they weren't caused by 
it.
 2013-02-26 10:47:23 -05:00
Robin Ward
1221c393a3 Merge branch 'whitespace-cleanese' of git://github.com/goshakkk/discourse 
Conflicts:
	lib/oneboxer.rb
	lib/oneboxer/whitelist.rb
	spec/controllers/robots_txt_controller_spec.rb
 2013-02-26 10:42:49 -05:00
Régis Hanol
679d955db3 Pluralization bug when hovering on likes 2013-02-26 11:20:49 +01:00
nverba
b45f872c04 Added Github authentication option, disabled by default with enable options in settings. 2013-02-26 05:00:21 +00:00
Gosha Arinich
cafc75b238 remove trailing whitespaces ❤️ 2013-02-26 07:31:35 +03:00
Jeff Atwood
b50e0536c7 copyedit topic load failure messages 2013-02-25 17:05:26 -08:00
Jeff Atwood
ea9196a8a2 minor copyedits around login / email 2013-02-25 16:23:09 -08:00
Robin Ward
397c6ca761 Better error messages when topics can't load 2013-02-25 18:38:38 -05:00
Jeff Atwood
d9d3419a51 some copyedits on admin / email 2013-02-25 15:07:40 -08:00
Robin Ward
2a7345b96e Merge pull request #237 from kubabrecka/pseudolocalization 
'pseudo' locale files for testing/development + script to generate these files
 2013-02-25 14:26:57 -08:00
Robin Ward
4be869db34 Merge pull request #257 from jyggen/master 
Swedish translation of client strings
 2013-02-25 14:24:31 -08:00
Robin Ward
c69cac517a Merge pull request #260 from nverba/patch-1 
Update config/routes.rb
 2013-02-25 14:22:35 -08:00
Robin Ward
e461c84253 Clean up JS, add YUIDoc support, automatically create IIFE via asset pipeline 2013-02-25 17:16:57 -05:00
nverba
c6eeffec3b Update config/routes.rb 
Facebook and Twitter controllers are no longer defined.
 2013-02-25 17:16:53 +00:00
Jonas Stendahl
4990eab952 Added swedish translation for client strings. 2013-02-25 16:30:08 +01:00
Robin Ward
ea861ebb57 Merge pull request #249 from goshakkk/cleaner-routes 
Omit explicit route => action mappings where possible
 2013-02-25 07:05:31 -08:00
Sam Saffron
b9f3666f5a fast click instead of hacky double event binding 2013-02-25 11:11:46 +11:00
Gosha Arinich
81d03e6a39 omit explicit route => action mappings where possible 2013-02-24 17:02:11 +03:00
Jeff Atwood
e962ff36a9 copy change on topic not found, curious problems 2013-02-23 12:38:55 -08:00
Kuba Brecka
623cc66968 'pseudo' locale files for testing/development + script to generate these files 2013-02-23 11:38:27 +01:00
Jeff Atwood
9464bf5576 remove unused client_setting 2013-02-22 12:55:18 -08:00
Jeff Atwood
8631c215ad improved admin site setting descriptions 2013-02-22 12:34:42 -08:00
Robin Ward
1c5afc9686 Merge pull request #231 from shapkin/master 
Add english locale to page.
 2013-02-22 10:58:31 -08:00
Robin Ward
532b1f5450 Can edit category descriptions, they show up in a title attribute 2013-02-22 13:43:47 -05:00
Neil Lalonde
ff3e012034 Add a link that allows you to send activation email again 2013-02-22 11:49:58 -05:00
Alexander Shapkin
ee8825408b add english locale to page 2013-02-22 15:33:35 +04:00
Robin Ward
588c79e637 Updated JSHint settings, include smoke test. 2013-02-21 16:25:40 -05:00
Neil Lalonde
1e794f98a7 Add an option to not flush redis every time sidekiq.rb is loaded in development 2013-02-21 13:45:16 -05:00
Neil Lalonde
560411eece Add site_setting to disable version checks 2013-02-21 10:19:17 -05:00
Robin Ward
ba8efd8b51 Merge pull request #211 from Shahor/master 
French translation fixes
 2013-02-21 07:12:37 -08:00
Neil Lalonde
803a86a21d Add more documentation to secret_token.rb 2013-02-20 20:32:40 -05:00
Robin Ward
f661fa609e Convert all CoffeeScript to Javascript. See: 
http://meta.discourse.org/t/is-it-better-for-discourse-to-use-javascript-or-coffeescript/3153
 2013-02-20 19:01:13 -05:00
Shahor
f1c011ebcc Added new translations and fixed typo/grammar 2013-02-20 23:03:27 +01:00
Alexandre Gaudencio
2d51bd9919 French translation : Grammar,typo fixes and useless file removal 2013-02-20 18:43:56 +01:00
Sam Saffron
a02414410f amazing the amount of damage a missing .js extension can cause 2013-02-20 17:17:05 +11:00
Sam Saffron
15c5f5b840 grrrrr asset pipeline hates me 2013-02-20 17:00:24 +11:00
Sam Saffron
ea7b97be34 missing localization on categories 2013-02-20 16:11:56 +11:00
Sam Saffron
0c085059c9 added sane sanitizer (Google Cajole) that is much more robust than old one ... yay for smilies 
added sane way to do $LAB includes - pattern to be expanded
people keep on messing structure.sql
 2013-02-20 16:11:56 +11:00
Sam Saffron
c914a3cf22 missing localization 2013-02-20 16:11:56 +11:00
Neil Lalonde
e914222cb3 Add i18n for the version checking 2013-02-19 17:42:36 -05:00
Robin Ward
a1f8dcebd1 Custom messages for the footers of all list views 2013-02-19 17:39:34 -05:00
Robin Ward
836c3a7379 Support for Fancy topic titles 2013-02-19 16:14:04 -05:00
Neil Lalonde
c0371ff427 Add version checking that shows on the admin dashboard 2013-02-19 15:20:49 -05:00
Robin Ward
963c11c72d Merge pull request #197 from mquandalle/master 
French translation
 2013-02-19 11:10:54 -08:00
Robin Ward
928e215e57 Update to latest Ember.js 2013-02-19 12:28:18 -05:00
Robin Ward
73cac65d3a Merge pull request #195 from merugear/master 
Updated Dutch Locale
 2013-02-19 08:21:05 -08:00
merugear
6ad9fc7049 Changed quotes 
I used " -quotes in the text, which didn't escape properly. Ran it through a YAML linter and it seems to validate.
Sorry for the inconvenience!
 2013-02-19 12:49:18 +01:00
merugear
dd302a6366 Updated, removing tabs and whitespaces. Changed 'en' to 'nl' 
Sam: could you try this one instead? Forgot to change 'en' to 'nl' Cheers.
 2013-02-19 12:36:06 +01:00