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
3916 commits 3 branches 0 tags 1.6 GiB
Commit graph

271 commits

Author SHA1 Message Date
Tyler Renelle
7c20988c41 Merge branch 'thanksgiving' into develop 2013-11-27 11:53:18 -07:00
Tyler Renelle
db5befb570 thanksgiving turkey & npcs 2013-11-27 11:50:18 -07:00
Tyler Renelle
962b854f87 Merge remote-tracking branch 'origin/sabe_tweak' into develop 
Conflicts:
	views/options/social/tavern.jade
 2013-11-27 11:28:31 -07:00
Tyler Renelle
aca122d6de fix up CONTRIBUTING.md, update "submit bugs" links with this change 2013-11-26 17:09:13 -07:00
Nick Gordon
86f62ac2b2 fix for #1920, again. this is very 'un-angular' but it *actually* works. the proper way to do this is make a directive for 'userlevel' or something and have that apply the proper styles 2013-11-26 14:56:24 -08:00
Nick Gordon
15f3907f00 fix for #1920 2013-11-26 11:51:21 -08:00
Matteo Pagliazzi
d1240473dd use bindonce for days of the week, thanks @snicker! 2013-11-25 17:38:07 +01:00
Matteo Pagliazzi
a47a32dbd6 translate days of the week, @snicker here I would like to use bo-text but does not work 2013-11-25 17:30:35 +01:00
Sabe Jones
780b0a3593 Change Markdown help link to point at HabitRPG wiki 2013-11-24 13:13:21 -06:00
Tyler Renelle
83e3a6aff2 classes WIP 2013-11-23 16:59:41 -07:00
Adrien Lemaire
47cf0eb07d add npc color, update leader background 2013-11-24 10:49:33 +11:00
Tyler Renelle
33c2c1db2d Merge pull request #1888 from HabitRPG/sabe_tweak 
Fix matters of colons
 2013-11-23 14:45:45 -08:00
Tyler Renelle
c5a42cbf5a Merge pull request #1899 from Fandekasp/header_colors 
change avatars lvl colors
 2013-11-23 13:12:36 -08: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
