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

3847 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tyler Renelle
12cc6f51eb classes: reposition inventory, fix saddle confirm dialog, gems & food tweaks 2013-12-15 13:25:19 -07:00
Dušan Juretić
9f32d3e7b8 Fix userServicesSpecs by adding notificationServices 2013-12-15 16:49:53 -03:00
Tyler Renelle
774775de7a fixes: appliedTags, add moment to rootScope (repeat i18n issues). Also, 
discard the sync-queue if errors were detected. Previously, if an op
triggered server error, the op is still in the queue and will keep
trying. Thus, in-browser user is corrupt - they'll need to logout /
clear localStorage. This *should* fix that, while still allowing the
sync-queue to build up when offline (status appears to == 0 in those
cases). @paglias just FYI - should be good, but wanna loop you in just
in case.
 2013-12-15 12:11:25 -07:00
Tyler Renelle
bc0034f022 apiv2 handle notifications circular-dependency. migration 
fixes. Rest=>Sleep fixes
 2013-12-15 10:57:53 -07:00
Tyler Renelle
ae4ca337c8 Merge pull request #1949 from bobbyroberts99/develop 
Reposition Markdown formatting link
 2013-12-14 21:21:45 -08:00
Tyler Renelle
0f5afbedfb Merge pull request #1988 from HabitRPG/sabe/tweak 
Add explicit cancel button to Fortify modal
 2013-12-14 21:09:25 -08:00
Tyler Renelle
68155045d1 classes: Fix migration (some users had 1e+18+ for "restore user" values, causing script 
to crash). Default to skin_c06534
 2013-12-14 19:26:01 -07:00
Sabe Jones
68b2c8b6bc Add explicit cancel button to Fortify modal 2013-12-14 19:23:40 -06:00
Tyler Renelle
d1a34f570d customizations: migrate skins for more PCs, start building out migration 2013-12-14 16:12:41 -07:00
Bob Steffes
182a34ed7e Update footer FAQ to wiki 2013-12-14 10:59:45 -08:00
Tyler Renelle
26697546e8 classes: header z-index:100, generalized shop_money classes, only show 
owned gear if == true
 2013-12-14 11:34:41 -07:00
