Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,267 Commits 64 Branches 1,256 Tags
b62f08d5000ddeb8d604e2b0c0fc59d9aba1347a
Commit Graph

731 Commits

Author SHA1 Message Date
Esben Sparre Andreasen b62f08d500 Misc. bug fixes from lgtm.com (2) (#9474) 
* Remove dead branch of ternary: `gift` is always truthy here

Problem found here:

- https://lgtm.com/projects/g/HabitRPG/habitrpg/snapshot/dist-98076885-1510577633582/files/website/server/libs/amazonPayments.js?sort=name&dir=ASC&mode=heatmap&excluded=false#x5a22f31110a55091:1

* Remove superfluous argument, preenUserHistory only takes two args

Problem found here:

- https://lgtm.com/projects/g/HabitRPG/habitrpg/snapshot/dist-98076885-1510577633582/files/website/server/libs/cron.js?sort=name&dir=ASC&mode=heatmap&excluded=false#xf16a045ecabb07f6:1

* Cleanup: remove useless assignments

Problems found here:

- https://lgtm.com/projects/g/HabitRPG/habitrpg/snapshot/dist-98076885-1510577633582/files/website/client/store/actions/shops.js?sort=name&dir=ASC&mode=heatmap&excluded=false#xf782ed2cf920441%3A1
- https://lgtm.com/projects/g/HabitRPG/habitrpg/snapshot/dist-98076885-1510577633582/files/website/client/app.vue?sort=name&dir=ASC&mode=heatmap&excluded=false#x172c1dda85e84dc8%3A1
- https://lgtm.com/projects/g/HabitRPG/habitrpg/snapshot/dist-98076885-1510577633582/files/website/client/components/settings/site.vue#x9b3afee802a3a8f8%3A1
- https://lgtm.com/projects/g/HabitRPG/habitrpg/snapshot/dist-98076885-1510577633582/files/website/client/components/selectMembersModal.vue?sort=name&dir=ASC&mode=heatmap&excluded=false#x1fbc2a3d62facd70:1
- https://lgtm.com/projects/g/HabitRPG/habitrpg/snapshot/dist-98076885-1510577633582/files/website/common/script/libs/taskClasses.js?sort=name&dir=ASC&mode=heatmap&excluded=false#x41ce0e121a4defee:1

* Fix online editor whitespace change.
 2017-11-27 19:51:25 -06:00
Paul 885f2998ae System messages flaggable (#9408) 
* Remove flag from system messages, throw an error if system messages are flagged

* Modify unflag system message test to check if flagging a system message throws an error

* Move email from nconf to top
 2017-11-27 19:45:04 -06:00
Paul 2afd96e11c Remove spaces from filters (#9524) 2017-11-27 19:44:33 -06:00
Paul cd92f44365 Fix difficult to edit checklists in Firefox (#9525) 
* Change checklist item hover from move to text

* Add vue draggable

* Add vue draggable

* Replace sortablejs directive with Vue Draggable component

* Indent draggable properties
 2017-11-27 19:43:24 -06:00
Paul 863177902a Remove extra 'to' paramater from router link (#9529) 2017-11-27 19:42:53 -06:00
Paul 8895b70ffa Adjust left positioning of the left-panel to unobscure sroll-bar, change left panel overflow to overflow-y (#9544) 2017-11-27 19:35:30 -06:00
Kip Raske 03480ebfc7 Passing quantity to the API call when buying quests from the shop (#9565) 
You can buy multiple quests from the buy modal, but the quanitity is
never passed to the server. So the client thinks that you are buying the
number you said you did, but the server only buys one regardless. This
can lead to syncing problems down the road.
 2017-11-27 19:33:08 -06:00
Joseti 9b8676f02e Changed "Donate" button to "Contribute" button (#9581) 
* Changed functionality of "donate"-button on static pages

* Changed strings to reflect change from "donate" to "contribute"
 2017-11-27 19:29:45 -06:00
Keith Holliday 3e7738b5b1 Added keys to for loops (#9584) 2017-11-27 12:46:25 -06:00
Keith Holliday 33a235b46c Fixed equiping glasses and ears (#9585) 2017-11-27 12:19:36 -06:00
Keith Holliday 137d6c1f9d Set default empty array when party members haven't loaded (#9579) 
* Set default empty array when party members haven't loaded

* Corrected variable usage
 2017-11-27 11:59:42 -06:00
Keith Holliday 3e6b3ce3ff Added habitica event for profile display (#9576) 2017-11-27 10:29:20 -06:00
Keith Holliday ea5ba965e7 Fixed promoting group leader (#9574) 2017-11-27 10:27:30 -06:00
Keith Holliday 7215a550b5 Added page increment when page is loaded to prevent scroll stopping (#9573) 2017-11-27 10:23:04 -06:00
Keith Holliday 3235dfa236 Added equipment filter (#9572) 2017-11-27 10:22:34 -06:00
Keith Holliday 9baf7a7c67 Do not reset item when buying cards (#9571) 2017-11-27 10:22:00 -06:00
Matteo Pagliazzi 53c83c585a fix navbar not showing up in homepage 2017-11-23 16:07:58 +01:00
Sabe Jones 4618fd8954 Merge branch 'release' into develop 2017-11-20 19:21:17 +00:00
Keith Holliday 1845bd1e35 Fixed display of RYA behind bailey (#9555) 2017-11-20 12:38:26 -06:00
Keith Holliday 9c2f5213cb Challenge fixes (#9528) 
* Added challenge member search to progress dropdown

* Added leave challenge modal

* Allowed editing for challenge leader only

* Pevented users from editing challenge task info

* Set default progress default to daily

* Removed reward filters from user challenge progress
 2017-11-17 17:13:07 -06:00
Sabe Jones c06d5107ac Merge branch 'release' into develop 2017-11-17 22:50:27 +00:00
SabreCat 82497e4041 chore(sprites): compile 2017-11-17 22:22:27 +00:00
SabreCat 2a5e9c0780 feat(event): Turkey Day 2017 
and (content) November Subscriber Items
 2017-11-17 22:21:05 +00:00
SabreCat c8ca67aa64 fix(seasonal-shop): short circuit if categories empty 2017-11-17 18:32:55 +00:00
MathWhiz 89e4cbcffe Disable immutable inputs when editing a challenge (#9412) 
* Disable uneditable inputs when editing a challenge

* Revert prize display when creating
 2017-11-17 23:45:38 +11:00
Keith Holliday 67564317fb Group plan fixes (#9518) 
* Fixed group plan editing

* Added translations

* Abstracted query for group or challenge tasks
 2017-11-17 20:31:39 +11:00
Keith Holliday dc2269a307 Hot fixes nov 15 (#9519) 
* Added fortify sync. Removed multiple buy

* Added yesterdaily check

* Fixed checks for running yesterdailies
 2017-11-17 20:31:29 +11:00
SabreCat b0051c45b4 fix(group-plans): more claim/unclaim alignment 2017-11-16 21:21:39 +00:00
Matteo Pagliazzi b82044e07b fix Remove Claim positioning 2017-11-16 22:05:35 +01:00
Matteo Pagliazzi b4c4769208 fix: correctly handle bootstrap variables 2017-11-16 21:59:55 +01:00
SabreCat 42a05446c0 fix(notifications): extend snackbar duration 2017-11-16 20:32:57 +00:00
MathWhiz 9f7c0b4861 Fix regex for message highlighting (#9516) 2017-11-16 14:12:26 -06:00
SabreCat 67b16d91a3 fix(drawer): remove overflow CSS 2017-11-16 16:38:38 +00:00
Alys 6b625a60ab remove client-side purchase of Armoire - fixes #9432 (#9463) 2017-11-16 10:06:45 +01:00
Matteo Pagliazzi b999d46142 Merge branch 'issue9334' of https://github.com/CSE2410-TeamZero/habitica into CSE2410-TeamZero-issue9334 2017-11-15 17:47:17 +01:00
Allister c5296d4cb0 Add variable placeholder. (#9465) 
Changes the character translation string `charactersRemaining`  in
groups.json to include a variable placeholder `<%= characters %>`
 2017-11-15 17:41:18 +01:00
MathWhiz 22b683b1d9 Fix regex for chat highlighting (#9411) 
* Fix regex for chat highlighting

* Fix lint errors
 2017-11-15 17:39:29 +01:00
Joseti 229fd06ee3 Removed "Tag list in tasks starts collapsed" settings and strings (#9406) 2017-11-15 17:37:15 +01:00
Andrew 69b69e9d27 Update appFooter.vue in attempt to fix #9336 (#9348) 
* Update appFooter.vue in attempt to fix #9336

Make whole social circle clickable.
Replace div with `a` tag allowing whole circle to become a link.

* Indent and reformat "Not ready yet" Instagram button.
 2017-11-15 17:35:16 +01:00
dnlup 8033e7c0a0 Fix Incorrect Heading margins (#9311) 
* fix(style): Fix margin of headers in inventory page

Set the `mb-0` class in h1 header to `mb-4`.
Set the class if `h2` header to `mb-3`.

* fix(style): Fix margin of headers in shops section

Set the `mb-0` class in h1 header to `mb-4`.
Set the class of `h2` header to `mb-3`.

* fix(style): Fix margin of headers in shops adn time traveler section

Set the `mb-0` class in h1 header to `mb-4`.
Set the class of `h2` header to `mb-3`.
 2017-11-15 17:34:57 +01:00
Emily Ong e39b80bb9a changed to 'createChallengeCloneTasks' (#9300) 
* changed to 'createChallengeCloneTasks'

* createChallengeCloneTasks

* Added new i18n strings
 2017-11-15 17:34:33 +01:00
Ryan Holinshead 2038d5e7c8 Choose class modal remove tooltip (#9298) 
* Change chooseClass modal opt out button and tooltip
- Remove hover tooltip from opt out
- Fix centering of choose class button
- Add some margin between opt out and choose class buttons
- Make cursor on opt out text the pointer to make it obvious it's clickable

* Alphabetical order class selector
 2017-11-15 17:32:49 +01:00
Aquib Master 46a8ee52d4 Modify relative dueIn time on tasks to be in days (#9251) 
* Modify relative dueIn time on tasks to be in days

- Normalizes the current time and task due time to the ends of their respective days.
- Returns 'today' if the dates are the same day else uses moment's humanize function to allow for weeks, months, years and so on.

* Modify task due date to appear grey when due the next day
 2017-11-15 17:32:30 +01:00
William Perry 52064f6b2a Changes animal attribute that A-Z sort is applied to. (#9241) 2017-11-15 17:31:10 +01:00
Łukasz Dobrogowski f15a27a7f1 added favicons to the new client (#9235) 2017-11-15 17:29:58 +01:00
Matteo Pagliazzi ab974675b9 More Tasks page fixes (#9475) 
* fix datepicker not closing when clicking outside of it, fixes #9346

* fixes #9441
 2017-11-15 17:06:32 +01:00
Sabe Jones cb612d99d7 chore(sprites): recompile 2017-11-15 01:31:01 +00:00
Unknown cb5a47ec7b Deleted unnessecary import. 2017-11-14 20:18:36 -05:00
Sabe Jones 838b9a5822 Merge branch 'release' into develop 2017-11-15 01:03:07 +00:00
SabreCat cd5ff04ee4 chore(sprites): compile 2017-11-15 00:53:27 +00:00