sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-21 19:24:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4516 commits 3 branches 0 tags 1.6 GiB
Commit graph

4516 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matteo Pagliazzi
3f28d16478 refactor(bs3): add fixed height modals & panels 2014-02-09 16:25:10 +01:00
Matteo Pagliazzi
1a44c3cf0c refactor(bs3): css 2014-02-09 16:16:43 +01:00
Matteo Pagliazzi
5874941b94 refactor(bs3): inventory & misc 2014-02-09 12:32:12 +01:00
Cole Gleason
c5b2d28ef9 Merge pull request #2801 from lorian/beastmaster-count 
Fixes beastmaster to not count gryphons
 2014-02-08 22:32:09 -06:00
Lorian
322b257b72 Separated stable into dropped pets, quest pets, and rare pets, and made countPets only count the former. Made countMounts only count dropped and quest-hatched mounts, not rare mounts. 2014-02-08 16:57:28 -08:00
Matteo Pagliazzi
3447524d41 refactor(bs3): chat suggestions, revert 2014-02-09 00:44:39 +01:00
Tyler Renelle
e1240dde1d fix(missing-gems): remove ad-removal from script, since ads are part of subscription 2014-02-08 15:48:54 -07:00
Matteo Pagliazzi
1e3042a4b6 refactor(bs3): maybe fix for chat suggestions 2014-02-08 20:23:50 +01:00
Matteo Pagliazzi
46053cc520 refactor(bs3): spaces 2014-02-08 20:10:37 +01:00
Matteo Pagliazzi
f3c42f19ab refactor(bs3): hall form 2014-02-08 20:07:37 +01:00
Matteo Pagliazzi
5e98fa013d refactor(bs3): typo 2014-02-08 19:56:31 +01:00
Matteo Pagliazzi
b4be88f4e0 refactor(bs3): misc 2014-02-08 19:49:47 +01:00
Matteo Pagliazzi
9ea9ed841d refactor(bs3): buyQuest fix, add back badges colors, minor fixes 2014-02-08 19:20:10 +01:00
Matteo Pagliazzi
ee871ccb01 refactor(bs3): fixes 2014-02-08 16:58:41 +01:00
Matteo Pagliazzi
0fe0cb4f2d refactor(bs3): labels style and text, buttons classes 2014-02-08 16:27:34 +01:00
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