18797 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Sam	c8b9f8dca3	Merge pull request #439 from kubabrecka/update_cs14 ... update cs translation	2013-03-12 17:01:01 -07:00
Sam	259827d14b	Merge pull request #440 from ZogStriP/composer-count-only-significant-whitespaces ... the composer will now count only significant whitespaces	2013-03-12 16:57:52 -07:00
Régis Hanol	439ac95b73	the composer will now count only significant whitespaces	2013-03-12 23:54:29 +01:00
Kuba Brecka	505bf29bad	update cs translation	2013-03-12 23:40:01 +01:00
Régis Hanol	7365edefe5	keeping French localization up to date	2013-03-12 23:22:24 +01:00
Jeff Atwood	cde9d8c3a9	copyedit on reply to diff topic reminder	2013-03-12 13:33:32 -07: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
Robin Ward	1e017ddc62	Merge pull request #434 from kubabrecka/cs_typo_fixes ... cs translation typo fixes	2013-03-12 07:38:40 -07:00
Robin Ward	c9535fffc2	Merge pull request #432 from kubabrecka/i18n_post_number ... extract hardcoded "post {{number}}" into locale strings	2013-03-12 07:38:27 -07:00
Kuba Brecka	1cab4d3265	cs translation typo fixes	2013-03-12 15:12:54 +01:00
Kuba Brecka	ac47c36f8b	extract hardcoded "post {{number}}" into locale strings	2013-03-12 14:41:27 +01:00
Robin Ward	9db0ddeeac	Merge pull request #429 from tangramor/master ... Add some missed translations for server.zh_CN.yml	2013-03-12 06:31:08 -07:00
Sam	079b2d3842	Merge pull request #430 from kubabrecka/cs_update12 ... cs translation update	2013-03-12 03:31:41 -07:00
Sam	a2dfc8472d	Merge pull request #431 from kubabrecka/extract_strings12 ... extract hardcoded string into locale	2013-03-12 03:31:10 -07:00
Kuba Brecka	f5f502d2a0	extract hardcoded string into locale	2013-03-12 11:29:59 +01:00
Kuba Brecka	e0ab379bce	cs translation update	2013-03-12 10:59:58 +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