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
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
679d955db3
Pluralization bug when hovering on likes
2013-02-26 11:20:49 +01:00
b45f872c04
Added Github authentication option, disabled by default with enable options in settings.
2013-02-26 05:00:21 +00:00
cafc75b238
remove trailing whitespaces ❤️
2013-02-26 07:31:35 +03:00
b50e0536c7
copyedit topic load failure messages
2013-02-25 17:05:26 -08:00
ea9196a8a2
minor copyedits around login / email
2013-02-25 16:23:09 -08:00
397c6ca761
Better error messages when topics can't load
2013-02-25 18:38:38 -05:00
d9d3419a51
some copyedits on admin / email
2013-02-25 15:07:40 -08:00
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
4be869db34
Merge pull request #257 from jyggen/master
...
Swedish translation of client strings
2013-02-25 14:24:31 -08:00
c69cac517a
Merge pull request #260 from nverba/patch-1
...
Update config/routes.rb
2013-02-25 14:22:35 -08:00
e461c84253
Clean up JS, add YUIDoc support, automatically create IIFE via asset pipeline
2013-02-25 17:16:57 -05:00
c6eeffec3b
Update config/routes.rb
...
Facebook and Twitter controllers are no longer defined.
2013-02-25 17:16:53 +00:00
4990eab952
Added swedish translation for client strings.
2013-02-25 16:30:08 +01:00
ea861ebb57
Merge pull request #249 from goshakkk/cleaner-routes
...
Omit explicit route => action mappings where possible
2013-02-25 07:05:31 -08:00
b9f3666f5a
fast click instead of hacky double event binding
2013-02-25 11:11:46 +11:00
81d03e6a39
omit explicit route => action mappings where possible
2013-02-24 17:02:11 +03:00
e962ff36a9
copy change on topic not found, curious problems
2013-02-23 12:38:55 -08:00
623cc66968
'pseudo' locale files for testing/development + script to generate these files
2013-02-23 11:38:27 +01:00
9464bf5576
remove unused client_setting
2013-02-22 12:55:18 -08:00
8631c215ad
improved admin site setting descriptions
2013-02-22 12:34:42 -08:00
1c5afc9686
Merge pull request #231 from shapkin/master
...
Add english locale to page.
2013-02-22 10:58:31 -08:00
532b1f5450
Can edit category descriptions, they show up in a `title` attribute
2013-02-22 13:43:47 -05:00
ff3e012034
Add a link that allows you to send activation email again
2013-02-22 11:49:58 -05:00
ee8825408b
add english locale to page
2013-02-22 15:33:35 +04:00
588c79e637
Updated JSHint settings, include smoke test.
2013-02-21 16:25:40 -05:00
1e794f98a7
Add an option to not flush redis every time sidekiq.rb is loaded in development
2013-02-21 13:45:16 -05:00
560411eece
Add site_setting to disable version checks
2013-02-21 10:19:17 -05:00
ba8efd8b51
Merge pull request #211 from Shahor/master
...
French translation fixes
2013-02-21 07:12:37 -08:00
803a86a21d
Add more documentation to secret_token.rb
2013-02-20 20:32:40 -05:00
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
f1c011ebcc
Added new translations and fixed typo/grammar
2013-02-20 23:03:27 +01:00
2d51bd9919
French translation : Grammar,typo fixes and useless file removal
2013-02-20 18:43:56 +01:00
a02414410f
amazing the amount of damage a missing .js extension can cause
2013-02-20 17:17:05 +11:00
15c5f5b840
grrrrr asset pipeline hates me
2013-02-20 17:00:24 +11:00
ea7b97be34
missing localization on categories
2013-02-20 16:11:56 +11:00
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
c914a3cf22
missing localization
2013-02-20 16:11:56 +11:00
e914222cb3
Add i18n for the version checking
2013-02-19 17:42:36 -05:00
a1f8dcebd1
Custom messages for the footers of all list views
2013-02-19 17:39:34 -05:00
836c3a7379
Support for Fancy topic titles
2013-02-19 16:14:04 -05:00
c0371ff427
Add version checking that shows on the admin dashboard
2013-02-19 15:20:49 -05:00
963c11c72d
Merge pull request #197 from mquandalle/master
...
French translation
2013-02-19 11:10:54 -08:00
928e215e57
Update to latest Ember.js
2013-02-19 12:28:18 -05:00
73cac65d3a
Merge pull request #195 from merugear/master
...
Updated Dutch Locale
2013-02-19 08:21:05 -08:00
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
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
d9531d94d5
basic lightbox support
2013-02-19 17:57:14 +11:00
ef76a8db66
Split fr.yml into client.fr.yml + server.fr.yml
2013-02-19 00:08:13 +01:00
4cab57a2eb
Create fr.yml
...
Add french translation.
2013-02-18 13:30:27 -08:00
c338760f6e
Split from nl.yml, updated and ran spellcheck
2013-02-18 10:27:10 -08:00
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
1a81c90076
convert plain text in composer template to i18n
2013-02-18 11:20:07 +01:00
0e48e1c346
clean up git version stuff a tad
2013-02-18 18:01:36 +11:00
87b929eac6
added secret token warning in prd
...
added task to stamp builds
2013-02-18 17:34:43 +11:00
1228e351a8
a much more basic but robust restart watcher,
...
removed the pid stuff cause it needs to be a lot more careful not to think
pids from other machines restarted. robust working code is better than
complex graceful broken code.
2013-02-16 13:54:23 +11:00
c81d07c44b
clean up the topics footer so it does not flash and is localisable
2013-02-16 12:15:15 +11:00
ff0d58e4ee
message bus work in progress
2013-02-16 12:14:52 +11:00
db66e9facc
Merge pull request #181 from danneu/flags-i18n
...
added "flagged_by" i18n
2013-02-17 13:56:33 -08:00
fb5710b5d6
Improved action descriptions/links on user stream items
2013-02-17 01:38:20 -05:00
72264e3034
added 'flagged_by' i18n.
2013-02-16 21:40:24 -06:00
3cdf89d052
Merge pull request #162 from jessepollak/omniauth-failure
...
Adds failure callback for omniauth
2013-02-15 07:13:17 -08:00
eb188c57e8
started work on message bus diags
2013-02-15 19:23:40 +11:00
89ff51e108
a stop gap so notifications do not look horrible
2013-02-15 19:22:25 +11:00
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
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
e94b6e7796
rename nl.yml file as it's WIP
2013-02-14 16:50:16 -08:00
bfd0b1ef29
add contributed nl.yml file
2013-02-14 16:43:51 -08:00
c833e2f290
migrate to glyph notifications
2013-02-15 11:44:14 +11:00
0244834a97
copyedit on watching/tracking
2013-02-14 15:51:41 -08:00
91e79670c4
copyedits on new user education panel
2013-02-14 15:32:06 -08:00
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
898efeaea2
suggested copy change to clarify grey unread old
2013-02-14 10:57:26 -08:00
39eab7c425
Replace mentions of mothership with discourse_hub
2013-02-14 12:57:26 -05:00
b94b9d2383
Merge pull request #146 from ismaelga/moderators-buttons
...
Create moderators
2013-02-14 07:26:50 -08:00
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
aaf96f1e29
Replace email_blacklist_regexp with email_domains_blacklist site setting
2013-02-13 22:45:43 -05:00
d9d2565c25
remove extra text in login error
2013-02-13 17:23:30 -08:00
80bec6efc9
Adds grant and revoke moderation buttons so admins can make users moderators
2013-02-14 01:12:23 +00:00
fd694e7b83
Merge branch 'master' of github.com:discourse/discourse
2013-02-14 09:12:49 +11:00
4ccb7354d1
nuking SSL = bad
2013-02-14 09:12:20 +11:00
4c6379ea56
New users are highlighted when posting. .new-user class
2013-02-13 16:12:30 -05:00
f850fe1e75
Implement the email_blacklist_regexp ssite setting
2013-02-13 12:28:39 -05:00
4aa89ed2c0
Merge pull request #156 from kubabrecka/correct_typos
...
correcting some typos in locales/en.yml
2013-02-13 07:26:28 -08:00
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
afc23cc8cb
Merge pull request #133 from xdite/apply_omniauth
...
Apply omniauth
2013-02-13 07:19:13 -08:00
1b5aaa1a7b
correcting some typos in locales/en.yml
2013-02-13 16:16:40 +01:00
b7c5687b10
Merge branch 'master' of github.com:discourse/discourse
2013-02-13 20:38:59 +11:00
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
e380ebde40
no uppercasin'
2013-02-13 01:20:02 -08:00
67cc766f0c
using redis as backend store
2013-02-13 16:48:44 +08:00
1a0ead770e
add base_url to all /faq links in emails
2013-02-12 23:33:35 -08:00
a7908e07d1
merge master
2013-02-13 15:16:39 +08:00
9189d937f7
move all logic to omniauth
...
implement omniauth-facebook / omniauth-twitter
2013-02-13 15:08:38 +08:00
be3d036084
use omniauth-openid to replace google id
2013-02-13 15:08:32 +08:00
36165d4687
copyedits
2013-02-12 22:20:53 -08:00
d7f3241285
Option to supress replies button below a post, when its reply is directly following.
2013-02-12 14:35:21 -05:00
9ce896840c
Clarify the unit of time for ninja_edit_window
2013-02-12 11:17:11 -08:00
be9c374285
Oops, database.yml and redis.yml were still included
2013-02-12 11:32:32 -05:00
Robin Ward
Régis Hanol
nverba
Gosha Arinich
Jeff Atwood
Jonas Stendahl
Sam Saffron
Jeff Atwood
Kuba Brecka
Neil Lalonde
Alexander Shapkin
Shahor
merugear
mquandalle
Kevin Ansfield
tms
Dan Neumann
Jesse Pollak
Ismael Abreu
xdite
xdite
Cortland Klein