Robin Ward
42c234e927
Merge pull request #483 from ZogStriP/site-setting-for-category-color
...
site setting for category colors
2013-03-17 04:48:01 -07:00
Robin Ward
4e057335d5
Merge pull request #464 from ZogStriP/fix-issues-when-a-failure-happen-while-creating-a-new-category
...
displays a message when a failure happen while creating a new category
2013-03-17 04:47:44 -07:00
Régis Hanol
bc9e931304
site setting for category colors
2013-03-17 01:24:52 +01:00
Sam
ee1460e932
Merge pull request #480 from ZogStriP/fix-reply-draft-wont-save
...
fix: reply draft won't save
2013-03-16 15:01:50 -07:00
Régis Hanol
83b8a3386f
fix: reply draft won't save
2013-03-16 18:14:54 +01:00
Robin Ward
e4dfb0a935
Merge pull request #474 from ZogStriP/bind-category-text-field-to-category-badge
...
bind the text entered in the category name text field to the badge
2013-03-16 08:20:10 -07:00
Kuba Brecka
94c0e73ca6
extract string from commits widget
2013-03-16 12:39:20 +01:00
Régis Hanol
a500f6b307
bind the text entered in the category name text field to the badge
2013-03-16 00:59:11 +01:00
Régis Hanol
89815878d9
fixes the random login on dev
2013-03-16 00:26:32 +01:00
Wojciech Kocjan
e6ccc300dc
Support for running discourse with a prefix (i.e. as http://servername/discourse )
2013-03-16 00:01:21 +01:00
Neil Lalonde
d9cdde9aa7
Add user counts for each trust level to admin dashboard
2013-03-15 18:09:02 -04:00
Neil Lalonde
1d9764d8fc
Remove admin_report_total_users_view.js
2013-03-15 18:09:01 -04:00
Neil Lalonde
8983df9856
Show current user count for now, not at different points in time
2013-03-15 18:09:01 -04:00
Jeff Atwood
0db31b3398
just set opacity of links on archived not row
2013-03-15 14:17:47 -07:00
Jeff Atwood
e22b4fe229
fancier favorite star on topics
2013-03-15 14:06:04 -07:00
Robin Ward
67f0de4b8b
Fixed some merge conflicts
2013-03-15 16:59:10 -04:00
Robin Ward
1a60301a17
Merge branch 'fixes-topic-title-length-too-short' of git://github.com/ZogStriP/discourse
...
Conflicts:
app/assets/javascripts/discourse/controllers/composer_controller.js
app/assets/javascripts/discourse/views/composer_view.js
config/locales/client.en.yml
2013-03-15 16:49:17 -04:00
Robin Ward
76d8df6ac6
Merge pull request #462 from kubabrecka/colorpicker3
...
implement color picking from predefined set for category badges + option to change foreground color
2013-03-15 13:43:59 -07:00
Robin Ward
be01e7be60
Slightly offset the second popup if two are on at once
2013-03-15 16:05:57 -04:00
Robin Ward
dd5885bf12
FIX: Twitter tags were using property
instead of name
.
2013-03-15 15:42:21 -04:00
Robin Ward
ad082cea70
Big commit:
...
- Support for a popup that shows similar topics
- Cleaned up a lot of Javascript
- Cleaned up use of Promises
2013-03-15 14:35:33 -04:00
Robin Ward
7714e2050e
Merge pull request #465 from ZogStriP/extracted-hard-coded-string-in-admin-javascript-files
...
extracted hard coded strings in the admin javascript files [ci skip]
2013-03-15 06:49:03 -07:00
Régis Hanol
aef014f439
displays the number of characters left when editing the topic title
2013-03-15 12:56:14 +01:00
Nick Sahler
fb0da25b2d
Wrong file. :|
2013-03-15 05:35:26 -03:00
Neil Lalonde
6c4d9ecfdc
Use one request to fetch dashboard report data and check version
2013-03-14 18:26:26 -04:00
Régis Hanol
cad55bf244
extracted hard coded strings in the admin javascript files
2013-03-14 23:03:13 +01:00
Régis Hanol
3bf6625aa4
displays a message when a failure happen while creating a new category
2013-03-14 22:25:55 +01:00
Neil Lalonde
4f42110e39
Change layout of the admin dashboard
2013-03-14 12:42:45 -04:00
Robin Ward
1715220d77
FIX: Hide topics list when loading new topics by category
2013-03-14 12:38:05 -04:00
Robin Ward
f47240483c
FIX: On refresh, wouldn't say "You liked this"
2013-03-14 12:15:24 -04:00
Robin Ward
8760f58f3d
Merge pull request #450 from ZogStriP/fixes-category-bug-on-cancel
...
fixes bug when modifying the category of a topic but cancelling the edit
2013-03-14 08:08:26 -07:00
Robin Ward
18133caf25
Merge pull request #449 from kubabrecka/composer_wider_placeholder
...
make the "add user" placeholder in composer wider, so other languages can fit into that
2013-03-14 08:06:04 -07:00
Neil Lalonde
91bd27ec0a
Keep a jQuery object of hidden login form
2013-03-14 11:03:57 -04:00
nsahler
d398d13aed
- Mobile Reply-as-new fix
...
- Documentation
2013-03-14 11:02:13 -04:00
Robin Ward
42621859d1
Merge pull request #459 from tangramor/master
...
Fixed issue #435 . Add zh_TW translations. Add missed translations according to newest en.yml
2013-03-14 06:38:37 -07:00
Kuba Brecka
8784c55188
implement color picking from predefined set for category badges + option to change foreground color
2013-03-14 14:16:57 +01:00
Regis Hanol
6abfa5342c
extracted a few missing strings
2013-03-14 11:59:40 +01:00
tangramor
30f6561623
Fix #435 increased the lenghth of category.topic_prefix string; also added zh_TW translations by converting the Simplified Chinese to Traditional Chinese
...
New I18n entries added, added in both zh_CN and zh_TW
Start to translate FAQ, TOS and Privacy docs
Add missed zh_TW.js.erb
Make translation more precise
2013-03-14 18:18:59 +08:00
Robin Ward
a8c44d90a3
FIX: Title changes didn't always apply. Cleaned up some ugly JS.
2013-03-13 18:38:38 -04:00
Neil Lalonde
7777b3f650
Autofocus on first field in signup form
2013-03-13 17:59:51 -04:00
Robin Ward
21b5183d6a
Fix linting errors.
2013-03-13 16:04:48 -04:00
Robin Ward
518910a54d
FIX: Don't include link counts when selecting text to quote a post.
2013-03-13 15:51:41 -04:00
Neil Lalonde
213d3e5c10
Remove unused code and routes that don't exist in session_controller
2013-03-13 15:21:45 -04:00
Robin Ward
45674ef8e7
FIX: When a moderator made a post, their name wasn't highlighted until refresh
2013-03-13 13:59:42 -04:00
Neil Lalonde
58004d44cd
Support for browser password managers, but doesn't quite work in IE
2013-03-13 13:55:33 -04:00
Robin Ward
ea20993bed
FIX: Don't create a new version when a post is recovered. Also display username instead of full name for consistency.
2013-03-13 12:35:55 -04:00
Robin Ward
42c7a65a05
When editing a post that is in reply to another post, show display meta data to that effect.
2013-03-13 12:00:38 -04:00
Regis Hanol
5b2c8362b8
fixes bug when modifying the category of a topic but cancelling the edit
2013-03-13 11:19:58 -04:00
Kuba Brecka
57398a4707
make the "add user" placeholder in composer wider, so other languages can fit into that
2013-03-13 15:22:09 +01:00
Kuba Brecka
4db4fc27c5
support "short without year" date format in all locales
2013-03-13 15:05:28 +01:00
Robin Ward
572a87d5d8
Merge pull request #447 from kubabrecka/history_date_i18n
...
move date formatting from server side to javascript, so we can reuse Sugar's i18n
2013-03-13 06:57:42 -07:00
Robin Ward
fd6967f703
Merge pull request #446 from kubabrecka/dashboard_js_date_fix
...
fixing admin dashboard english date parsing in other locales
2013-03-13 06:55:49 -07:00
Robin Ward
dff9d65cc9
Merge pull request #437 from kubabrecka/i18n_serverside_date_2
...
2nd try: localize date formats on server side
2013-03-13 06:54:27 -07:00
Robin Ward
50fcab557a
Merge pull request #443 from kubabrecka/i18n_sugarjs_production
...
external sugarjs was not the same package as development
2013-03-13 06:52:23 -07:00
Robin Ward
e899af4bf0
Merge pull request #444 from kubabrecka/fix_chinese_dates_js
...
fix js dates in chinese
2013-03-13 06:51:05 -07:00
Kuba Brecka
921a658548
move date formatting from server side to javascript, so we can reuse Sugar's i18n
2013-03-13 13:38:41 +01:00
Kuba Brecka
8003c63fa6
fixing admin dashboard english date parsing in other locales
2013-03-13 13:04:10 +01:00
Sam
a663251bd4
regression
2013-03-13 02:33:32 -07:00
Kuba Brecka
74afb25c2e
fix js dates in chinese
2013-03-13 10:03:05 +01:00
Kuba Brecka
999cd9fc87
external sugarjs was not the same package as development
2013-03-13 09:35:17 +01:00
Sam
d1fa3dd9b3
change icon for Jeff
2013-03-12 23:08:37 -07:00
Sam
1d360a4f69
correct broke use streams
2013-03-12 21:45:55 -07:00
Sam
38f185355d
added options to disable quoting and open links in new tabs
...
fixed a some regressions
removed some dead code
fixed messages about constants being re-defined
2013-03-12 20:06:58 -07:00
Régis Hanol
439ac95b73
the composer will now count only significant whitespaces
2013-03-12 23:54:29 +01:00
Robin Ward
59c52a6c12
Small JSHint issue
2013-03-12 14:54:05 -04:00
Robin Ward
9d4c8ed323
Fixes bug with creating new topic due to edit text changing.
2013-03-12 14:43:41 -04:00
Neil Lalonde
40c27ff3cf
Add flag counts to admin dashboard
2013-03-12 14:40:59 -04:00
Neil Lalonde
9422adfe66
Better alignment of judgemental faces
2013-03-12 14:40:59 -04:00
Neil Lalonde
4eda422cdf
Add total users report; restructure dashboard reports js
2013-03-12 14:40:59 -04:00
Kuba Brecka
b97a3c8d34
reports don't work when default_locale != en + some missing translations
2013-03-12 14:38:15 -04:00
Kuba Brecka
cf5deaba6c
2nd try: localize date formats on server side
2013-03-12 19:30:56 +01:00
Robin Ward
a5a97f88cd
When editing a post, provide more information in the composer title
2013-03-12 13:34:27 -04:00
Robin Ward
1103dde5cd
Fix: When you split topics, featured users and like counts were incorrect.
2013-03-12 12:33:42 -04:00
Kuba Brecka
ac47c36f8b
extract hardcoded "post {{number}}" into locale strings
2013-03-12 14:41:27 +01:00
Kuba Brecka
f5f502d2a0
extract hardcoded string into locale
2013-03-12 11:29:59 +01:00
Sam
a5b2c0c476
use font awesome for the composer toolbar (not very happy with heading and hr icon, but can not find anything better)
2013-03-11 23:33:36 -07:00
Sam
91b507f4c4
if you try posting a reply and are looking at a different topic, pop this window up
2013-03-11 20:57:06 -07:00
Régis Hanol
1d7aa1f6cf
globalized some missing strings
2013-03-12 02:17:45 +01:00
Sam
babb5b7b52
Merge pull request #418 from tms/always-allow-reply-as-new
...
Always allow reply as new topic, for users who can reply as new topic
2013-03-11 17:27:54 -07:00
Jeff Atwood
2115c36c84
Merge pull request #426 from ZogStriP/fix-highlight-issue
...
fixes the highlight issue @coding-horror reported
2013-03-11 13:14:38 -07:00
Régis Hanol
8a143bacaf
fixes the highlight issue @coding-horror reported
2013-03-11 20:58:02 +01:00
Neil Lalonde
bf37e1b995
Convert github commits widget to ember
2013-03-11 15:27:06 -04:00
Robin Ward
3b7ac014de
Fixes JSHint error on PageDown. Updated for Uniform Access Principle.
2013-03-11 12:30:13 -04:00
Robin Ward
1205e0d3d4
Merge branch 'master' of github.com:discourse/discourse
2013-03-11 11:32:09 -04:00
Robin Ward
dad71a78f7
Merge pull request #414 from awbergs/pagedown_observe
...
added observer to Discourse.PagedownEditor value to refresh previewer
2013-03-11 08:31:47 -07:00
Robin Ward
d175da6816
Merge pull request #392 from kubabrecka/date_i18n_support
...
1st attempt to support i18n in dates and times
2013-03-11 08:15:58 -07:00
Robin Ward
de1d488d91
Merge branch 'date_i18n_support' of git://github.com/kubabrecka/discourse
2013-03-11 11:14:17 -04:00
Robin Ward
4360d1bd61
Cleaned up probe code a little.
2013-03-11 11:13:28 -04:00
Robin Ward
866e0d4e87
Merge pull request #413 from ZogStriP/submit-create-account-form-by-pressing-enter
...
allows the submission of the create account form by pressing enter
2013-03-11 07:27:01 -07:00
tms
52b1d13af7
Always allow reply as new topic, for users who can reply as new topic
2013-03-11 10:20:41 -04:00
Jeff Atwood
3414e2bb92
increase default minimum topic title length to 15
2013-03-10 22:45:55 -07:00
Sam
e62bb9922e
exceptions are BAD
...
the old code wacked on 10ms to every home page request, for no real reason.
2013-03-10 19:11:33 -07:00
Sam
a2facaa4d0
Merge pull request #411 from potthast/german-l10n
...
German l10n of Discourse. Works so far, but lots of fine-tuning still required.
2013-03-10 18:30:53 -07:00
Sam
22a4580df5
added profile environment for perftools profiling (1.9.3 only)
2013-03-10 17:21:56 -07:00
Austin Bergstrom
ba80ca2ee5
added observer to Discourse.PagedownEditor value to refresh previewer
2013-03-10 19:56:32 -04:00
Régis Hanol
4a9c30bf33
allows the submission of the create account form by pressing enter
2013-03-11 00:46:28 +01:00
Martin Potthast
cfc93ad4b9
Added locale to assets.
2013-03-10 17:15:29 +01:00
Sam
22f8100919
requiring is mega expensive, lets not do it every request.
2013-03-10 07:14:52 -07:00
Neil Lalonde
3d7dfd3168
Fix a jshint failure
2013-03-09 15:53:30 -05:00
Neil Lalonde
8927432a93
Add stats to the admin dashboard
2013-03-09 15:34:27 -05:00
Sam
325e28c3c8
wrong conditional
2013-03-08 17:24:54 -08:00
Robin Ward
8c02d2f48d
Robin sucks at merging! This fixes a n+1 query.
2013-03-08 16:48:56 -05:00
Robin Ward
4c7b0a42b5
Oops escape everything but image urls
2013-03-08 16:17:56 -05:00
Robin Ward
908bba8c13
First stab at oneboxing of meta.discourse.org
2013-03-08 15:59:12 -05:00
Robin Ward
d1d4530efd
User Profile enhancements:
...
- Added PreloadStore support to avoid duplicate requests
- preliminary SEO
- Support for opengraph/twitter cards
2013-03-08 15:04:37 -05:00
tangramor
c5761eae8a
Support for Simplified Chinese thanks to tangramor
2013-03-08 11:56:17 -05:00
Robin Ward
c5c1ddfa83
Merge pull request #385 from ZogStriP/highlight-first-of-loaded-topics
...
highlight the first of the newly loaded topics when scrolling
2013-03-08 08:48:30 -08:00
Robin Ward
82b7d3a843
Merge pull request #380 from alxndr/master
...
Keep track of state/content between multiple quotes in a single post
2013-03-08 08:39:37 -08:00
Robin Ward
b8fd734d0e
Merge branch 'refactor-category' of git://github.com/goshakkk/discourse
...
Conflicts:
app/models/category.rb
2013-03-08 10:49:25 -05:00
Robin Ward
fb573b917f
Merge pull request #390 from ZogStriP/min-search-term-length-site-setting
...
added the min-search-term-length site setting
2013-03-08 06:58:45 -08:00
Sam
d6ca23a75b
remove N+1 queries
2013-03-08 05:34:19 -08:00
Robin Ward
d848a9fedc
Add opengraph and twitter card support to topics
2013-03-07 17:46:43 -05:00
Neil Lalonde
2ebe0336ae
On signup, handle duplicate key errors on email and username better
2013-03-07 14:56:55 -05:00
Neil Lalonde
1133d90dcc
Disable submit button on signup form when you've submitted the form
2013-03-07 14:56:55 -05:00
Kuba Brecka
2e76e337a6
1st attempt to support i18n in dates and times
2013-03-07 20:05:18 +01:00
Robin Ward
052887c296
Category Topics are no longer invisible, they are pinned.
2013-03-07 12:46:23 -05:00
Robin Ward
c7359145aa
Merge pull request #384 from kubabrecka/fix_html_escapes
...
fix wrongly escaped HTML in <noscript> tags
2013-03-07 09:24:16 -08:00
Robin Ward
f8d8272406
Cleaned up TopicUserSpec, introduces clearing of pinned topics
2013-03-07 12:19:25 -05:00
Regis Hanol
5703d6c730
added the min-search-term-length site setting
2013-03-07 16:52:01 +01:00
Régis Hanol
002776808f
highlight the first of the newly loaded topics when scrolling
2013-03-07 03:38:38 +01:00
Kuba Brecka
69d9856d43
fix wrongly escaped HTML in <noscript> tags
2013-03-06 22:25:44 +01:00
Jeff Atwood
985cbb92f1
Merge pull request #382 from nsahler/patch-1
...
Reply-new fades in
2013-03-06 11:44:53 -08:00
Nick Sahler
7490012b20
Resubmitting
2013-03-06 14:41:24 -05:00
Neil Lalonde
fab04dbb58
Add github commits widget
2013-03-06 14:39:01 -05:00
Nick Sahler
5f9093f21d
"reply-new" transitions instead of instantly popping in
2013-03-06 14:26:38 -05:00
Alexander
02f29cd43f
Prevent quote content collisions with multiples in one post
...
[Fixes #142 ]
2013-03-06 09:53:34 -08:00
Robin Ward
c123e40638
Merge pull request #373 from alxndr/master
...
Raise 404 from Admin::UsersController#show if no user found
2013-03-06 09:17:47 -08:00
Robin Ward
610be79061
Merge pull request #375 from ZogStriP/autofocus-login
...
autofocus the login input in the login modal
2013-03-06 09:17:10 -08:00
Robin Ward
3b645383fb
Merge pull request #372 from kubabrecka/markdown_fix1
...
Markdown editor translations into client.en.yml + tiny translation fixes
2013-03-06 09:15:52 -08:00
Robin Ward
6a63178411
Merge pull request #377 from kubabrecka/typos5
...
various typos in comments
2013-03-06 09:14:16 -08:00
Robin Ward
1e43eac600
Simple CSS changes to help with lower width screens such as Surface tablet
2013-03-06 12:08:06 -05:00
Neil Lalonde
f129693942
Use a github commits widget hosted on discourse.org
2013-03-06 12:04:45 -05:00
Robin Ward
30aae8e793
Topic was not sanitizing <b> and <img> tags from titles
2013-03-06 11:36:42 -05:00
Neil Lalonde
e8eb60fe78
Use the cog in header dropdown menu admin link, not the wrench
2013-03-06 11:07:44 -05:00
Neil Lalonde
83f89b5c55
Fix check if you're up to date in javascript
2013-03-06 10:34:29 -05:00
Sam Saffron
8f56a09e82
PBKDF2 gem is trouble, removing and hand coding for now
2013-03-06 23:12:16 +11:00
Kuba Brecka
dc62136642
various typos in comments
2013-03-06 08:52:24 +01:00
Neil Lalonde
f8e04a5c48
Version check gets how many versions behind you are, and shows judgemental faces on the dashboard
2013-03-05 18:15:33 -05:00
Régis Hanol
21407d1df4
autofocus the login input in the login modal
2013-03-05 23:42:12 +01:00
Robin Ward
3c1388bbd7
Don't include closed or archived topics in the "new topics" section of the daily digest
2013-03-05 17:22:02 -05:00
Alexander
c4f1cb0d7b
Raise 404 from Admin::UsersController#show if no user found
...
[Fixes #353 ]
2013-03-05 14:02:23 -08:00
Robin Ward
030857ac8c
Give a pretty "from" address to the digest emails
2013-03-05 16:53:49 -05:00
Kuba Brecka
da7a41f5b9
Markdown editor translations into client.en.yml + tiny translation fixes
2013-03-05 21:58:37 +01:00
Robin Ward
86af49e663
More Markdown refactoring - fixed bug with Pagedown not showing on user profile - replaced jQuery occurrences with $.
2013-03-05 15:39:21 -05:00
Robin Ward
cf09e200a5
Moved Markdown out of Discourse.Utilities -> Discourse.Markdown
2013-03-05 14:56:43 -05:00
Robin Ward
1416bc7475
Some javascript refactoring: Move markdown functions into their own classs, remove extraneous window.
calls.
2013-03-05 14:53:55 -05:00
Neil Lalonde
e2ead81818
Use wrenches instead of cogs for admin buttons that let you change something/someone's settings
2013-03-05 14:52:33 -05:00
Robin Ward
09880ce9f9
Merge pull request #369 from kubabrecka/cz_privacy
...
CZ privacy policy translation
2013-03-05 11:11:25 -08:00
Robin Ward
e4277757c4
Fix onebox loading on every keystroke after a request fails.
2013-03-05 14:06:39 -05:00
Kuba Brecka
8da2c93b18
CZ privacy policy translation
2013-03-05 19:31:39 +01:00
Gosha Arinich
a1825fece9
refactor Category
...
* move callback bodies to separate methods (easier to test)
2013-03-05 21:09:13 +03:00
Neil Lalonde
d30fbcd491
Remove welcome to the dashboard
2013-03-05 13:02:16 -05:00
Robin Ward
6edabdfec1
Merge pull request #362 from ZogStriP/repeated-clicks
...
Repeated click on header icons should close popped out dropdowns
2013-03-05 07:29:56 -08:00
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
3cf3fee781
Merge pull request #319 from alxndr/rss-caching
...
Basic caching for topic/category RSS feeds
2013-03-05 07:20:15 -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
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
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
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
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
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
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
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
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
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
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
tms
fba50c3f7a
Position the selected post more reliably below the header
2013-03-03 00:43:08 -05: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
e145a81809
Merge pull request #334 from kubabrecka/minor_tos_fixes
...
minox TOS HTML fixes
2013-03-02 07:58:51 -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
Kuba Brecka
77eafc62cb
minox TOS HTML fixes
2013-03-02 10:56:11 +01:00
Gosha Arinich
5066682e7a
move IncomingLink callbacks into their own methods
2013-03-02 12:33:29 +03:00
tms
66a7b3162f
Change the name displayed in the header on profile update
2013-03-01 22:46:33 -05:00
Robin Ward
3901ddd153
Fix jshint issue with [^]
in regexp.
2013-03-01 15:16:21 -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
23d812a4ab
Use AJAX for submitting Persona credentials.
...
Fixes issue with needing to unblock popups.
2013-03-01 14:00:56 -06:00
Dan Callahan
ef8cf2f734
Add basic Persona functionality
...
1. No session integration yet, so automatic login/logout events are suppressed.
2. Popup blockers must be disabled: submits form to target="_blank"
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
Robin Ward
7c68224763
Merge pull request #309 from goshakkk/enums
...
Introduce Enum
2013-03-01 11:34:48 -08: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
Gosha Arinich
0c99dea153
introduce Enum
2013-03-01 21:16:36 +03:00
Alexander
fd240c1967
RSS for topics in a category
...
Creates a new route for category RSS
2013-03-01 09:52:59 -08:00
Robin Ward
25494529d2
Merge pull request #314 from kubabrecka/extract_strings2
...
extracting some more hardcoded strings
2013-03-01 08:36:46 -08:00
Kuba Brecka
9993e0e665
extracting some more hardcoded strings
2013-03-01 17:04:13 +01:00
Robin Ward
b66b17bf19
Merge pull request #300 from goshakkk/cleanup
...
Minor cleanup, using AR querying DSL over raw SQL in some places
2013-03-01 07:52:34 -08:00
Robin Ward
27ba923fd4
Merge pull request #307 from kubabrecka/html_syntax_fixes
...
some minor HTML syntax fixes
2013-03-01 07:39:03 -08:00
Robin Ward
2106d72d4c
Merge pull request #304 from ZogStriP/minimum-character-count
...
Quoting another reply won't satisfy the minimum character count (fixes #180 )
2013-03-01 07:30:26 -08:00
Robin Ward
c3b0cf0744
Merge pull request #303 from kirushik/gravatar_https
...
Secure gravatar
2013-03-01 07:12:56 -08:00
Kuba Brecka
8a03afb35f
some minor HTML syntax fixes
2013-03-01 08:44:58 +01:00
Régis Hanol
4fa4c15559
Quoting another reply won't satisfy the minimum character count ( fixes #180 )
2013-02-28 23:58:40 +01:00
Neil Lalonde
c9140a2441
Add a nag to update often
2013-02-28 16:19:22 -05:00
Kirill Pimenov
a168dc915e
Secure gravatar
2013-03-01 00:58:36 +04:00
Neil Lalonde
f0c2d012b7
Add a github widget to the admin dashboard showing the 10 most recent commits
2013-02-28 15:35:47 -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
Gosha Arinich
6e5399d544
minor cleanup, using AR querying DSL over raw SQL in some places
2013-02-28 21:54:12 +03:00
Neil Lalonde
fce4c66d93
Improve js username validation so it's done only when necessary
2013-02-28 12:24:57 -05:00
Robin Ward
6c25eca2d6
Merge pull request #296 from goshakkk/refactor-user
...
Refactor User and TrustLevel a bit
2013-02-28 08:17:21 -08:00
Gosha Arinich
d2f3c829db
refactor User and TrustLevel a bit
...
* rename `User#password_required` to `User#password_required!`
* emails with "i" @ something are a special case as well
* get rid of `self.` and returns where possible
* prefer "unless a" instead of "if !a"
* `unread_notifications` without manually iterating
* introduce `User#moderator?`
* introduce `TrustLevel#valid_key?`, `TrustLevel#compare`, and
`TrustLevel#level_key`
2013-02-28 19:15:54 +03: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
Robin Ward
5d0d958a45
Merge pull request #289 from ZogStriP/bbcode-component
...
added more tests & documentation to the BBCode component
2013-02-28 08:03:44 -08:00
Bryson Holland
50cd44df2d
Saved ~46KB through image optimization.
2013-02-28 10:58:12 -05:00
Robin Ward
3b47562738
We don't need content
here because it uses an ObjectController as a proxy.
2013-02-28 10:01:38 -05: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
Régis Hanol
f93a26e03d
added more tests & documentation to the BBCode component
2013-02-28 03:29:52 +01:00
Jeff Atwood
416f981f92
change 404 page to use /new link under "New topics"
2013-02-27 16:48:53 -08:00
Robin Ward
a086635add
Swap out "@" for "via" in email From field
2013-02-27 19:03:57 -05:00
Robin Ward
c62729b5b6
Merge pull request #285 from alxndr/rss-for-topics
...
Specify type in topic RSS autodiscovery tag
2013-02-27 15:33:11 -08:00
Robin Ward
421f048458
Add a better from address to the email
2013-02-27 18:30:14 -05:00
Alexander
9b541b1c0a
Specify type in topic RSS autodiscovery tag
2013-02-27 14:55:04 -08:00
Robin Ward
7c1ae451fe
Send emails to users who are watching topics
2013-02-27 15:38:44 -05:00
Robin Ward
cf867a35ff
Merge pull request #271 from goshakkk/topic-refactor
...
Refactor Topic
2013-02-27 10:32:44 -08: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
Robin Ward
7d6e1f3e1c
Show likes even while logged out.
2013-02-27 11:22:03 -05:00
Jeff Atwood
d8687f1bfa
broaden the /faq "search" advice to browse
2013-02-27 02:14:28 -08:00
Jeff Atwood
b757f06fde
/faq tweaks
2013-02-27 02:07:31 -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
Robin Ward
0df2034dc8
Fixes #264 - replaceState was wonky
2013-02-26 17:27:01 -05:00
Neil Lalonde
4e15227fd0
Admin dashboard: use ember's class name binding
2013-02-26 17:05:17 -05: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
0f48414a72
The avatar helper should be smart enough to find a nested avatar_template. Fixes #243
2013-02-26 15:31:49 -05:00
Robin Ward
1492464158
fixes: http://meta.discourse.org/t/discourse-logo-link-back-to-top-of-thread-list-on-home-page/3592
2013-02-26 15:20:13 -05:00
Robin Ward
1caf1e6b45
Clean up discourse.js
2013-02-26 15:20:06 -05:00
Neil Lalonde
b9ccf4d09c
Show discourse version in an html comment
2013-02-26 13:47:07 -05:00
Robin Ward
ddf1f27633
Fixes #157 - Add mention of seed_fu to docs.
2013-02-26 12:45:56 -05:00
Robin Ward
6c30e0b09c
Add 'descrption' to categories, even when in a Combobox
2013-02-26 12:17:23 -05:00
Gosha Arinich
12d664a610
refactor Topic
...
* move finding by username/email to User
* make SiteSetting return a range of possible post title lengths
* remove unnecessary conditions
2013-02-26 19:27:59 +03: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
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
tms
7088dfce9f
Prevent event bubbling on search toggles to keep dropdown open
2013-02-25 22:14:58 -05:00
Robin Ward
e28594b94e
Ack! Messed up the jshint again. I gotta get better about this.
2013-02-25 18:43:45 -05:00
Robin Ward
397c6ca761
Better error messages when topics can't load
2013-02-25 18:38:38 -05:00
Robin Ward
3e201fc9f3
Oops I missed a couple of jshint errors :)
2013-02-25 17:53:29 -05:00
Robin Ward
2ba28096e1
Merge pull request #262 from goshakkk/no-unused-var-warn
...
Avoid unused variable (post) warning in Topic
2013-02-25 14:20:50 -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
Neil Lalonde
0321643636
Dashboard JS checks version every 12 hours
2013-02-25 16:21:52 -05:00
Gosha Arinich
054a699886
avoid unused variable warning in Topic
2013-02-25 22:13:36 +03:00
Sam Saffron
77a2d8ccc4
fixed a pile of notification craziness
...
addes some tests around post timings
2013-02-25 18:42:42 +11:00
Sam Saffron
cb3d839104
fix hinting
2013-02-25 11:18:10 +11:00
Sam Saffron
b9f3666f5a
fast click instead of hacky double event binding
2013-02-25 11:11:46 +11:00
Sam Saffron
b0b0e222f7
missed a spot where channel can be out of sync
2013-02-25 09:32:06 +11:00
Sam
14c2a4568d
Merge pull request #247 from balpha/master
...
Update PageDown to latest
2013-02-24 13:54:16 -08:00
Sam Saffron
419ecf70b2
remove events from ember that seem to be firing too much PR in progress
2013-02-25 08:37:11 +11:00
Sam Saffron
997b436210
attempt at fixing google analytics
2013-02-25 08:36:46 +11:00
balpha
378b594b2d
apparently discourse allows single-quoted attribute values in HTML; fix the lookahead in the PageDown auto-linker to account for that
2013-02-24 14:13:00 +01:00
balpha
1640616c06
PageDown update overwrote a discourse customization; put it back in
2013-02-24 13:52:46 +01:00
balpha
22caa7b6a8
merge upstream PageDown changes up to current revision c06c6e0d465e
2013-02-24 13:40:06 +01:00
Sam Saffron
47fedd8f4d
correct breakage
...
don't set permanent cookie, kill session if it conflicts
2013-02-24 22:56:08 +11:00
Sam Saffron
b66db4153d
refactor and organise current_user better
2013-02-24 21:42:04 +11:00
Sam
d42a87ec8a
Merge pull request #235 from tms/autocomplete-right-away
...
Tweak autocomplete/caret_position logic to not exclude the index 0 case
2013-02-23 19:05:23 -08:00
Sam
7081b958b9
Merge pull request #239 from tms/avatar-should-be-glowier
...
Make avatar glow more...glowier
2013-02-23 19:03:55 -08:00
Sam
578a38dc27
Merge pull request #241 from tms/auth-token-revert
...
Unsign auth token cookies per discussion on #215
2013-02-23 19:03:25 -08:00
Sam Saffron
82e2fae1b8
isolate notifications in channel per user
2013-02-24 10:24:06 +11:00
tms
3e6641c07e
Unsign auth token cookies per discussion on #215
2013-02-23 13:40:21 -05:00
tms
6cfcdfbfd7
Make avatar glow more...glowier
2013-02-23 10:37:06 -05:00
tms
3a0227f868
Tweak autocomplete/caret_position logic to not exclude the index 0 case
2013-02-22 23:47:23 -05:00
Jeff Atwood
cee3949850
add 3 and 4 minute opts to auto track pref
2013-02-22 13:15:41 -08:00
Jeff Atwood
9464bf5576
remove unused client_setting
2013-02-22 12:55:18 -08:00
Neil Lalonde
fc33c63585
EmailToken.active needs to check created_at too
2013-02-22 15:20:00 -05:00
Robin Ward
c3ba7b9741
Uncategorized doesn't have a topic url
2013-02-22 14:33:43 -05:00
Robin Ward
e2fed6fcef
Merge pull request #229 from danneu/topic-patch
...
make topics consume their own scope
2013-02-22 10:59:07 -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
b2e9be68bd
Suggested topics weren't using fancy titles
2013-02-22 13:48:07 -05: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
2d9942ceef
Fix my jshint failures
2013-02-22 12:17:07 -05:00
Neil Lalonde
ff3e012034
Add a link that allows you to send activation email again
2013-02-22 11:49:58 -05:00
Robin Ward
45ab3ab892
JS refactoring that fixes presence errors in earlier reverted commit.
2013-02-22 11:00:47 -05:00
Alexander Shapkin
ee8825408b
add english locale to page
2013-02-22 15:33:35 +04:00
Sam
4d99dc035e
Merge pull request #228 from tms/i-knew-you-cared
...
Collapse user activity items loaded from message bus
2013-02-21 21:53:49 -08:00
Dan Neumann
65b59f8612
make Topic consume its own scope.
2013-02-21 21:22:02 -06:00
tms
b1c1053cf1
Collapse user activity items loaded from message bus
2013-02-21 22:14:58 -05:00
tms
8ec71657ea
Help long titles wrap more cleanly
2013-02-21 21:33:59 -05:00
Sam Saffron
2b5be29d3c
Revert "Remove old unused code."
...
This reverts commit 6a617348e5
.
2013-02-22 10:57:11 +11:00
Robin Ward
588c79e637
Updated JSHint settings, include smoke test.
2013-02-21 16:25:40 -05:00
Robin Ward
6a617348e5
Remove old unused code.
2013-02-21 16:17:56 -05:00
Robin Ward
c8a908e81a
Remove some useless views
2013-02-21 15:55:58 -05:00
Neil Lalonde
2d1bbf22e9
Refactor functions out of the dashboard controller
2013-02-21 15:03:55 -05:00
Robin Ward
dd6d98f48f
More documentation to Admin Controllers
2013-02-21 14:42:48 -05:00
Robin Ward
c1b5803486
Cleaned up admin JS, added YUIDoc headers to all admin classes.
2013-02-21 14:12:09 -05:00
Neil Lalonde
8620024798
Show which SHA is installed on the admin dashboard
2013-02-21 13:48:14 -05:00
Robin Ward
13f8f3c45e
Cleaned up JS, added basic documentation support for Admin Controllers
2013-02-21 13:29:21 -05:00
Robin Ward
6096a447b7
Fix Regression: In reply to
2013-02-21 12:59:38 -05:00
Robin Ward
f6263749d4
Fix javascript regression with quoting
2013-02-21 12:54:40 -05:00
Robin Ward
c5393d93f3
Add icons and and archived style to categories list
2013-02-21 11:38:38 -05:00
Robin Ward
c3b03e3cb6
Show fancy title when you scroll down on topics
2013-02-21 11:21:10 -05:00
Robin Ward
42d996aae1
Show empty categories to those who can create them (admins/mods)
2013-02-21 10:43:10 -05:00
Neil Lalonde
560411eece
Add site_setting to disable version checks
2013-02-21 10:19:17 -05:00
Robin Ward
84cb08e035
Merge pull request #215 from tms/auth-token-changes
...
Sign the auth token cookie and make it httpOnly
2013-02-21 07:14:15 -08:00
Régis Hanol
0884318207
update topic-progress z-index to show up in front
...
of all other items (especially the read-icon)
2013-02-21 14:59:35 +01:00
Sam Saffron
012941ea62
basic smoke test script
2013-02-21 16:01:40 +11:00
Sam Saffron
30f743e185
mobile fix
2013-02-21 16:01:40 +11:00
Robin Ward
26e1cfd12c
rake jshint
works
2013-02-20 19:09:27 -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
tms
5616fdc475
Sign the auth token cookie and make it httpOnly
2013-02-20 17:24:19 -05:00
Neil Lalonde
85f8f8f2d5
Better checking of blacklisted emails on create and when email is being updated
2013-02-20 16:25:08 -05:00
Neil Lalonde
6885e6cfa9
Fix login with google in IE9
2013-02-20 15:40:52 -05:00
Jeff Atwood
7ff7fe3d3c
add css3 fade in/out transition to post menus
2013-02-20 12:36:07 -08:00
Neil Lalonde
046c330858
Changes to email_domains_blacklist shouldn't invalidate existing users
2013-02-20 12:16:16 -05:00
Régis Hanol
55c7ced2f3
corrected right-arrow html entity encoding
...
when using a javascript-disabled browser
2013-02-20 17:00:28 +01:00
Neil Lalonde
1dd882ea99
Fix admin dashboard version check losing its css styling
2013-02-20 10:37:51 -05:00
Alexander Shapkin
105ae2a174
fix spaces and use link_to instead of <a> tags
2013-02-20 12:08:22 +04:00
Sam
d81cd6eb80
Merge pull request #207 from danneu/validate-category-user-id
...
validate category user_id presence to match DB constraint.
2013-02-19 22:48:39 -08: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
70058c9ebe
live reload bug
...
minor sanity check for phone
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
a1099ed74e
sanitize wip
2013-02-20 16:11:56 +11:00
Dan Neumann
37ca391f50
validate category user_id.
2013-02-19 21:24:38 -06:00
Jeff Atwood
2fdbf8cbc9
give us temporary breathing room on wide names
2013-02-19 16:03:03 -08: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
Neil Lalonde
3ca2d92b2f
Fix the missing {{provider}} value message
2013-02-19 16:28:12 -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
da59c15b72
Remove leftover sub-tag support.
2013-02-19 14:21:31 -05:00
Robin Ward
b7e027cfd1
Notifications on PMs respect access rights.
2013-02-19 12:59:46 -05:00
Robin Ward
928e215e57
Update to latest Ember.js
2013-02-19 12:28:18 -05:00
Robin Ward
ae9bee2a91
Merge pull request #172 from jeremybanks/master
...
Do not strip leading and trailing whitespace from raw posts
2013-02-19 08:15:39 -08:00
Robin Ward
8371ff058a
Merge pull request #194 from tms/personal-space
...
Added restricted route to kick out trespassers on user routes
2013-02-19 08:08:18 -08:00
Sam Saffron
d9531d94d5
basic lightbox support
2013-02-19 17:57:14 +11:00
Jeremy Banks
d42782b318
Using LengthValidator's localized messages for StrippedLengthValidator.
2013-02-18 21:57:46 -05:00
Jeremy Banks
eb2a5e4654
Merge branch 'origin/master'
...
Conflicts:
lib/text_sentinel.rb
2013-02-18 21:41:20 -05:00
tms
d2a2ccdb09
Added restricted route to kick out trespassers on user routes
2013-02-18 21:05:12 -05:00
Sam Saffron
d520771c73
move stylesheet cache into the upload dir so its less crazy to sync across servers
2013-02-19 11:02:00 +11:00
Sam Saffron
3be7bde401
stop onebox rapid fire
2013-02-19 10:33:07 +11:00
Kevin Ansfield
1a81c90076
convert plain text in composer template to i18n
2013-02-18 11:20:07 +01:00
Sam Saffron
b9698e8d2f
fix loading message am message bus stuff
2013-02-18 19:37:12 +11:00
Sam Saffron
0e48e1c346
clean up git version stuff a tad
2013-02-18 18:01:36 +11:00
Sam
5265c0b790
Merge pull request #192 from tms/date-formatting
...
Use consistent date formatting in date helpers
2013-02-17 22:41:39 -08:00
Sam Saffron
d9a84ddd01
chuck git version at the bottom of the page
2013-02-18 17:39:54 +11:00
tms
65d71f87a6
Use consistent date formatting in date helpers
2013-02-18 00:28:19 -05:00
Jeremy Banks
6af69f7e77
Do not strip leading and trailing whitespace from raw posts.
2013-02-15 20:58:33 -05:00
Sam Saffron
985b5c59c3
missing h3
2013-02-16 12:27:30 +11: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
8631a6850b
Merge pull request #178 from danneu/update-stats-fix
...
Category year/month/week stats shouldn't include deleted topics.
2013-02-17 14:00:12 -08:00
Sam
e8b3821b41
Merge pull request #179 from tms/users-like-like-posts
...
Users like like posts
2013-02-17 13:57:52 -08:00
Sam
db66e9facc
Merge pull request #181 from danneu/flags-i18n
...
added "flagged_by" i18n
2013-02-17 13:56:33 -08:00
Sam
1623197b05
Merge pull request #184 from tms/activity-stream-tweaks
...
Improved action descriptions/links on user stream items
2013-02-17 13:55:45 -08:00
Sam
c7fba796b6
Merge pull request #185 from tms/search-all-the-things
...
Search all the things
2013-02-17 13:53:58 -08:00
tms
20c723c4fb
Fancy 404 should require access too
2013-02-17 15:26:47 -05:00
Jeff Atwood
fa9a2dda6d
nav for /tos /privacy /faq pages, h2 anchors
2013-02-17 01:09:54 -08:00
tms
66d56a8b93
Correctly set the typeFilter when the user clicks "show more"
2013-02-17 02:21:49 -05: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
Dan Neumann
fac75401ef
category stats shouldn't include deleted topics.
2013-02-16 21:10:18 -06:00
tms
b7e392c7a3
Don't count bookmark stats for users who can't see them
2013-02-16 16:46:20 -05:00
tms
b91ac45359
Avoid grouping user stats by archetype (filter happens beforehand)
2013-02-16 16:33:51 -05:00
Jeff Atwood
cecbede5db
add tooltip and better color to reply jump arrows
2013-02-16 13:07:14 -08:00
Robin Ward
9ca0615d94
Merge pull request #173 from dbarros/saved_preferences
...
Clear 'Saved' message when clicking Save button in user preferences.
2013-02-16 12:57:20 -08:00
Robin Ward
91ff0beb56
Merge pull request #177 from danneu/minor-fix
...
minor word change
2013-02-16 12:56:47 -08:00
Jeff Atwood
0d650972c2
add end nav footer to topic lists by category view
2013-02-16 12:27:24 -08:00
Dan Neumann
6dc088ca16
minor word change
2013-02-16 11:30:46 -06:00
Diego Barros
420614d50d
Clear 'Saved' message when clicking Save button in user preferences.
2013-02-16 19:30:01 +11:00
Robin Ward
b440e30f45
Better filtering out private messages on user stream.
2013-02-15 17:08:28 -05:00
Robin Ward
fc1c120014
Arrows to navigate to embedded posts.
2013-02-15 15:17:57 -05:00
Robin Ward
5c4e6c9f2c
Merge pull request #153 from xdite/refactor_topic_show_again
...
use helper again
2013-02-15 07:19:01 -08:00
Robin Ward
036e795e10
Merge pull request #152 from xdite/canonical-url
...
use canonical-url plugin to make view more clean
2013-02-15 07:18:41 -08: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
Jeff Atwood
c1a50aae04
add more delete button styles on delete.. buttons
2013-02-15 01:45:37 -08: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
a8085f15c4
grab highest post number from the raw data, so deletions at the end of a topic work
2013-02-15 13:08:37 +11:00
Sam
9eb5c2a66a
Merge pull request #163 from anthonyalberto/master
...
Fixes Issue #37 . Going to a user profile now updates the meta title.
2013-02-14 17:27:47 -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
Sam Saffron
c833e2f290
migrate to glyph notifications
2013-02-15 11:44:14 +11:00
Sam Saffron
9681cbb6b8
btn danger is a bit too loud there
2013-02-15 11:44:14 +11:00
Sam Saffron
6c73b3a971
bookmarks should only show up in a users stream
2013-02-15 11:44:14 +11:00
Robin Ward
6f4882659a
Animate in new user education. Track replies separately from posts.
2013-02-14 18:04:03 -05:00
Robin Ward
37b0c168bf
Support non-english topic titles
2013-02-14 17:13:03 -05:00
Robin Ward
5d4efa9100
Support for non-english categories
2013-02-14 16:51:48 -05:00
Anthony Alberto
f00aa30f63
Fixes Issue #37 . Going to a user profile now updates the meta title. Also fixed a minor DEV guide typo.
2013-02-14 16:11:54 -05: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
Neil Lalonde
39eab7c425
Replace mentions of mothership with discourse_hub
2013-02-14 12:57:26 -05:00
Neil Lalonde
68f32af240
User hashed name for local uploads instead of 'blob'
2013-02-14 12:08:37 -05:00
Robin Ward
cba4c9051a
Merge pull request #160 from jaimeiniesta/replace_hpricot_with_nokogiri
...
Replace hpricot with nokogiri
2013-02-14 07:55:19 -08:00
Robin Ward
b94b9d2383
Merge pull request #146 from ismaelga/moderators-buttons
...
Create moderators
2013-02-14 07:26:50 -08:00
Jaime Iniesta
6995e75d41
Replace Hpricot with Nokogiri
2013-02-14 11:35:50 +01:00
Sam Saffron
3c9cab54aa
fix indentation
2013-02-14 18:56:13 +11:00
Sam Saffron
6e6e24ad5c
should be 2 not 10
2013-02-14 18:52:57 +11:00
Jeff Atwood
fe7cb0be05
left-align admin buttons, add back btn-danger style
2013-02-13 23:47:19 -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
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
51473a95b4
Make all quotes multiline. Fixes a bunch of annoying errors.
2013-02-13 17:22:51 -05:00
Robin Ward
8efc4daa5a
Fix zooming on mobile.
2013-02-13 16:17:29 -05:00
Robin Ward
4c6379ea56
New users are highlighted when posting. .new-user class
2013-02-13 16:12:30 -05:00
Robin Ward
dee9e9a51f
Fix bug where links to posts weren't being tracked
2013-02-13 15:23:09 -05:00
Neil Lalonde
941820ac88
Client-side email validation should allow capital letters
2013-02-13 14:30:00 -05:00
Robin Ward
f00006ee7d
Fix broken Yahoo! signup.
2013-02-13 12:37:48 -05:00
Neil Lalonde
f850fe1e75
Implement the email_blacklist_regexp ssite setting
2013-02-13 12:28:39 -05:00
Robin Ward
546016bfd2
Remove unused controllers, apply substitutions to TOS.
2013-02-13 11:50:27 -05:00
xdite
def442164f
Refactor last_updated_at
2013-02-13 11:40:32 -05:00
Robin Ward
34329ee598
Merge pull request #137 from shapkin/patch-1
...
Update app/controllers/categories_controller.rb
2013-02-13 07:20:50 -08:00
Robin Ward
afc23cc8cb
Merge pull request #133 from xdite/apply_omniauth
...
Apply omniauth
2013-02-13 07:19:13 -08:00
xdite
9eca9f9375
use helper again
2013-02-13 19:15:10 +08:00
Alexander Shapkin
b036c9e555
Update app/controllers/categories_controller.rb
...
Fix extra whitespace and hash style.
Comply with a style guide like in Github.
2013-02-13 15:14:38 +04:00
xdite
cab4d95eaf
use canonical-url plugin to make view more clean
2013-02-13 19:04:43 +08:00
Sam Saffron
329f4617a9
less magic numbers
2013-02-13 22:01:16 +11:00
Sam Saffron
93846aecb1
13 sucks
2013-02-13 21:57:58 +11:00
Sam Saffron
3bfdb2dd5b
missed this. was inserting dupes when loading more
2013-02-13 21:18:06 +11: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
48e2b8c269
require 50 read posts, not 100, for basic user
2013-02-13 01:23:02 -08:00
Jeff Atwood
ae034a438c
scope google search on 404 to domain
2013-02-13 01:05:35 -08:00
Jeff Atwood
ee75980f23
first step of variable-izing the /tos
2013-02-13 00:35:18 -08:00
Jeff Atwood
8078f04769
minor 404 page improvements
2013-02-13 00:25:27 -08:00
Jeff Atwood
b5a25084c0
That 1px makes all the difference, man
2013-02-12 23:17:54 -08:00
xdite
a7908e07d1
merge master
2013-02-13 15:16:39 +08:00
xdite
9189d937f7
move all logic to omniauth
...
implement omniauth-facebook / omniauth-twitter
2013-02-13 15:08:38 +08:00
xdite
be3d036084
use omniauth-openid to replace google id
2013-02-13 15:08:32 +08:00
Jeff Atwood
4c572ecd8d
clean up some copy
2013-02-12 22:43:21 -08:00
Neil Lalonde
4e9d9138d6
Fix broken signup with Twitter
2013-02-12 20:50:31 -05:00
Robin Ward
69c7b5aeed
Support category names with spaces
2013-02-12 17:54:56 -05:00
Neil Lalonde
8235d47bdd
Add a new default favicon using the pencil drawn logo
2013-02-12 17:47:44 -05:00
Neil Lalonde
824b09389f
Don't allow signups without a password
2013-02-12 15:42:16 -05: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
Robin Ward
04c8b20840
Remove a ton of old images we no longer use. They are leftover
...
from our prototype.
2013-02-12 13:04:40 -05:00
Robin Ward
95c86b0ffa
Merge pull request #140 from blom/adjust-regexp
...
Adjust some regular expressions
2013-02-12 08:47:54 -08:00
Robin Ward
d90235477c
Merge pull request #134 from abdulsattar/master
...
Set window height as maximum height of div_resizer
2013-02-12 08:45:52 -08:00
Robin Ward
84d1ff437a
Merge pull request #105 from jamiehoyle/jh
...
Some mobile optimisations - mainly for the header.
2013-02-12 08:43:55 -08:00
Robin Ward
924ad1dae0
Merge pull request #106 from gammons/master
...
Refactored TopicsController#show into something that is much more maintainable
2013-02-12 08:36:20 -08:00
Ørjan Blom
bcd5040b11
Adjust some regular expressions
...
* Match beginning of string instead of beginning of line.
* Escape literal periods.
2013-02-12 17:21:56 +01:00
Neil Lalonde
4636b354b4
Use the new mothership change_nickname API
2013-02-12 10:19:02 -05:00