Tyler Renelle
dc348d5601 [#1969] add in @Fandekasp's shirts, had to do separate commit for handling of 
user.preferences.shirt
 2013-12-14 00:35:03 -07:00
Tyler Renelle
549add08ed classes: 2gems / new hair,beard,stache 2013-12-13 22:56:00 -07:00
Tyler Renelle
6ae14cc42f classes: misc fixes 2013-12-13 21:53:42 -07:00
Tyler Renelle
c85450db04 classes: add task attributes for point allocations 2013-12-13 17:50:43 -07:00
Tyler Renelle
d2121a8587 fix(classes) misc fixes 2013-12-13 17:08:25 -07:00
Tyler Renelle
9d9b8120cd classes: migrate priority from !,!!,!!! to Number (prep for passive stats) 2013-12-12 20:59:20 -07:00
Tyler Renelle
d9bef28c5d migrate flags.rest => preferences.sleep 2013-12-12 20:59:16 -07:00
Tyler Renelle
478be61113 fix(classes) misc class fixes (not @snicker, ng-if on item store since 
we dynamically swap it sometimes)
 2013-12-12 20:03:32 -07:00
Tyler Renelle
b5a4177719 separate saddle out to it's own market section 2013-12-12 18:38:05 -07:00
Tyler Renelle
6b0a6692ff [#1977] misc fixes 2013-12-12 17:38:01 -07:00
Tyler Renelle
caa2f26003 [#1977] [#1616] move sortTask to user.ops 2013-12-12 17:32:54 -07:00
Tyler Renelle
dc63eff41d [#1977] move sleep & clear-completed to user.ops 2013-12-12 16:59:53 -07:00
Tyler Renelle
d4e0ae85a0 [#1977] port pet-feeding to user.ops, so that it's now available in the API. Also add handling of 200 errors to simply notify and continue on up to server (friendly messages) 2013-12-12 15:58:17 -07:00
Tyler Renelle
4f44e8f2e1 Merge pull request #1982 from ThibG/develop 
Fix syntax error in jade file
 2013-12-12 09:59:17 -08:00
Thibaut Girka
6604a36a9a Fix syntax error in jade file 2013-12-12 18:56:43 +01:00
Tyler Renelle
fe6bb48dce Merge pull request #1981 from ThibG/develop 
Fix mongoose query
 2013-12-12 09:21:03 -08:00
Thibaut Girka
f9489b3385 Fix mongoose query 
This caused an "Invalid sort() argument." error when accessing groups.
 2013-12-12 14:47:55 +01:00
Tyler Renelle
ee1cd3c05d [#1977] APIv2 WIP - start of a framework where operations are shared 
between client & server. If the op is called on the client, it updates
the user & then POSTs to the server with op of the same name. If called
on server, it updates the user and user.save()s
 2013-12-11 21:42:57 -07:00
Adrien Lemaire
842f0de838 Merge pull request #1979 from SyntaxPickax/patch-1 
Fixed Windows & UNIX path separators
 2013-12-11 13:59:17 -08:00
Tyler Renelle
4e9b3f8522 fix 4323443 [#1977] thanks @toote 2013-12-11 08:54:54 -07:00
Brandon McPhail
4e86f7a852 Fixed Windows & UNIX path separators 
Windows: node .\src\seed.js
UNIX: node ./src/seed.js

The readme had it backwards.
 2013-12-10 18:01:27 -08:00
Tyler Renelle
4323443dbd [#1977] stricter PUT /user set-path validation, require they're setting on a 
leaf-path (except for tasks.* - we still need to handle that properly)
 2013-12-10 09:10:00 -07:00
Sabe Jones
847f090b7a Remove "yet" from no-food message 
Fix pet peeve :trombone:
 2013-12-08 21:25:34 -06:00
Tyler Renelle
b6fceaca1b fix some tavern links 2013-12-08 19:55:49 -07:00
Tyler Renelle
108d852d12 remove reroll from tasks/lists.jade 2013-12-08 19:04:18 -07:00
Tyler Renelle
81dc41e177 classes: use habitrpg-shared#develop for current production 
feature-freeze & classes feature sprint (@paglias @Fandekasp we're good
to go on translations et all now)
 2013-12-08 18:21:28 -07:00
Tyler Renelle
76565384d3 Merge branch 'classes' into develop 
Conflicts:
	public/js/controllers/tasksCtrl.js
	views/shared/modals/settings.jade
 2013-12-08 18:17:53 -07:00
Tyler Renelle
a3d2e59033 Merge pull request #1971 from Xatres/develop 
Updated Beginner's Tour, Mk 5
 2013-12-08 16:55:45 -08:00
Xatres
af82ff520c Updated Beginner's Tour, Mk 5 
Fixed Wiki link (double quotes --> single quotes)
 2013-12-08 18:59:38 -05:00
Tyler Renelle
4f64483c4e Merge pull request #1964 from Omnomnobot/patch-1 
Fixed small translation errors
 2013-12-08 09:28:58 -08:00
Tyler Renelle
542c72c95c Merge pull request #1957 from Xatres/develop 
Updated Beginner's Tour
 2013-12-08 09:01:11 -08:00
Tyler Renelle
c524972aa2 Merge pull request #1952 from HabitRPG/sabe/tweak 
Tweaks from Sabe
 2013-12-08 08:50:37 -08:00
Tyler Renelle
4d3a359d6b fixes to sabe/tweak #1952 @SabreCat (put gems inline with fortify 
button, remove reroll from store)
 2013-12-08 09:46:30 -07:00
Xatres
8283eca0d4 Updated Beginner's Tour, Mk 4 
Added link to HabitRPG wiki.
 2013-12-08 09:54:36 -05:00
Tyler Renelle
714dad6e91 classes: small bug fixes 2013-12-07 20:41:48 -07:00
Tyler Renelle
f8f8a1334b Merge branch 'develop' into classes 
Conflicts:
	views/options/inventory/stable.jade
 2013-12-07 20:23:26 -07:00
Tyler Renelle
a85baa2725 groups: send down full user.items for party / guilds. It's not that much 
really, and trying to keep it up-to-date with ever-evolving
UserSchema.items is a pain (eg, needed to add mounts)
 2013-12-07 19:53:50 -07:00
Tyler Renelle
46f91db14c Mounts: prevent feeding special pets 2013-12-07 13:54:19 -07:00
Tyler Renelle
8f75b84b42 mounts: bugfix to drop notif for food 2013-12-07 12:17:03 -07:00