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
Jeff Atwood
7087c2b847
clarify some /admin site setting descriptions
2013-02-27 00:47:47 -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
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
Jonas Stendahl
4990eab952
Added swedish translation for client strings.
2013-02-25 16:30:08 +01: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
Neil Lalonde
560411eece
Add site_setting to disable version checks
2013-02-21 10:19:17 -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
ea7b97be34
missing localization on categories
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
Robin Ward
963c11c72d
Merge pull request #197 from mquandalle/master
...
French translation
2013-02-19 11:10:54 -08: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
Sam Saffron
d9531d94d5
basic lightbox support
2013-02-19 17:57:14 +11:00
mquandalle
ef76a8db66
Split fr.yml into client.fr.yml + server.fr.yml
2013-02-19 00:08:13 +01:00
mquandalle
4cab57a2eb
Create fr.yml
...
Add french translation.
2013-02-18 13:30:27 -08:00
merugear
c338760f6e
Split from nl.yml, updated and ran spellcheck
2013-02-18 10:27:10 -08:00
merugear
d5d48d3ee0
Split from nl.yml, updated and ran spellcheck
...
As suggested by Jeff, I updated the files to match the updated format of client/server seperated code.
2013-02-18 10:19:49 -08:00
Kevin Ansfield
1a81c90076
convert plain text in composer template to i18n
2013-02-18 11:20:07 +01:00
Sam Saffron
c81d07c44b
clean up the topics footer so it does not flash and is localisable
2013-02-16 12:15:15 +11:00
Sam
db66e9facc
Merge pull request #181 from danneu/flags-i18n
...
added "flagged_by" i18n
2013-02-17 13:56:33 -08:00
tms
fb5710b5d6
Improved action descriptions/links on user stream items
2013-02-17 01:38:20 -05:00
Dan Neumann
72264e3034
added 'flagged_by' i18n.
2013-02-16 21:40:24 -06:00
Robin Ward
3cdf89d052
Merge pull request #162 from jessepollak/omniauth-failure
...
Adds failure callback for omniauth
2013-02-15 07:13:17 -08:00
Sam Saffron
89ff51e108
a stop gap so notifications do not look horrible
2013-02-15 19:22:25 +11:00
Jesse Pollak
ad5a5b4866
This commit adds a callback route to handle omniauth failure and removes a few unneccessary entries in en.yml
2013-02-14 18:08:40 -08:00
Sam Saffron
6132373fab
for some reason people seem to not understand why you can not submit close to empty posts, fix that
2013-02-15 12:20:17 +11:00
Jeff Atwood
e94b6e7796
rename nl.yml file as it's WIP
2013-02-14 16:50:16 -08:00
Jeff Atwood
bfd0b1ef29
add contributed nl.yml file
2013-02-14 16:43:51 -08:00
Sam Saffron
c833e2f290
migrate to glyph notifications
2013-02-15 11:44:14 +11:00
Jeff Atwood
0244834a97
copyedit on watching/tracking
2013-02-14 15:51:41 -08:00
Jeff Atwood
91e79670c4
copyedits on new user education panel
2013-02-14 15:32:06 -08:00
Robin Ward
b9457197c0
First stab at new user education - configurable messages that pop up on a user's first
...
few posts/topics.
2013-02-14 15:33:51 -05:00
Jeff Atwood
898efeaea2
suggested copy change to clarify grey unread old
2013-02-14 10:57:26 -08:00
Neil Lalonde
39eab7c425
Replace mentions of mothership with discourse_hub
2013-02-14 12:57:26 -05:00
Robin Ward
b94b9d2383
Merge pull request #146 from ismaelga/moderators-buttons
...
Create moderators
2013-02-14 07:26:50 -08:00
Sam Saffron
87d83802b9
added option that allows users to decide when they consider topics new (default 2 days old or newer)
...
added site_setting to control the default new_topic_duration_minutes
added 10 minutes option for auto_track_topics_after_msecs, default bumped up to 5 mins
2013-02-14 17:36:14 +11:00
Neil Lalonde
aaf96f1e29
Replace email_blacklist_regexp with email_domains_blacklist site setting
2013-02-13 22:45:43 -05:00
Jeff Atwood
d9d2565c25
remove extra text in login error
2013-02-13 17:23:30 -08:00
Ismael Abreu
80bec6efc9
Adds grant and revoke moderation buttons so admins can make users moderators
2013-02-14 01:12:23 +00:00
Robin Ward
4c6379ea56
New users are highlighted when posting. .new-user class
2013-02-13 16:12:30 -05:00
Neil Lalonde
f850fe1e75
Implement the email_blacklist_regexp ssite setting
2013-02-13 12:28:39 -05:00
Robin Ward
4aa89ed2c0
Merge pull request #156 from kubabrecka/correct_typos
...
correcting some typos in locales/en.yml
2013-02-13 07:26:28 -08:00
Robin Ward
81f34349a7
Merge pull request #143 from pixelcort/ninja_edit_window_clarification
...
Clarify the unit of time for ninja_edit_window
2013-02-13 07:24:41 -08:00
Kuba Brecka
1b5aaa1a7b
correcting some typos in locales/en.yml
2013-02-13 16:16:40 +01:00
Sam Saffron
b7c5687b10
Merge branch 'master' of github.com:discourse/discourse
2013-02-13 20:38:59 +11:00
Sam Saffron
161420fac0
Added method for testing ember stuff
...
Collapse user actions in UI so it stops looking crazy
Removed dud dupe user action TOPIC_RESPONSE
Always show the owner of a post on the user page, actions by others at the bottom
2013-02-13 20:38:43 +11:00
Jeff Atwood
e380ebde40
no uppercasin'
2013-02-13 01:20:02 -08:00
Jeff Atwood
1a0ead770e
add base_url to all /faq links in emails
2013-02-12 23:33:35 -08:00
Jeff Atwood
36165d4687
copyedits
2013-02-12 22:20:53 -08:00
Robin Ward
d7f3241285
Option to supress replies button below a post, when its reply is directly following.
2013-02-12 14:35:21 -05:00
Cortland Klein
9ce896840c
Clarify the unit of time for ninja_edit_window
2013-02-12 11:17:11 -08:00
Jeff Atwood
ecbaa45736
remove extraneous text on PM summary
2013-02-11 16:14:44 -08:00
Neil Lalonde
c18b85873f
Prevent login until email is confirmed
2013-02-11 11:18:37 -05:00
Sam Saffron
f68f59c24f
setting to exclude rel nofollow from particular domains
2013-02-11 18:58:19 +11:00
Sam Saffron
543845c673
rel nofollow, on by default to protect forums from spam etc. we should consider lifting it at high trust by default.
2013-02-11 11:43:07 +11:00
Sam Saffron
c50a9e4d01
added support for disabling indexing by google using SiteSetting.allow_index_in_robots_txt = false
2013-02-11 11:02:57 +11:00
tms
9e653ad370
Show "You" to same-user on activity stream items
2013-02-09 23:44:03 -05:00
Jeff Atwood
c5e1dba31f
copyedit on PM invite button
2013-02-09 13:33:38 -08:00
Robin Ward
25e9cfe3b8
Remove the distinction between "x replies below" and "x replies"
2013-02-08 17:10:18 -05:00
Neil Lalonde
1635d8e553
Add email_blacklist_regexp to site settings. Not implemented yet.
2013-02-08 16:31:21 -05:00
Neil Lalonde
d1a04fa06a
Enforce max username length on client
2013-02-08 16:08:45 -05:00
Jeff Atwood
cc21cf16d1
copy on email mentions
2013-02-08 11:13:50 -08:00
Neil Lalonde
79dfccf717
Username validation in signup and username change forms
2013-02-07 18:23:52 -05:00
Jeff Atwood
b8ded55450
a few minor copyedits, 1px adjust
2013-02-07 13:41:33 -08:00
Robin Ward
084a873b91
Give regular users a delete button. If they click it, their post will be revised to
...
say it was deleted.
2013-02-07 15:14:23 -05:00
Sam Saffron
85973ce6b0
added delete all posts button
...
wired up the ability to enable all themes
2013-02-07 18:11:56 +11:00
Sam Saffron
8f4417f962
Merge branch 'master' of github.com:discourse/discourse
2013-02-07 16:00:55 +11:00
Sam Saffron
7b123e12dd
improving flag handling, links and delete button
2013-02-07 16:00:40 +11:00
Sam Saffron
c7461622a9
admins can now clear flags inline
2013-02-07 15:15:48 +11:00
Robin Ward
40da901e5d
Introduction of TextSentinel to enforce title and body quality.
2013-02-06 20:53:34 -05:00
Robin Ward
2d2b907d2c
Temporary Nuclear option on topic titles - disallow non ascii characters so we
...
can stay on top of the trolls. This is meant to be replaced soon with a more
permissive and safe method of sanitizing.
2013-02-06 15:47:36 -05:00
Sam Saffron
0f88947279
fix onebox for your own site
2013-02-06 16:22:11 +11:00
Robin Ward
21b5628528
Initial release of Discourse
2013-02-05 14:16:51 -05:00
