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

321 commits

Author SHA1 Message Date
Blade Barringer
567ed1f28b Correct seenMessage use in menu 
Closes #5519
 2015-06-29 08:58:51 -05:00
Blade Barringer
b72b14fe6c Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync 2015-06-28 21:07:32 -05:00
Alys
122920975d add Trivial difficulty/priority setting to task Advanced Options (also remove whitespace at ends of lines) 2015-06-28 14:41:02 +10:00
Blade Barringer
bcf141840d Merge branch 'TheHollidayInn-tasks-search-checklists' into develop 2015-06-27 22:23:08 -05:00
Blade Barringer
4abd7f85f8 Adjustments to PR#5494 
* Update filter name to be more accurate
* Add additional tests
* Simplify checklist checking logic
* Prevent errors from multiple matches in checklist
 2015-06-27 22:21:50 -05:00
Blade Barringer
3262c2d869 Refactored avatar 2015-06-27 16:08:38 -05:00
hairlessbear
9f70598d64 Fix comment typo 2015-06-27 12:40:53 -04:00
hairlessbear
76a0bf48f2 Fix typo 2015-06-27 12:33:04 -04:00
hairlessbear
7616c6d224 Fixed ng-class syntax 2015-06-27 12:16:43 -04:00
hairlessbear
4ba82f80da Added mixin to reduce code duplication 2015-06-27 12:12:01 -04:00
Blade Barringer
6d11de8769 Correct missing one 2015-06-27 10:07:14 -05:00
Blade Barringer
7d92b39790 Correct usage of ng-class 2015-06-27 09:57:59 -05:00
hairlessbear
01b3df17af Changed all double-spans in avatar.jade to single spans used ternary operators 2015-06-26 17:15:04 -04:00
Sabe Jones
775f903c3d feat(events): Limited edition 
Summer Splash skins and June mystery item. Also announces the Gokul sound theme.
 2015-06-25 11:19:01 -05:00
Sabe Jones
3641bea441 feat(event): Summer Splash 2015 
Summer seasonal event for 2015, including festive NPC graphics, the summer edition of the Seasonal Shop, and new class equipment available in Rewards.
 2015-06-20 23:07:14 -05:00
Blade Barringer
19f8ca7980 Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync 2015-06-20 17:36:32 -05:00
Alys
07b41d16b6 Revert "Revert "new GSalvadi audio theme, created by NomindTR"" 
This reverts commit 30a091e14e.
 2015-06-18 22:19:35 +10:00
Blade Barringer
3ff310294b Hide row if not part of reward; add one-time bindings 2015-06-17 18:57:15 -05:00
Blade Barringer
685c09aa0d Merge branch 'task_service_refactoring_v2' into develop 2015-06-17 18:46:13 -05:00
Sabe Jones
ad7e5a6dc9 feat(pets): Cuttlefishies 2015-06-17 17:26:36 -05:00
Alys
30a091e14e Revert "new GSalvadi audio theme, created by NomindTR" 2015-06-18 07:39:38 +10:00
Alys
910fc2f213 Merge pull request #5407 from Alys/GSalvadi-audio-NOMINDTR-2015-06-15 
new GSalvadi audio theme, created by NomindTR
 2015-06-17 21:39:39 +10:00
Blade Barringer
3ab27f32d2 Refactored editTask into TaskService 2015-06-16 23:11:04 -05:00
Blade Barringer
1801ad0bce Add authors to bailey and correct refresh text 2015-06-16 17:59:59 -05:00
Sabe Jones
7152bea4fe chore(news): 6/16 misc Bailey 2015-06-16 16:59:27 -05:00
Alys
14983cb996 replace minus Habit and To-Do sounds, rename NomindTR's theme, rename keys for theme since they aren't live yet 2015-06-16 13:10:49 +10:00
Blade Barringer
ecb2544cdc Merge pull request #5396 from hairlessbear/remove_freeRebirth 
Removed 'freeRebirth' from user model and everywhere else in codebase
 2015-06-15 08:00:18 -05:00
