Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
656 Commits 177 Branches 498 Tags 915 MiB
Commit Graph

148 Commits

Author SHA1 Message Date
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
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