krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,314 Commits 64 Branches 1,226 Tags
ea490c9a1fedf53a96564e7d6970f8c04f9c810c
Commit Graph

538 Commits

Author SHA1 Message Date
Keith Holliday
ea490c9a1f Ported groups service to user new api v3 and ported dependent controllers (#7108) 
* Ported groups service to user new api v3 and ported dependent controllers

* Remove  and extra remove inviation code. Fixed group service caching and update group service tests

* Fixed test logic and added party cache support

* Added promise rejections and updated http interceptor
 2016-04-25 23:11:23 +02:00
Matteo Pagliazzi
4138eab155 v3: undo changes to client that were necessary to test v2 2016-04-19 12:16:39 +02:00
Matteo Pagliazzi
318abfeefa v2: fix debug menu in production 2016-04-17 12:54:27 +02:00
Blade Barringer
887aa478ec chore: merge in develop 2016-04-15 10:11:54 -05:00
Blade Barringer
1a64886f7d Merge branch 'develop' into api-v3 2016-04-15 08:04:46 -05:00
Angel Piscola
59749acf50 Fixed reward sound playing after gold subtracted 
(cherry picked from commit 2508b5ac18)

closes #7058
fixes #6963
 2016-04-12 07:36:44 -05:00
Matteo Pagliazzi
d89d1e50dd Merge branch 'develop' into api-v3 2016-03-25 15:58:04 +01:00
Blade Barringer
01a7132b0b refactor: Extract play reward sound logic into function 2016-03-23 17:55:44 -05:00
Kenny Carlsen
7b708f51ba Proposed bug fix, issue #6668 - erroneous reward purchase sound 2016-03-23 17:55:41 -05:00
Matteo Pagliazzi
0bde9e2df2 Merge branch 'develop' into api-v3 2016-03-21 23:03:28 +01:00
Kaitlin Hipkin
9f0704aa94 modal explaining new class gear is now class-agnostic 2016-03-18 23:23:12 -04:00
Sabe Jones
8447259016 Merge pull request #6921 from HabitRPG/sabrecat/spring-2016 
Spring Fling 2016
 2016-03-18 16:08:46 -05:00
Sabe Jones
ccdbdb2969 fix(seasonal-shop): choose quest more precisely 2016-03-17 13:13:21 -04:00
Sabe Jones
10a8476aaf WIP(event): Spring Fling cont'd 2016-03-17 13:10:05 -04:00
Blade Barringer
ced0b44b2f fix: Remove name from sortable inventory 2016-03-17 08:47:56 -05:00
Blade Barringer
c7310b97ec Revert "Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues." 
This reverts commit 9d50201180.
 2016-03-17 08:09:18 -05:00
Alys
9d50201180 Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues. 
This reverts commits 1c811dbc82, 146810a3e9, 9508ed45df, a6fb945120.
 2016-03-17 21:47:29 +10:00
Blade Barringer
9508ed45df refactor: Move order by equipmentment button to top of view 2016-03-15 19:41:11 -05:00
Matt Harrington
a6fb945120 inventory sorting 
Add inventory sorting buttons based on name, attribute, and set (armoire):
-  Each gear[klass] has its own sorting buttons and sorting state including costume classes
-  The attributes sort descending when selected, then by sum of all attributes
-  There is no default sort
-  The armoire also sorts by set which sorts by item[set] descending, it does not sort within a set (ex "1 of 3" vs "2 of 3")
-  Name sorts by .text() ascending
 2016-03-15 19:41:11 -05:00
Sabe Jones
beb86ea4bd Merge branch 'khipkin/party-badges' into develop 
Conflicts:
	common/dist/sprites/spritesmith-main-10.png
	common/dist/sprites/spritesmith-main-11.png
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png
	common/dist/sprites/spritesmith-main-6.png
	common/dist/sprites/spritesmith-main-7.png
	common/dist/sprites/spritesmith-main-8.png
	common/dist/sprites/spritesmith-main-9.png
 2016-03-15 14:57:38 -04:00
Kaitlin Hipkin
792e8d8094 fix awarding of party {up,on} achievs to update server 2016-03-10 20:38:53 -05:00
Kaitlin Hipkin
d2d3b9deab award party {up,on} achiev when party reaches {2,4} members 2016-03-08 20:55:18 -05:00
Blade Barringer
3fa9d17ad4 Merge branch 'develop' into api-v3 2016-03-08 19:25:50 -06:00
Sabe Jones
f5ea9c5524 fix(analytics): don't log chat messages 2016-03-08 15:19:39 -05:00
Alys
34057c375b Merge pull request #6819 from zesme/develop 
Closed issue #6758 - prevent multiple confirm/cancel popups from group Leave button
 2016-03-06 20:28:47 +10:00
Lucas Torroba
4f4ea8416c Closed issue #6758 
After some discussion on the thread, this is probably the neatest
solution to issue #6758. I have also modified the code on the guild
controller, which displayed the very same problem when pressing the
'Leave' button to leave a guild.
 2016-03-04 13:16:37 -03:00
Brian Murray
c107e42978 Change userLevelStyle to a root scope so it can be used in modals. 2016-02-25 15:59:04 -08:00
Matteo Pagliazzi
cc31d266e4 port locals middleware, add some tests and a lot of fixes 2016-02-19 18:42:03 +01:00
Sabe Jones
274157d21d Merge branch 'tylerxo/menu-error-fix' into develop 2016-01-20 14:34:55 -05:00
Tyler Smith
f3d6c62484 More closely matching coding style within the file 2016-01-19 19:57:11 -08:00
Tyler Smith
b5b3a1545b Adding conditional to prevent undefined object error 2016-01-19 19:53:20 -08:00
Jason Vinson
2989057dd3 Fix for issue #5182: Allow cancel editing group infobox 2016-01-18 22:39:06 -06:00
Sabe Jones
81842bbee1 fix(subscription): visual and wording tweaks 2016-01-12 15:29:10 -05:00
Blade Barringer
837c27ff4c Merge pull request #6428 from GeorgeSG/fix-paypal-special-chars 
Encode special characters when sending to paypal
 2016-01-03 19:40:39 -06:00
Georgi Gardev
430bcd2652 Encode special characters when sending to paypal 2015-12-31 02:46:56 +02:00
Blade Barringer
b3050e5a67 chore(dependency): Upgrade lodash from v2 to v3 2015-12-29 07:45:03 -06:00
Georgi Gardev
ea54ec607a Add confirmation popover for Release pets/mounts 
Add tests for releasing pets and mounts

Refactor tests to use expect syntax from sinon-chai

tests(karma): Refine settings controller tests

refactor(client): Remove unecessary releaseX functions from $scope in settings ctrl
 2015-12-28 21:37:38 -06:00
Georgi Gardev
f6f82cafc4 Add confirmation popover for Rebirth 
Add confirmation popover for Fortify/Reroll

Add tests for reroll and rebirth
 2015-12-28 21:37:23 -06:00
Paul Rich
56a00efb19 Fix for Issue #3517 Display Current Page Name 
Revision for Fix for issue #3517

lint: Remove extraneous white space in app.js file

fix: Correct attribute from pageTitle to title in $state interface
 2015-12-28 07:53:51 -06:00
Blade Barringer
7df3b333f6 feat: Refine clear local storage function 2015-12-26 19:00:45 -06:00
Sabe Jones
6ed9133f70 WIP(event): Winter Wonderland 2015-16 partial 2015-12-15 17:15:02 -05:00
Sabe Jones
e638661c71 Merge pull request #6314 from TheHollidayInn/tasks-fix-delete-message 
Changed language when deleteing tasks to indicate type and text of task
 2015-12-14 14:30:06 -06:00
Sabe Jones
dd4ca5c476 refactor(modals): More readable invalid hatch check 2015-12-07 16:00:52 -05:00
Sabe Jones
0f578b79ff feat(pets): Peppermint Hatching Potions 
Also fixes an issue where the pet hatching modal would appear when the user attempted to hatch a premium version of a quest pet.
 2015-12-04 17:20:33 -05:00
Sabe Jones
483ff8cb67 Merge pull request #6275 from TheHollidayInn/tasks-add-push-to-bottom 
Tasks add push to bottom
 2015-12-01 14:20:02 -06:00
Sabe Jones
dd3218ebbd refactor(modal): Remove unnecessary ternary 2015-11-30 16:43:46 -05:00
Sabe Jones
3a20455cda fix(modals): Rehatch pets 
Corrects an issue with #6281 that would cause the pet hatching modal to fail to display if the pet had a value of -1 (i.e. raised to a mount and not yet re-hatched).
 2015-11-30 16:11:13 -05:00
Keith Holliday
4663c7cf5e Added translation functions to task types 2015-11-30 09:26:07 -06:00
Keith Holliday
ea87784575 tasks-fix-delete-message 2015-11-29 14:30:22 -06:00
Keith Holliday
0dcba276a6 Fixed task push text and move ctrlPressed logic to rootScope. 2015-11-28 12:06:34 -06:00