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

257 commits

Author SHA1 Message Date
Tyler Renelle
302340bee2 [#1997] classes: add MP to restore dialog (@wc8 you might find this useful) 2013-12-16 13:38:23 -07:00
Tyler Renelle
a1590f7f3e classes: update some classes wording 2013-12-16 13:03:33 -07:00
Tyler Renelle
259f9033c4 APIv2: add paths /api/v2/* and /api/v1/*. v1 has limited deprecated routes (only the things I know currently work), and we'll notify 3rd-partyists to migrate to apiv2 once it's documented and tested 2013-12-15 17:54:34 -07:00
Tyler Renelle
bc0034f022 apiv2 handle notifications circular-dependency. migration 
fixes. Rest=>Sleep fixes
 2013-12-15 10:57:53 -07:00
Sabe Jones
68b2c8b6bc Add explicit cancel button to Fortify modal 2013-12-14 19:23:40 -06:00
Tyler Renelle
d2121a8587 fix(classes) misc fixes 2013-12-13 17:08:25 -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
Thibaut Girka
6604a36a9a Fix syntax error in jade file 2013-12-12 18:56:43 +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
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
c524972aa2 Merge pull request #1952 from HabitRPG/sabe/tweak 
Tweaks from Sabe
 2013-12-08 08:50:37 -08: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
680f0e974e mounts: bailey notif 2013-12-07 11:56:34 -07:00
Tyler Renelle
c51cdd0849 classes: proper handling of items on class-switch, un-equipping items, 
etc. Paves way for item-loss on death. See habitrpg-shared#acae9c3
 2013-12-06 15:41:58 -07:00
Tyler Renelle
8216828514 classes #943 reroll sets you on your new class's item track. Handling of two-handed staves 2013-12-06 10:51:23 -07:00
Tyler Renelle
5fd378ebed classes: fixes to beard / chin overlap 2013-12-05 11:05:36 -07:00
Tyler Renelle
dde0655900 classes: fixes to class-selection & reroll, remove show/hide gear since 
we're using costumes
 2013-12-04 23:53:55 -07:00
Tyler Renelle
decaa2867b classes: misc fixes. start a running migration file (add to, or add notes as we go along) 2013-12-04 17:50:40 -07:00
Tyler Renelle
88c64a6f80 classes & grunt-spritesmith: NPCs habitrpg-shared#85164c9 2013-12-04 16:52:06 -07:00
Tyler Renelle
8803df46c0 classes & grunt-spritesmith: death, paws, gems-cleanup 2013-12-04 16:02:08 -07:00
Tyler Renelle
19b6eb73e0 Merge branch 'develop' into classes 
Conflicts:
	public/css/index.styl
	src/models/user.js
	views/options/profile.jade
	views/shared/header/avatar.jade
	views/shared/tasks/lists.jade
	views/shared/tasks/task.jade
 2013-12-02 18:24:33 -07:00
Sabe Jones
37f7a923ea Fix #1934 (make Reset and Restore options more distinct) 2013-12-02 10:20:38 -06:00
Sabe Jones
af80548a34 Partial fix to #1938 (New name and location for Re-Roll) 2013-12-01 11:58:03 -06:00
Tyler Renelle
91c141140d classes: armory WIP 2013-11-30 16:33:21 -07:00
Tyler Renelle
db5befb570 thanksgiving turkey & npcs 2013-11-27 11:50:18 -07:00
Tyler Renelle
83e3a6aff2 classes WIP 2013-11-23 16:59:41 -07:00
Nick Gordon
4453ac9fb8 removed comments from testing. 2013-11-23 11:14:16 -08:00
Nick Gordon
52145a479e testing completed, committing test results in comments 2013-11-23 10:55:56 -08:00
Nick Gordon
40de2f3bf0 manual testing of bindonce commencing -____- 2013-11-23 09:26:39 -08:00
Nick Gordon
b431336463 more optimizations with bindonce, replacing ngIf with boIf. 
some of this was done with an axe rather than a fine brush, so there may be issues we need to be on the watch for.
 2013-11-22 15:16:24 -08:00
Sabe Jones
450e154948 On further thought, "Equipment" is better than "Gear." Also fixed a typo. 2013-11-17 10:01:27 -06:00
Sabe Jones
6cc41c47c7 Work on standardizing terminology 2013-11-17 09:36:38 -06:00
Tyler Renelle
4c3f04cc49 Merge branch 'mounts' into develop 
Conflicts:
	views/options/inventory/stable.jade
 2013-11-14 13:04:44 -08:00
Tyler Renelle
95c886eee8 Merge pull request #1811 from Fandekasp/update_contrib_link 
replace github contributing links → wikia link
 2013-11-13 23:26:19 -08:00
Adrien Lemaire
340590774c replace github contributing links → wikia link 2013-11-14 15:09:20 +11:00
Adrien Lemaire
2e0d83a9cb remove broken website field from profile 
Websites can be added with markdown in the blurb field
 2013-11-12 17:31:10 +11:00
Tyler Renelle
085919c000 mounts: update all html & javascript to support UserSchema overhaul (60421a8). Also add very basic feeding & saddling mounts functionality. use progress bars to indicate pet feeding progress 2013-11-10 11:04:41 -08:00
Tyler Renelle
20cac379cf pretty up our bailey notifs 2013-11-08 20:05:12 -08:00
Tyler Renelle
f868bcae66 contrib: more enticing bailey announcement 2013-11-08 19:42:13 -08:00
Tyler Renelle
14be0b11c6 contrib: add bailey announcement 2013-11-08 19:28:07 -08:00
Tyler Renelle
c0d36f13ef contrib: links to wikia in tavern & popup 2013-11-08 19:28:07 -08:00
Tyler Renelle
5f9d3991ac [#1766] remove "trigger next day" option 2013-11-08 13:54:29 -08:00
Matteo Pagliazzi
3a332c4c45 port beastMaster achievement, @lefnire shown client side but not set, using user.pre("save") for setting 2013-11-08 22:33:48 +01:00
Tyler Renelle
7c94b4b6d3 contrib: add contributor achievement modal 2013-11-07 13:42:29 -08:00
Tyler Renelle
7fe4f31a16 contrib: show profile._id in modal so admins can assign contrib status 2013-11-07 13:05:34 -08:00
Tyler Renelle
962cf9a3be contrib: add name-tag colors based on contributor level 2013-11-07 12:23:12 -08:00
Tyler Renelle
188db745fc allow users to trigger "missed day" manually from Restore modal 2013-11-05 17:43:43 -08:00
Tyler Renelle
74e4ef0414 add bailey for challenges 2013-11-01 17:18:14 -07:00
Tyler Renelle
931e8125b4 [#1693] make revive available to /options too 2013-10-31 09:34:12 -07:00
Tyler Renelle
219318b405 challenges: remove username(), since we're now using user.profile.name 2013-10-28 18:20:21 -07:00
Matteo Pagliazzi
a5af52a275 correctly award ultimategear achievement 2013-10-27 12:11:59 +01:00
Tyler Renelle
ef972bf70d [#1540] add restore option for streak achievement 2013-10-24 11:04:35 -07:00
Matteo Pagliazzi
20f2d75bbf add streak achievement notification 2013-10-23 17:57:02 +02:00
Tyler Renelle
5c4c4ae252 typo in donate page 2013-10-22 20:55:55 -07:00
Tyler Renelle
b90aadf7ab update bailey notif 2013-10-22 16:52:54 -07:00
Tyler Renelle
2c7fc72419 better modal indenting 2013-10-22 16:33:06 -07:00
Tyler Renelle
b3853800a3 remove Ultra Mega Update (since we've been live for a long time). Add 
bailey notif for halloween, update contrib gear wording as per @lemoness recommendation
 2013-10-22 16:28:13 -07:00
Tyler Renelle
b55cb1ccdb bailey update for skin tones, 0.0.10, selling drops. @lemoness this is 
the new format (jade), hit me offline for a tour
 2013-10-20 00:13:50 -07:00
Tyler Renelle
109d46b2ca paypal: fix to #1615 , explicitly set rm variable to avoid POST / on 
paypal redirect
 2013-10-13 16:05:18 -07:00
Matteo Pagliazzi
4e56df0e82 restore values saved only when Save is clicked 2013-10-13 19:58:13 +02:00
Tyler Renelle
a53725da14 gems: add to tutorial on drop unlock 2013-10-12 20:22:56 -07:00
Tyler Renelle
81f9f9b4c5 gems: justin in gem-purchase dialog 2013-10-12 20:01:18 -07:00
Tyler Renelle
f8328d3eeb paypal: add configurable merchant and sandbox/production environment 2013-10-12 19:22:06 -07:00
Tyler Renelle
5de0c928fe paypal: conslidate buy gems modals 2013-10-12 16:51:01 -07:00
Tyler Renelle
09cd132420 paypal: begin adding paypal alternative to credit-card payments 2013-10-12 15:24:35 -07:00
Tyler Renelle
35945f0a44 change bailey links to her twitter 2013-09-17 15:40:20 -04:00
Tyler Renelle
5006cda946 [#1394] fix customizationsNotification issue 2013-09-17 14:59:06 -04:00
Tyler Renelle
f26b0a2cf5 [#1394] add drop notifications back in 2013-09-17 12:16:16 -04:00
Matteo Pagliazzi
98fa007f36 do not trigger validation error on float number, fix #1463 2013-09-13 20:01:22 +02:00
Tyler Renelle
23045fb72f formatting 2013-09-09 19:12:16 -04:00
Tyler Renelle
20354c7d8a member-since and last-logged-in 2013-09-09 19:04:46 -04:00
Tyler Renelle
89fabc38cb add "member since" in modal 2013-09-09 18:56:46 -04:00
Tyler Renelle
e1828153dd [#1489] add edit-gropu server route, basic editing of group info for now (with markdown!) 2013-09-09 17:09:45 -04:00
Tyler Renelle
774fa4f645 use marked instead of showdown, it's more performant and allows us to 
sanitize the content
 2013-09-09 14:06:36 -04:00
Tyler Renelle
6e800ea2d9 use markdown for profile-editing. Add save button. will remove linky 
once everything's in markdown
 2013-09-09 13:27:25 -04:00
Tyler Renelle
a461bda7b8 [#1491] remove old.habit from bailey notif 2013-09-08 22:01:20 -04:00
Tyler Renelle
52b7935b88 [#1477] modal buttons bug-fix 2013-09-08 16:23:30 -04:00
Tyler Renelle
5c5212eb0e [#1477] add delete account 2013-09-08 15:17:49 -04:00
Tyler Renelle
f250a98fb7 [#1477] add reset account 2013-09-08 15:11:04 -04:00
Tyler Renelle
5e51148f8e [#1477] port settings modals to jade, implemented restore 2013-09-08 13:23:37 -04:00
Tyler Renelle
d7b21eb32a typo fixes 2013-09-08 10:17:27 -04:00
Matteo Pagliazzi
5bd9d5f9d3 fix 2013-09-08 12:15:36 +02:00
Matteo Pagliazzi
75613b0508 add word-wrap to member modal, linky and <a> for website 2013-09-08 12:13:55 +02:00
Matteo Pagliazzi
5d160c7f21 Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop 2013-09-08 11:59:35 +02:00
Tyler Renelle
69faa27f68 [#1465] bug fixes to achievements listing 2013-09-07 13:38:43 -04:00
Tyler Renelle
a930d536f6 [#1465] add in some more missing member modal info.. still feel like i'm missing something.. 2013-09-07 12:55:15 -04:00
Tyler Renelle
91d1cdf361 [#1465] add member modals back in. Not all info is present, just a bit more 
work. Can now click guild & tavern members! does lazy-loading of members
so we don't have to load all their information at once
 2013-09-07 12:45:39 -04:00
Matteo Pagliazzi
dfa8dcba57 fix 2013-09-07 18:10:24 +02:00
Tyler Renelle
883d63aaaf [#1426] final touches to bailey notifs. 2013-09-06 01:05:23 -04:00
Tyler Renelle
2f3da075f8 revive button name conflict! We gotta do somethign about shared/helpers 
exposed to the view
 2013-09-04 15:50:26 -04:00
Tyler Renelle
d7c6c15592 some more bailey updates 2013-09-04 13:13:23 -04:00
Tyler Renelle
e43740e939 update bailey notif 2013-09-03 20:08:49 -04:00
Tyler Renelle
c2829382e8 small bailey pudate 2013-09-03 18:53:50 -04:00
Tyler Renelle
3417e3a76b some NPC wording updates 2013-09-02 21:44:00 -04:00
Tyler Renelle
4790e8442a fix up general bailey notifs 2013-09-02 17:31:44 -04:00
Tyler Renelle
7f68fd017a rewrite: add big update notification, small bug fixes 2013-09-02 17:15:12 -04:00
Tyler Renelle
ef9e1f3444 rewrite: push login modal to the front page, don't allow anonymous 
usage.
 2013-09-02 01:08:28 -04:00
Tyler Renelle
488c5b3e64 rewrite: uhoh, controller scoping issues due to 
angular-bootstrap#0.4.0. We can't use 0.5.0 bacause it can't handle
nested tabs. we may have to scrap it altogether
 2013-08-29 23:57:00 -04:00
Tyler Renelle
b1b9728642 rewrite: beastmaster & drops-enabled modals (need to revisit & verify) 2013-08-29 19:11:07 -04:00
Tyler Renelle
39dc60ade6 api: be sure to flag user as modified if cron was run 2013-08-29 12:07:29 -04:00
Tyler Renelle
e568a5ba31 api & rewrite: buy gems, reroll, fully converted server to JS, bug fixes 2013-08-29 01:45:54 -04:00
Tyler Renelle
afb510fe84 rewrite & api: add reroll api route POST /api/v1/user/reroll. pretty bad 
interface on client for now since I can't get the UI to update, have to
refresh. will revisit. routes/api.coffee => routes/api.js
 2013-08-29 00:20:38 -04:00
Tyler Renelle
7b023cc00a rewrite: why-ads & more-gems modals 2013-08-28 14:30:44 -04:00
Tyler Renelle
9adb17510e rewrite2 basice read-only settings page 2013-08-27 22:56:07 -04:00
Tyler Renelle
4a0a1f7a21 rewrite add bailey alerts 2013-08-27 22:37:56 -04:00
Tyler Renelle
c9d3f6247d rewrite2 add customizations options 2013-08-27 21:54:11 -04:00
Tyler Renelle
7bfaac80a7 rewrite2 big one: add ngRoute for /#/tasks & /#/options. requires 2 
/partial routes on server. code cleanup & reorganization, remove a lot
of return statements (coffeescript compiled)
 2013-08-27 21:13:05 -04:00