Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,048 Commits 64 Branches 1,256 Tags
34fedca239c2bb5c2a52c4db38be9dcf415e3c9f
Commit Graph

307 Commits

Author SHA1 Message Date
Matteo Pagliazzi 23c3bcfa32 add ability to group leader to remove members, fix #1639 2013-10-28 17:10:29 +01:00
Matteo Pagliazzi 9e21974108 revert previous commit, reload after party invite accept 2013-10-28 16:24:40 +01:00
Matteo Pagliazzi e8173a4962 remove need to refresh after having accepted party invite 2013-10-28 16:21:53 +01:00
Matteo Pagliazzi cd97cc1e24 hotfix for streak bonus being given when selling item for gold 2013-10-27 13:44:04 +01:00
Matteo Pagliazzi 24f3ba7b5c fix for gems not removed after guild creation, fix #1186 2013-10-27 13:03:03 +01:00
Matteo Pagliazzi a5af52a275 correctly award ultimategear achievement 2013-10-27 12:11:59 +01:00
Tyler Renelle 5d14a1811f Merge pull request #1637 from ozymandiasthegreat/manual-due-date 
Manual due date
 2013-10-24 12:45:42 -07:00
Tyler Renelle ef972bf70d [#1540] add restore option for streak achievement 2013-10-24 11:04:35 -07:00
Matteo Pagliazzi 1f8915f5de add api.deleteTag to batch update operations 2013-10-24 18:21:34 +02:00
Matteo Pagliazzi 211433858c correctly remove tag from task 2013-10-24 17:50:35 +02:00
Matteo Pagliazzi 715e4e42a5 remove console.log 2013-10-24 17:50:24 +02:00
J. Ozymandias Fallick 22b429242f Merge remote-tracking branch 'upstream/develop' into manual-due-date 2013-10-23 14:34:36 -04:00
Tyler Renelle b23ce8426b fix to editing profile: "TypeError: Cannot call method 'toString' of undefined" 2013-10-23 10:25:43 -07:00
Matteo Pagliazzi fe52731393 fix small error on startup 2013-10-23 18:49:14 +02: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 44cb797063 migrate: flags.ads -> purchased.ads (boolean); flags.newStuff to boolean 2013-10-22 18:50:50 -07:00
Tyler Renelle c40697761b halloween: fix to transient skin set 2013-10-22 18:16:23 -07:00
Tyler Renelle f59d5b056c Merge branch 'halloween' into develop 2013-10-22 17:57:57 -07:00
Tyler Renelle e7886e00b4 halloween: highlght limited skins, add description about limited, rename 
to "rainbow" and "spooky" @lemoness
 2013-10-22 17:56:46 -07:00
Tyler Renelle 2c7fc72419 better modal indenting 2013-10-22 16:33:06 -07:00
Tyler Renelle a1959a9beb halloween: use halloween npcs habitrpg-shared@0ffd265 2013-10-22 16:20:37 -07:00
Tyler Renelle 534a761875 remove customizer css, moved to habitrg-shared@06e489d 2013-10-22 16:19:54 -07:00
Tyler Renelle ec50c7d0ec halloween fix to 401 error 2013-10-22 14:46:58 -07:00
Tyler Renelle 6f32ac2a24 halloween: purchase full set 2013-10-22 13:59:30 -07:00
Tyler Renelle 619c00fb5c halloween: some unlocking bug fixes (appears a markModified was required) 2013-10-22 13:37:55 -07:00
Tyler Renelle d184237c79 halloween: begin adding mechanic for the special skins 2013-10-22 13:24:31 -07:00
Matteo Pagliazzi 18c06b5043 user top right button should not cover notifications, they can be closed with a click on the "x" 2013-10-21 20:44:31 +02:00
Matteo Pagliazzi c4882942d6 fix chart shown below task edit form 2013-10-21 20:41:19 +02:00
Tyler Renelle 2cf814acd6 drops: description on combining eggs/potions, selling to 
alex. de-selectable drops. sell in a button of alex's dialog
 2013-10-19 23:44:03 -07:00
Tyler Renelle e4f2a4386d eggs: bug fixes on selling potions 2013-10-19 20:22:12 -07:00
Tyler Renelle c882525150 eggs: add ability to sell potions / eggs 2013-10-19 20:04:26 -07:00
Tyler Renelle 017398eb83 eggs: some cleanup and passing around of $index so we can retrieve 
egg/pot value
 2013-10-19 19:58:11 -07:00
Tyler Renelle 378d158a44 pegs: restructure inventory/market html so we market is aware of 
inventory and we can sell items
 2013-10-19 19:36:59 -07:00
Tyler Renelle be624a03b0 pets: basic framework for selecting both eggs & potions. now it shows which is hatchable with green background, setting up for selling eggs 2013-10-19 19:30:39 -07:00
Tyler Renelle c52bbc8f0d graphs: hack 300px width on charts because I can't figure out how to 
make 100% work
 2013-10-19 16:42:29 -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
Matteo Pagliazzi 08fd4a865a better code for last fix 2013-10-16 20:24:32 +02:00
Matteo Pagliazzi 28e8955379 do not reset user\ eggs if they are already there 2013-10-16 20:22:22 +02:00
Matteo Pagliazzi 285362de6f remove console.log for syncing 2013-10-16 20:19:42 +02:00
Tyler Renelle 5d46793373 Merge pull request #1591 from djuretic/develop 
Tests for AuthCtrl
 2013-10-15 19:59:47 -07:00
Dušan Juretić 6830a9281d add tests for userServices, changed alert to $window.alert in userServices 2013-10-13 19:01:46 -03:00
Matteo Pagliazzi 68426c7ccb profile edits saved only on click 2013-10-13 20:47:59 +02: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 4c018d84c1 Merge branch 'paypal' into develop 
Conflicts:
	bower.json
 2013-10-12 19:23:44 -07:00
Tyler Renelle f8328d3eeb paypal: add configurable merchant and sandbox/production environment 2013-10-12 19:22:06 -07:00
Dušan Juretić 89b4d2ece0 authCtrl tests now working, replaced window for $window 2013-10-12 22:46:13 -03:00