13076 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Sam	f7fa13049c	Merge pull request #3205 from chapel/fix-usercard-out-of-browser ... FIX: Use overage to keep usercard from going off browser	2015-02-16 12:42:02 +11:00
Jacob Chapel	8ee0cb7049	FIX: Use overage to keep usercard from going off browser	2015-02-15 17:14:32 -08:00
Sam	b5bcf7bf3d	update some testing gems	2015-02-16 07:17:45 +11:00
Sam	c867074e0e	Update gems, hiredis contained a confirmed memory leak	2015-02-16 07:12:26 +11:00
Sam	43375c8b15	FIX: upgrade event machine ... 1.0.5 and 1.0.6 contain confirmed memory leaks	2015-02-16 07:06:19 +11:00
Sam	bd8d8b2b49	Revert "Revert "update gems" , may be causing mem leak" ... This reverts commit 112e82d11a.	2015-02-16 07:04:50 +11:00
Régis Hanol	7b848281a1	Merge pull request #3204 from techAPJ/patch-1 ... UX: add confirmation dialog for user archive export	2015-02-15 18:08:11 +01:00
Arpit Jalan	64ffceb438	UX: add confirmation dialog for user archive export	2015-02-15 22:13:28 +05:30
Sam	0b7c92166c	upgrade pg, appears to be false positive	2015-02-15 08:27:35 +11:00
Sam	112e82d11a	Revert "update gems" , may be causing mem leak ... This reverts commit 5eea774f54.	2015-02-15 08:25:58 +11:00
Jeff Atwood	fc413df7e1	add link to backups from dashboard size	2015-02-13 17:21:29 -08:00
Jeff Atwood	9730a6892c	Merge pull request #3201 from awesomerobot/master ... fixing cateogry alignment in docked header	2015-02-13 14:17:45 -08:00
Kris Aubuchon	c8af2ec8a2	fixing cateogry alignment in docked header	2015-02-13 17:17:32 -05:00
Robin Ward	3ce2077aa8	Migrate unsubscribe keys to the database. ... This should reduce a lot of the keys in redis.	2015-02-13 14:24:15 -05:00
Régis Hanol	86c7071559	remove all calls to the distributed mutex in emojis	2015-02-13 19:34:24 +01:00
Régis Hanol	324a3da723	remove distributed mutex for emojis (not working)	2015-02-13 19:26:26 +01:00
Robin Ward	96c19ed8b6	UX: Add a dash for the empty cell. ... "Active Users" for "All Time" doesn't make sense.	2015-02-13 11:27:31 -05:00
Robin Ward	ae5d540f36	Merge pull request #3200 from techAPJ/update-translations ... Update Translations	2015-02-13 10:52:50 -05:00
Régis Hanol	2a3ceb84de	FIX: category background in topic views	2015-02-13 15:52:56 +01:00
Arpit Jalan	439f13b040	Update Translations	2015-02-13 19:37:41 +05:30
Jeff Atwood	a5a3f103f6	Merge pull request #3198 from awesomerobot/master ... category box alignment fix	2015-02-12 21:16:10 -08:00
Kris Aubuchon	f6035411c9	box category alignment fix	2015-02-12 23:24:07 -05:00
Neil Lalonde	f62c0db162	Version bump to v1.2.0.beta8	2015-02-12 18:30:43 -05:00
Sam	cd0fa12562	FIX: downgrade pg to stop memory leak	2015-02-13 10:10:15 +11:00
Neil Lalonde	a69cb90a90	Version bump to v1.2.0.beta7	2015-02-12 16:34:40 -05:00
Robin Ward	a519fd5bcf	FIX: Highlighting was not being applied after some rendering. ... Also includes a bunch of ES6 stuff.	2015-02-12 15:37:02 -05:00
Robin Ward	96697c7957	Let's remove the Singleton usage of SiteSettings from Sharing	2015-02-12 13:51:19 -05:00
Robin Ward	1eecd7418e	FIX: Return sharing sources in the same order as the site setting	2015-02-12 13:03:32 -05:00
Robin Ward	6c65162b05	FIX: Title could temporarily revert to the site name	2015-02-12 12:28:54 -05:00
Neil Lalonde	ae2f861101	FEATURE: import scripts update last_seen_at on users based on created date and last post date	2015-02-12 12:25:01 -05:00
Régis Hanol	7b8c7ff3ef	FIX: sub-categories with the same name had the same background image	2015-02-12 18:21:07 +01:00
Robin Ward	8ec4d07bf2	Minor refactoring to help with Tags RSS	2015-02-12 11:53:21 -05:00
Robin Ward	e207ca36ee	Easier helper for filtering secured categories	2015-02-12 11:52:59 -05:00
Sam	5f8e604abc	remove an allocation	2015-02-12 15:07:17 +11:00
Sam	276fd702e8	missed a send which caused code to break	2015-02-12 15:01:14 +11:00
Sam	ab3d4471fe	PERF: remove eval cause it is costing lots of memory ... see: http://tenderlovemaking.com/2013/03/03/dynamic_method_definitions.html isolated via memory profiler gem.	2015-02-12 14:44:40 +11:00
Sam	3c6aede1aa	using wrong var here	2015-02-12 14:40:07 +11:00
Sam	e96dbd6f06	Revert "Upgrade i18n gem" ... This reverts commit dde24c4ddb.	2015-02-12 12:11:49 +11:00
Sam	a5f46c98c1	PERF: only load locale files we are using ... We used to load up all translations in all languages	2015-02-12 12:08:14 +11:00
Sam	dde24c4ddb	Upgrade i18n gem	2015-02-12 12:05:19 +11:00
Sam	fce9e296e7	background reqs failed or not are always counted seperately	2015-02-12 09:47:46 +11:00
Neil Lalonde	fcae399481	fix my totally broken ApplicationRequest.stats method	2015-02-11 17:41:35 -05:00
Régis Hanol	9a637836d0	FEATURE: readonly safeguard	2015-02-11 21:50:17 +01:00
Régis Hanol	db53e022cc	FEATURE: prevent upload of more than 10 files at a time	2015-02-11 19:34:48 +01:00
Robin Ward	38fbdf65ef	FIX: Sometimes postChangedRoute could be triggered when torn down	2015-02-11 12:57:22 -05:00
Robin Ward	282476fdf9	FIX: Hide "error logs" logs from staff. Refactor admin menu HTML.	2015-02-11 11:53:06 -05:00
Régis Hanol	38279c79c9	Merge pull request #3196 from fantasticfears/discuz ... find more reply syntax during processing in discuzx importer	2015-02-11 09:57:25 +01:00
Sam	ca915e8ad7	correct issue under 2.0.0	2015-02-11 17:41:24 +11:00
Sam	9a59caf800	add regexp to reporting	2015-02-11 17:23:54 +11:00
Sam	e427d54191	FEATURE: show large objects in admin/memory_stats	2015-02-11 17:18:47 +11:00