Alys
b6b2873faf add new GSalvadi audio theme, created by NomindTR 70d88957-673a-4edd-b97e-f1ecb018dd89 https://trello.com/c/tljx8gKC/18-music-sound-effects-v3 13 June 2015 2015-06-15 20:33:14 +10:00
Blade Barringer
14fe29dd4a Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync 2015-06-14 16:33:38 -05:00
Blade Barringer
b4f4db9c1d Create jade variabel for ultimate gear check 2015-06-14 01:56:32 -05:00
Blade Barringer
c44ca785aa Merge branch 'develop' into SabreCat-develop 2015-06-14 01:50:16 -05:00
Blade Barringer
831f5b89bd Merge branch 'develop' into nthomsn-develop 2015-06-14 01:27:35 -05:00
Blade Barringer
41b1abba3a Checkout help button changes 2015-06-13 23:16:12 -05:00
Blade Barringer
0eb8caec23 Various task ui improvements 
* Use bootstrap form-control class for text and notes
* Can't edit start date or days of the week in challenge dailies from website
* Refactor dailies
 2015-06-13 22:29:06 -05:00
Blade Barringer
9d4713bdf3 Merge pull request #5392 from GitHubSphinx/Sphinx-entry1 
Still addressing #5202 - making Click for help button translatable
 2015-06-13 18:01:57 -05:00
hairlessbear
31e7b052a1 Removed 'freeRebirth' modal and its associated strings 2015-06-13 14:18:03 -04:00
Blade Barringer
8faf96f5b9 Refactored filters 2015-06-13 12:39:11 -05:00
Blade Barringer
5d56bd02ef Merge branch 'develop' into blade-feature/search 2015-06-13 00:10:44 -05:00
Sabe Jones
e2ba8fb859 fix(achievement): Ultimate Gear logic 
Fixes #5387.
 2015-06-12 15:35:34 -05:00
GihHubSphinx
fc5cb5d228 Still addressing #5202 
The last thing left as it seems is Click for help toolbar
 2015-06-12 17:42:40 +05:00
Blade Barringer
54681e36b5 Merge branch 'develop' into blade-Finish_weeklies_pr 2015-06-11 19:47:46 -05:00
Sabe Jones
4da4777ddd chore(news): Every X Bailey 2015-06-11 14:22:39 -05:00
Jiri Chara
2c52829256 Implement filter tasks by text & notes 
In order to be able to filter tasks by it's text or notes - we need an
extra filter to be implemented, because angular does not support OR
condition for it's default filter directive.
 2015-06-11 20:39:29 +02:00
Nicholas Thomson
867308975f Merge https://github.com/HabitRPG/habitrpg into develop 2015-06-11 08:40:36 -07:00
Jiri Chara
df7d36923c Enable filtering for tasks and custom rewards 
Add search input box next to the tags. When user changes the value of
the input box then it's propagated to the user service as filterQuery
string. filterQuery string is then used in the tasks template to filter
tasks by text.
 2015-06-11 09:10:31 +02:00
