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

246 commits

Author SHA1 Message Date
Matteo Pagliazzi
fc10e9d6e6 move party.removeSelf to client side 2013-10-31 15:41:22 +01:00
Tyler Renelle
ff3266bac8 get rid of ngRoute completely, depend on ui-router instead 2013-10-30 10:31:36 -07:00
Tyler Renelle
d116ac7b81 challenges: lots of misc. bug fixes 2013-10-29 22:30:58 -07:00
Tyler Renelle
6e71a76e22 challenges: back to dealing with taskLists from scopes, rather than the 
habitrpg-tasks directive. Was having trouble accessing it by reference
otherwise. Would love to move off of the directive entirely and use
ng-include instead, but some scope issues with lists
 2013-10-29 19:07:39 -07:00
Tyler Renelle
77fee06fdb gMerge branch 'challenges' into develop 
Conflicts:
	migrations/20131028_cleanup_deleted_tags.js
	src/controllers/groups.js
	views/options/groups/group.jade
	views/options/profile.jade
 2013-10-29 15:38:47 -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
f5777dc0d0 remove donate button from front page, fix #1617 2013-10-28 21:31:44 +01:00
Tyler Renelle
f178eb2322 challenges: better lock-down on member's tasks (remove actionable items 
except stats)
 2013-10-28 11:34:08 -07:00
Tyler Renelle
a078889d58 challenges: sync score to challenge, lotsa bug fixes 2013-10-28 11:34:07 -07:00
Tyler Renelle
e52d0a156a challenges: better syncing of new, updated, & deleted tasks from 
challenge to user. start with task.challenge.broken code
 2013-10-28 11:34:07 -07:00
Tyler Renelle
d60a56432f challenges: better unlinkig of tasks on unsubscribe 2013-10-28 11:34:07 -07:00
Tyler Renelle
e45d8307e7 Subdocs & script templates. Migrate the API from User.tasks => 
User.habits/dailys/todos/rewards. Move /#/tasks & /#/options page
loading from server-sent html to everything loaded in the page as script
templates (including necessary fixes for adsense). NOTE: this commit
won't work, it depends a bit on the *next* commit with Challenges
functionality, but I wanted to separate it out a bit for clarity
 2013-10-28 11:34:07 -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
Matteo Pagliazzi
f56b76b5ae Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop 2013-10-23 16:38:37 +02:00
Matteo Pagliazzi
0c7ba32c6b fix #1635 2013-10-23 16:38:05 +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
cef8431af0 charts: port toggleChart back in (functional, but it's not getting the 
right width)
 2013-10-19 16:15:48 -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
890e8bf8b3 gems: can click main gem button, doens't require [+] 2013-10-12 20:08:06 -07:00
Tyler Renelle
81f9f9b4c5 gems: justin in gem-purchase dialog 2013-10-12 20:01:18 -07:00
Tyler Renelle
b4e5a1925b add donate button 2013-10-12 19:47:40 -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
Matteo Pagliazzi
f816947b8e update blog link 2013-09-20 19:50:56 +02: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
d432397c27 [#1514] missing veteran achievement 2013-09-12 16:42:48 -04:00
Matteo Pagliazzi
dc96df43cc add margin-right to all .btn, typo in stylus, add build to .nodemonignore 2013-09-11 20:36:57 +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
3929c789d1 [#1479] fix to modals showing your own achievemetns (controller-scoping issue) 2013-09-09 10:30:17 -04:00
Tyler Renelle
a461bda7b8 [#1491] remove old.habit from bailey notif 2013-09-08 22:01:20 -04:00
Tyler Renelle
fb2f048890 add mobile links to footer 2013-09-08 19:11:08 -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
aad034564e [#1459] add profile-editing (note, it requires bluring the input fields for 
changes to go through - this is a pretty assuming solution, but I doubt it
will cause problems)
 2013-09-08 12:28:06 -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
a960d310f7 [#1465] allow clicking self for modal 2013-09-07 13:59:49 -04: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
872b834f07 rewrite: add sync button, menus now update when switching b/w options / tasks 2013-09-01 19:41:17 -04:00
Tyler Renelle
6efd789e6d rewrite: fix user avatar stats 2013-09-01 13:55:45 -04:00
Tyler Renelle
3ba4330dfc rewrite: misc bug fixes 2013-09-01 13:44:52 -04:00
Tyler Renelle
bc4798b354 groups: big changes here i may decide to revert. GET /api/v1/groups 
optionally takes ?type=guilds (guilds, party, tavern, public). this
allows us to incrementally load the app as they click through the tabs,
because guilds is really large (1.5mb!) - gotta cut this down
somehow. The big issue is requireing return values as an array, so
ngResource can work with the response (subsequent group.$postChat(),
group.$join(), etc.). The array format doesn't really work out that
well, so I may scrap
 2013-08-31 22:59:35 -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
10b0c9f9a5 api & rewrite: implement clear-completd at POST /api/v1/user/clear-completed 2013-08-28 22:51:45 -04:00
Tyler Renelle
2219068fad api & rewrite: add party members! need to optimize! 2013-08-28 22:08:59 -04:00
Tyler Renelle
de7b46b14d rewrite: fix show/hide header 2013-08-28 19:11:29 -04:00
Tyler Renelle
42f4e6f69c rewrite: add achievements 2013-08-28 16:04:17 -04:00
Tyler Renelle
7b023cc00a rewrite: why-ads & more-gems modals 2013-08-28 14:30:44 -04:00
Tyler Renelle
7fba8db654 rewrite: add footer deferrred scripts, plus middwlare for sending node 
envs to jade
 2013-08-28 12:53:55 -04:00
Tyler Renelle
ddf3cd3ac9 rewrite: fix gh-btns issue 2013-08-28 00:47:21 -04:00
Tyler Renelle
e355627bf0 rewrite: add footer 2013-08-28 00:20:50 -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
Tyler Renelle
4a372bfc98 rewrite2 add death 2013-08-25 21:40:14 -04:00
Tyler Renelle
f37c7b434a rewrite2 fix avatar, reroll, tooltips, etc 2013-08-25 20:39:47 -04:00
Tyler Renelle
176a5a3583 rewrite2: avatar working. need to revisit avatar:avater, make sure I got everything 2013-08-25 09:12:25 -04:00
Tyler Renelle
3c45220e1f rewrite2 WIP 2013-08-24 23:54:08 -04:00