Robin Ward
2c8afca855
Let's ignore structure.sql - it doesn't seem necessary and just causes merge
...
conflicts.
2013-03-14 11:15:09 -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
Robin Ward
025dd86e26
Merge pull request #423 from nverba/heroku-integration
...
Basic Heroku integration
2013-03-14 08:05:46 -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
dc9d54f1c7
Merge pull request #461 from richp10/master
...
Sample Apache2 configuration
2013-03-14 07:47:52 -07:00
Robin Ward
bde8e3df4a
Merge pull request #455 from ZogStriP/master
...
keeping French localization up to date
2013-03-14 06:39:19 -07: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
Robin Ward
4c1ee78a78
Merge pull request #457 from kubabrecka/update_cs14
...
update cs translation
2013-03-14 06:36:19 -07:00
Robin Ward
17c05b4460
Merge pull request #460 from ZogStriP/extracted-a-few-missing-strings
...
extracted a few missing strings
2013-03-14 06:35:19 -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
Richard Phillips
ff4aaa04cb
Apache2 Configuration Sample
...
Sample Virtualhost showing how to:proxy requests to thinserver cluster,
Server static files locally, set headers for downstream server to cache
static assets, exclude mod_security rules that interfere with Discourse.
2013-03-14 12:18:56 +00: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
Kuba Brecka
5f3ac08dba
update cs translation
2013-03-14 08:41:40 +01:00
Régis Hanol
969a62841c
keeping French l10n up to date
2013-03-14 01:32:19 +01: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
nverba
68e3f5228f
Basic Heroku integration
2013-03-13 19:07:49 +00: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
Robin Ward
8e6a8eae66
Merge pull request #451 from nverba/message-bus-connect
...
init message_bus before site_settings
2013-03-13 08:37:34 -07: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
nverba
3c0274a00b
init message_bus before site_settings
2013-03-13 15:15:22 +00:00
Robin Ward
c10640ac26
Merge pull request #448 from kubabrecka/i18n_custom_date_format
...
support "short without year" date format in all locales
2013-03-13 07:28:26 -07: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
Robin Ward
98d314d4ab
Merge pull request #445 from kevinansfield/patch-1
...
Add step to reset Gemfile.lock to TROUBLESHOOTING.md
2013-03-13 06:50:12 -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
Kevin Ansfield
72ae964e01
Add step to reset Gemfile.lock to TROUBLESHOOTING.md
2013-03-13 11:16:45 +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
fcc6aac008
hacked dates so jeff sees no more 1mons everywhere.
2013-03-13 00:05:21 -07: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
Sam
5a2d8e344f
Merge pull request #438 from ZogStriP/keeping-french-l10n-up-to-date
...
keeping French localization up to date
2013-03-12 17:01:20 -07:00