Matteo Pagliazzi
df5a436338 use countPets also for stats, fix #1898 2013-11-23 17:42:47 +01:00
Sabe Jones
0d6f3dd5e6 Make number format consistent between current exp and exp TNL (fix #1827) 2013-11-23 09:46:28 -06:00
Adrien Lemaire
d4b25fdc5f change avatars lvl colors 2013-11-24 01:04:27 +11:00
Sabe Jones
983df5c97c Fix matters of colons: missing space after colon in stats, colon getting placed after tags in task tag list. 2013-11-23 06:54:00 -06:00
Nick Gordon
90582c3709 more bindonce rollbacks... bo-if seems to work sometimes, othertimes not 2013-11-22 22:57:41 -08:00
Nick Gordon
dfb09b1f9b Yeah, this didn't work with the achievements popup, because the same template is used for anyone's modal 2013-11-22 15:59:53 -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
Nick Gordon
0d19c0de21 Looked for opportunities to replace ngclass with boclass to improve performance, as well as replacing some instances of ng-if with bo-if 2013-11-22 14:40:44 -08:00
Sabe Jones
e458b571dc Move stat formulae to mouseover popup instead of inline 2013-11-21 20:37:55 -06:00
Adrien Lemaire
0ce0823de4 update ui to test hidable gears 2013-11-19 11:22:41 +11:00
Tyler Renelle
fc352ec2c4 [#1732] temporarily allow restore-streak on challenge tasks 2013-11-17 22:23:22 -07:00
Tyler Renelle
a262828e09 Merge pull request #1847 from HabitRPG/sabe_tweak_3 
Work on standardizing terminology
 2013-11-17 12:22:40 -08:00
Matteo Pagliazzi
7d5da13f6d small performance fix 2013-11-17 21:20:43 +01: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
2b286ba889 [#1821] [#1723] fix pet counters (incl for member modals) 2013-11-15 17:51:00 -08:00
Tyler Renelle
4c3f04cc49 Merge branch 'mounts' into develop 
Conflicts:
	views/options/inventory/stable.jade
 2013-11-14 13:04:44 -08:00
Filippos
cbc1185f00 Added 'icon-ok' as an upper save button 2013-11-14 15:01:58 +02:00
Tyler Renelle
10e9c205e6 Merge branch 'translations' into develop 
Conflicts:
	locales/bg/app.json
	locales/nl/app.json
 2013-11-13 23:37:29 -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
Tyler Renelle
aad8f80c9d Merge pull request #1795 from Fandekasp/remove_website 
remove broken website field from profile
 2013-11-13 23:09:27 -08:00
Adrien Lemaire
340590774c replace github contributing links → wikia link 2013-11-14 15:09:20 +11:00
Matteo Pagliazzi
7eaed0348f git merge Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into translations 2013-11-12 14:54:17 +01:00
Matteo Pagliazzi
1d9148eebb move middleware.locals only where it is needed and transform it into a common function, simplify translations and adds automatic language detection 2013-11-12 14:49:01 +01: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
dda3670d03 mounts: only show mount head in stable (fix later), use egg.mountText 
for grown mount popovers. replace pet/mount tooltips with popovers
 2013-11-11 13:50:11 -08:00
Matteo Pagliazzi
b6adc8e1d8 translations try 2013-11-11 22:30:38 +01:00
Tyler Renelle
86f47cb6f1 halloween: remove "last day" bailey notif 2013-11-11 08:30:51 -08:00
Tyler Renelle
72f64fa85c [#1751] /challenges/:cid/:mid task filtering by "in this challenge" at 
application level, not Mongo. $elemMatch doesn't support returning
multiple items, see http://goo.gl/MxmWdQ & http://goo.gl/Iku44w
 2013-11-10 23:41:42 -08:00
Tyler Renelle
9fbb45c253 halloween: bailey notif for last day of spooky skins 2013-11-10 18:13:22 -08:00
Tyler Renelle
cd79649100 mounts: fix isUser class bringing user too far down. Fix initial drop bug. Remove items.currentPet if turned into mount 2013-11-10 13:43:11 -08: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
Matteo Pagliazzi
e711258ced advanced options not shown for rewards, shown but not editable for challenges 2013-11-10 17:35:29 +01: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
Matteo Pagliazzi
4a1ed7006e remove comment 2013-11-08 17:49:30 +01:00
Matteo Pagliazzi
daac0a4b04 show but disable challenge daily days, fix #1758 2013-11-08 17:42:45 +01:00
Matteo Pagliazzi
d419db68f2 typo, fix #1761 2013-11-08 17:23:17 +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
8646783aa1 contrib: equipped functions to use habitrpg-shared@959024d 2013-11-06 17:16:17 -08:00
Tyler Renelle
22b70b9a0a add message about clearing completed todos if length>100 2013-11-05 18:40:23 -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
2c2613ce42 allow editing tag & task.tag even if in challenge 2013-11-05 09:49:01 -08:00
Tyler Renelle
87bc7fd722 [#1710] fix to party-in-header 2013-11-01 20:32:43 -07:00
Tyler Renelle
62b2d5780b [#1710] some simplification on Groups memoization. No need for all that 
special handling of Header Party, just have it's own controller and do
specific-handling. Also, removing MenuCtrl & StatsCtrl - they weren't
used TMK, I think twas a vestige of mobile. @paglias give that a gander
 2013-11-01 20:15:04 -07:00
Tyler Renelle
74e4ef0414 add bailey for challenges 2013-11-01 17:18:14 -07:00
Tyler Renelle
7037e1c8eb [#1672] don't allow clicking checkboxes on challenge-editing page 2013-11-01 10:20:14 -07:00
Tyler Renelle
907f8792a6 [#1678] dont' show tag editor when challenge-editing 2013-11-01 09:58:22 -07:00
Tyler Renelle
37027ac874 [#1672] assign tasks.id = tasks._id for challenges, fixes html ids & for lables 2013-11-01 09:48:22 -07:00
Tyler Renelle
d8218927e5 add debug buttons back in, including +10 gems (@sabrecat) 2013-10-31 15:14:19 -07:00
Tyler Renelle
d5e78266e5 challenge prize: various fixes. Woo, challenge prizes work now! 
@sabrecat @lemoness @wc8 (still some bugs & cleanup, but it's mostly there)
 2013-10-31 14:06:18 -07:00
Tyler Renelle
9d15e724e2 challenge prize: award winner 1 achievement and challenge.prize 
gems. then close challenge.
 2013-10-31 13:49:31 -07:00
Tyler Renelle
931e8125b4 [#1693] make revive available to /options too 2013-10-31 09:34:12 -07:00
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