Commit Graph

207 Commits

Author SHA1 Message Date
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
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
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
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 dc4359ab6f Remove monthly option 2015-05-27 12:32:14 -05: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
GihHubSphinx fac855898f Swap faq and overview in the top menu
Addressing request by lemoness
https://github.com/HabitRPG/habitrpg/issues/5261
2015-05-25 02:25:51 +05:00
Blade Barringer 681668f131 Tweak @hairlessbear's pr
* Simplify chat button stylings
* Add formatting help to send gift modal
* Clean up formatting of table
* Add example for unordered lists
* Remove ! from `env.t` that do not have html characters
* Use https instead of http in link
* Format markdown blurb
* Use ng-if instead of ng-show
* Collapse show help link into single element
2015-05-24 09:20:12 -05:00
hairlessbear 4bc3ea0cdb Removed commented out code 2015-05-23 22:59:17 -04:00
hairlessbear 337a727390 Added hidable markdown help menu and adding to private messages 2015-05-23 22:51:40 -04:00
Blade Barringer cfd2f7003b Merge branch 'develop' into fallenpanda1-improved_dailies 2015-05-23 08:44:56 -05:00
Blade Barringer 664bf491d2 Adjust fallenPanda's PR
* Use enum for frequency in task model
* Adjust ui of task selection
* Correct check for hasStarted
* Remove semicolons
* Set default start day to today
* Correct perfect day and resting in inn tests to have dailies with start dates of a week ago
* Add tests for dailies/weeklies functionality
2015-05-22 22:14:58 -07:00
GihHubSphinx fe2e0618b8 Make Invite-friends-to-group dialog translatable
UI strings of the dialog of invitation to the group made translatable
2015-05-23 02:44:32 +05:00
GihHubSphinx 2440b312a2 Made two lines translatable
Addressing #10 and #11 in the OP of
https://github.com/HabitRPG/habitrpg/issues/4522

* "Send gift" (in the form that pops up when you click on username
label)
* "Invite Friends" button (in "Members" section in guilds and party)
2015-05-21 17:12:16 +05:00
SabreCat 13faf8d0c7 feat(pets): Sheep Quest 2015-05-20 20:45:18 -07:00
Blade Barringer 3c35b52d27 Hide contributor level if contribText func is not available; put math on scope 2015-05-15 23:08:26 -05:00
Allen Pan a763a3a3da Cleaned up task.jade file:
- moved ugly html newlines into the stylesheet
- renamed temporary var for datePicker’s ngmodel from _dateString to _tempDateForPicker
- renamed open -> openDatePicker, and have the function track datePicker’s open/closed state on a per task instead of global basis
2015-05-15 20:24:47 -07:00