4501 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Matteo Pagliazzi	c8639c178d	Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop	2014-02-08 15:31:43 +01:00
Tyler Renelle	313ec3d869	Merge branch 'develop' into bs3 ... Conflicts: views/options/social/tavern.jade	2014-02-07 23:41:14 -07:00
Tyler Renelle	982f194c85	Merge pull request #2791 from lorian/security-error ... Made incorrect username and password show the same error, for security purposes	2014-02-07 22:29:43 -07:00
Tyler Renelle	7fbd84afd9	chore(angular): upgrade 1.2.1 => 1.2.11	2014-02-07 22:20:26 -07:00
Lorian	8d03cfc6b5	Made incorrect username and password show the same error, for security purposes.	2014-02-07 21:08:13 -08:00
Tyler Renelle	5db96ebca2	fix(bs3): port pet feeding bar	2014-02-07 21:57:26 -07:00
Tyler Renelle	37340d2318	fix(mounts): fix pets & mounts css to position the user based on ... pet/mount equip	2014-02-07 21:48:11 -07:00
deilann	25941623b1	putting in issue ticket ... correctly putting in issue ticket for "report a bug"	2014-02-07 17:44:56 -08:00
Tyler Renelle	3473b73452	chore(Merge): branch 'develop' into bs3 ... Conflicts: views/options/inventory/inventory.jade	2014-02-07 17:42:12 -07:00
Tyler Renelle	00c8a7f757	chore(cluster): max 2-core	2014-02-07 14:18:04 -07:00
Tyler Renelle	e404f35705	Revert "chore(cluster): temporarily disable cluster (revert here)" ... This reverts commit e36d3264be.	2014-02-07 14:17:48 -07:00
Tyler Renelle	ef3e1396cb	Revert "chore(bower): strange temporary fix. Can't remember where I picked this" ... This reverts commit 2d4d103ca6.	2014-02-07 13:55:39 -07:00
Tyler Renelle	5d0ef55429	chore(bailey): update with stability info & subscriber links	2014-02-07 13:43:41 -07:00
Matteo Pagliazzi	2807b3f87d	chore(logging): remove console.log	2014-02-07 21:08:46 +01:00
Tyler Renelle	677d23939d	chore(bailey): add images for previous commit	2014-02-07 11:53:01 -07:00
Tyler Renelle	82241634b3	chore(bailey): bailey re: rainbow hair, critical hammer, mystery item	2014-02-07 11:42:05 -07:00
Tyler Renelle	00af5f7d02	feat(bug-crushing): add the critical hammer of bug-crushing	2014-02-07 11:41:50 -07:00
Tyler Renelle	d034262834	feat(premium): subscriber mystery item (doesn't yet do anything)	2014-02-07 11:40:34 -07:00
Tyler Renelle	82d9233d99	feat(rainbow-hair): add rainbow hair colors	2014-02-07 10:01:31 -07:00
Tyler Renelle	e24d7476e8	refactor(errors): remove more res.json(500) in favor of next(err)	2014-02-07 09:20:40 -07:00
Tyler Renelle	ce8351d622	chore(Merge): branch 'develop' into origin-paglias-bs3 ... Conflicts: views/options/social/tavern.jade	2014-02-07 00:03:33 -07:00
Tyler Renelle	106a7fa475	refactor(errors): refactor the way errors, offline, & queued ops are handled	2014-02-06 21:10:13 -07:00
Tyler Renelle	e36d3264be	chore(cluster): temporarily disable cluster (revert here)	2014-02-06 20:12:52 -07:00
Tyler Renelle	f7ded9d690	chore(logging): remove console.log(isStaticPage)	2014-02-06 13:28:19 -07:00
deilann	66c7f48e2b	updating LFG ... Updating Looking for Group to the proper (not dead) link.	2014-02-06 11:37:35 -08:00
Tyler Renelle	55c28cbe52	chore(domain-middleware): back to real module version	2014-02-06 11:01:38 -07:00
Tyler Renelle	2837edd51f	chore(cluster): use domain-middleware properly, so domains are used to restart cluster workers	2014-02-06 10:58:47 -07:00
Matteo Pagliazzi	d313a46299	refactor(bs3): push footer down	2014-02-06 18:46:43 +01:00
Matteo Pagliazzi	d6b3279e5c	refactor(bs3): misc fixes	2014-02-06 18:35:12 +01:00
Matteo Pagliazzi	e4bd817443	refactor(bs3): sync with develop	2014-02-06 17:36:33 +01:00
Matteo Pagliazzi	90e9a1aeaa	i18n(refactor): load all files in a locale, not the ones defined in app.json, move env.t client code to own file, add env.isStaticPage (from isFrontPage)	2014-02-06 17:17:21 +01:00
Matteo Pagliazzi	01c4c4498a	Merge pull request #2762 from Sinza-/develop ... Replace hard-coded strings for window.env.t on js files	2014-02-06 16:36:31 +01:00
Matteo Pagliazzi	b6edc28b14	refactor(bs3): merge develop	2014-02-06 16:19:51 +01:00
Tyler Renelle	e268839bcb	chore(throttling): lower api limit a tad, just to test	2014-02-05 21:33:24 -07:00
Tyler Renelle	0c21f54c67	fix(user): make sure next is passed to all routes, and is available in ... err-back of batch updates	2014-02-05 21:28:46 -07:00
Tyler Renelle	4c3c4b2ae7	perf(user): save user.save till very end of ops queue	2014-02-05 21:22:25 -07:00
Tyler Renelle	bf5e9016a4	fix(errors): return next(err) when experiencing errors, instead of res.json(500,{err:err}). Let the top-level error handler handle this (needed for upcoming versionerror discarding)	2014-02-05 17:28:59 -07:00
Marcelo Sizer	386d108c3c	Replace hard-coded strings for window.env.t on js files	2014-02-05 20:43:49 -02:00
deilann	908a5a2408	updating tavern link to new issue ticket ... Explains how Github works. Should reduce number of dupe tickets.	2014-02-05 13:07:56 -08:00
Matteo Pagliazzi	4ce2dfd60d	refactor(bs3): remove unused bootstrap-datepicker from bower	2014-02-05 20:23:10 +01:00
Matteo Pagliazzi	3d1ee31856	refactor(bs3): remove unused bootstrap-datepicker from bower	2014-02-05 20:19:09 +01:00
Matteo Pagliazzi	5b9bbb9729	refactor(bs3): settings	2014-02-05 19:54:50 +01:00
Matteo Pagliazzi	0cc31465ed	refactor(bs3): challenges	2014-02-05 19:39:26 +01:00
Matteo Pagliazzi	5d4d82ad51	refactor(bs3): port options (profile, inventory, social (groups and hall)) and misc	2014-02-05 19:05:42 +01:00
Matteo Pagliazzi	ce5edbee58	refactor(bs3): consistent style for modals	2014-02-05 16:51:35 +01:00
Matteo Pagliazzi	055fa82428	Merge branch 'develop' into paglias/bs3	2014-02-05 15:44:58 +01:00
Sabe Jones	3fda08c366	fix(nodemon): Add another ignore for weirdsauce Windoze dev environments	2014-02-04 22:39:08 -06:00
Matteo Pagliazzi	ccc1230828	refactor(bs3): misc	2014-02-04 22:21:12 +01:00
Matteo Pagliazzi	d711d61a1f	refactor(bs3): re-enable two columns views for tablets	2014-02-04 21:54:19 +01:00
Matteo Pagliazzi	c663221229	refactor(bs3): misc fixes, use bootstrap own grid for tasks lists	2014-02-04 21:27:05 +01:00