Blade Barringer
1bf38578bf Merge branch 'develop' into hairlessbear-show_group_leader 2015-06-10 17:51:45 -05:00
Blade Barringer
f72ed18a77 Merge pull request #5350 from hairlessbear/task_links_fix 
Added links to multiple task help phrases (fixes #5349)
 2015-06-10 17:46:15 -05:00
Blade Barringer
097e1ff70b Put popover in containing span 2015-06-10 08:18:08 -05:00
Blade Barringer
1d18f53a67 Merge branch 'develop' into blade-Finish_weeklies_pr 
Added Sabe's novalidate change to adding a new task
 2015-06-10 07:53:37 -05:00
Blade Barringer
78bf96b104 Remove extraneous div 2015-06-09 17:52:17 -05:00
Blade Barringer
885820c753 Merge branch 'develop' into GitHubSphinx-Sphinx-entry1 2015-06-09 17:49:50 -05:00
Sabe Jones
973e7cb8ef fix(new-task): Novalidate 
Adds the "novalidate" flag to the task-add form so browser-level form validations don't act on our field. Fixes #3705.
 2015-06-08 14:15:45 -05:00
hairlessbear
b1b8dc18af Made links translatable 2015-06-07 13:17:57 -04:00
Blade Barringer
c8ed73f685 Added help text for startDate 2015-06-07 00:06:31 -05:00
Blade Barringer
e6ed0c961d Simplify datepickers 2015-06-06 23:27:03 -05:00
Blade Barringer
91390138bb Make reward price required 2015-06-06 23:17:10 -05:00
Blade Barringer
41d0f505f3 Simplify datepicker 2015-06-06 22:34:02 -05:00
Blade Barringer
047902ac62 Use input type date for datepicker 2015-06-06 17:55:36 -05:00
Blade Barringer
bf48671c7a Add validation to everyX 2015-06-06 17:55:21 -05:00
Blade Barringer
ae1d10ed30 Merge branch 'blade-Finish_weeklies_pr' into refactor-tasks-jade 2015-06-05 17:37:46 -05:00
Blade Barringer
164a26616e Merge branch 'develop' into blade-Finish_weeklies_pr 2015-06-05 17:35:16 -05:00
Sabe Jones
804cced3ff chore(various): News and sprites 
Also tweaks the drop probability of equipment from 70% to 60%.
 2015-06-05 10:22:22 -05:00
hairlessbear
16f0ece2f8 Removed ! from 'env.t' that don't have html characters 2015-06-05 09:44:19 -04:00
hairlessbear
d26e4780fd Added links to multiple task help phrases 2015-06-05 09:26:33 -04:00
Blade Barringer
dc9bb35244 Add ng-form 2015-06-05 07:40:48 -05:00
Blade Barringer
403075262d Remove bindonce symbol from ng-repeat 2015-06-05 07:26:03 -05:00
Blade Barringer
099e0abeed Restore restore streaks functionality 2015-06-05 07:20:59 -05:00
Blade Barringer
701fa2455f Refactor task views 2015-06-04 21:37:01 -05:00
Blade Barringer
b132b3c4fa Make advanced options a button 2015-06-04 17:48:59 -05:00
hairlessbear
60ecdb2dca Removed colons from JSON and 'formatting-help' class to 'slight-vertical-padding' 2015-06-04 17:48:31 -04:00
Sabe Jones
95bb5be22a Merge branch 'develop' into armoire 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith0.css
	common/dist/sprites/spritesmith0.png
	common/dist/sprites/spritesmith1.css
	common/dist/sprites/spritesmith1.png
	common/dist/sprites/spritesmith2.css
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
	common/dist/sprites/spritesmith5.css
	common/dist/sprites/spritesmith5.png
	common/dist/sprites/spritesmith6.css
	common/dist/sprites/spritesmith6.png
 2015-06-04 15:49:06 -05:00
Sabe Jones
20859b83ef feat(Armoire): Improved counter 
The popover counter of remaining Equipment in the Armoire now counts down immediately instead of requiring a browser refresh. A modal announces when the last item has been found. Also includes several fixes to the Ultimate Gear migration.
 2015-06-04 15:45:55 -05:00
Blade Barringer
db38663f94 Merge branch 'develop' into blade-Finish_weeklies_pr 2015-06-04 12:45:23 -05:00
Sabe Jones
6074774e14 feat(backgrounds): June BGs 2015-06-04 11:30:25 -05:00
Blade Barringer
865f7651a9 Merge branch 'TheHollidayInn-invite-friends-in-header' into develop 2015-06-04 08:54:04 -05:00
Blade Barringer
7a1c5835d0 Final adjustments to PR #5114 
* Added test for header ctrl
* Made openModal function more readable
* Only show setting to disable invite friends if party is exactly 1 member big
* Use party.memberCount instead of party.members.length because it's more expressive
 2015-06-04 08:48:05 -05:00
Blade Barringer
076f7f0db9 Create translatable strings for dailies 2015-06-03 21:48:38 -05:00
Sabe Jones
09d32390f9 feat(Armoire): Item counter 
Implements a counter for how many pieces of equipment remain to be found in the Armoire, including tests for same.
 2015-06-03 16:48:11 -05:00
Blade Barringer
7adde1d1dd Merge branch 'develop' into blade-Finish_weeklies_pr 2015-06-03 07:41:09 -05:00
Sabe Jones
c90f7e2c34 feat(Armoire): WIP 2015-06-02 17:42:14 -05:00
TheHollidayInn
d1df5d740d Changed button to invite friends text 2015-06-01 21:10:49 -05:00
TheHollidayInn
e3f5c22fe8 Added start party option, locales, and plus button 2015-06-01 21:07:53 -05:00
TheHollidayInn
5513061d80 Added invite to friends in header, added setting to hide the invite friends, and localized the invite friends string 2015-06-01 21:07:09 -05:00
Sabe Jones
80da3a2dcd chore(news): Bailey on mounts 2015-06-01 19:17:30 -05:00
Sabe Jones
d76ca1c04d feat(mystery): Programmatic presents 
Shows the appropriately colored subscription giftwrap for the user's current month. Also includes the Bailey notification for this month's upcoming subscriber item.
 2015-06-01 12:06:35 -05:00
Sabe Jones
829ed8a161 chore(news): May 31 Bailey 2015-05-31 16:04:42 -05:00
GihHubSphinx
f9aa2c7301 Misplaced popover walkaround 
Popover for small sized button (btn-sm) is misplaced while no such bug
is present for normal sized button.
 2015-05-31 18:18:12 +05:00
GihHubSphinx
2cd3ef7bdb Addressing https://github.com/HabitRPG/habitrpg/issues/5244 
Changes:
1. optOutText made more accurate
2. Modal heading in single translatable line with no link to wiki -
which looks nicer
3. Links to wiki articles about classes made translatable
4. New "Learn more" link to wiki article on classes system in the modal
footer
 2015-05-31 15:58:27 +05:00
Sabe Jones
7a8046317d feat(tour): Iteration 5/29 2015-05-29 15:14:19 -05:00
Sabe Jones
6af7342693 feat(tour): Revised intro tutorial 2015-05-29 14:03:42 -05:00
Blade Barringer
42b482cb7e Make user sync after accepting or rejecting a quest 2015-05-28 08:18:08 -05:00
hairlessbear
dc8647d6ae Changed all party.quest.key instances in quest invite modal to user.party.quest.key and changed invite modal check 2015-05-27 18:49:35 -04:00
Blade Barringer
dc4359ab6f Remove monthly option 2015-05-27 12:32:14 -05:00
hairlessbear
cc3d63b858 Fixed rewards on quest invite modal 2015-05-27 10:05:03 -04:00
Blade Barringer
8b347bca8b Remove everyX check from weeklies; Change UI of frequency selection; Prep for monthlies in UI 2015-05-26 17:59:11 -05:00
Blade Barringer
fce9d39f19 Added in one-time-bindings 2015-05-26 09:02:25 -05:00
GihHubSphinx
a788d51aa5 Made gift dialog translatable 
Addressing a bit beyond _#10 in the opening post of
https://github.com/HabitRPG/habitrpg/issues/4522

Screenshot of before-after-proof: http://oi57.tinypic.com/11c9ldi.jpg
 2015-05-26 17:18:18 +05:00
Sabe Jones
3098cacf03 feat(subscriber): May Mystery Items 2015-05-25 21:03:13 -05:00
Blade Barringer
5d93f364c1 Merge branch 'blade-hairlessbear_markdown_help_table' into develop 2015-05-24 22:47:02 -05:00
Blade Barringer
9b2798ee71 Refine markdown help 2015-05-24 22:45:09 -05:00