github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-28 13:14:04 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
1,347 Commits 214 Branches 500 Tags 960 MiB
a9019288c5
Commit Graph

730 Commits

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