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

12291 commits

This branch
This branch
All branches
Author SHA1 Message Date
Blade Barringer
5de2503039 Merge branch 'develop' into api-v3 2016-01-16 21:54:13 -06:00
Blade Barringer
96f6bbfb0c tests(api): Add sync method to api objects 2016-01-16 21:50:54 -06:00
Blade Barringer
a44cf5e0fc lint: Fix linting erros in test helpers 2016-01-16 19:27:03 -06:00
Blade Barringer
5dd2dcd6d8 Merge branch 'improve_tests' into api-v3 2016-01-16 19:24:39 -06:00
Blade Barringer
87d4c68bea lint: Correct linting errors 2016-01-16 19:13:33 -06:00
Blade Barringer
ec9d0fd278 tests: Set up placeholder file for api test helpers 2016-01-16 18:13:11 -06:00
Blade Barringer
07f08de989 Merge branch 'improve_tests' into api-v3 2016-01-16 18:12:36 -06:00
Blade Barringer
91ffe5c402 tests(api): Reorganize integration helper for v2 2016-01-16 17:28:36 -06:00
Blade Barringer
ef5064f351 Move generators to own file 2016-01-16 17:23:30 -06:00
Blade Barringer
6287ae6776 tests(api): Outsource mongo updates to mongo module in api helper 2016-01-16 14:33:53 -06:00
Blade Barringer
80224adafa tests: Extract mongo functions into separate file 2016-01-16 14:12:26 -06:00
Blade Barringer
54159c069d tests: Move api translation checkout out into separate file 2016-01-16 14:09:20 -06:00
Blade Barringer
e9f618da5e tests: Extract api objects to separate files 2016-01-16 14:06:47 -06:00
Blade Barringer
29415441f7 tests: Create base class that ApiUser and ApiGroup inherit from 2016-01-16 09:48:51 -06:00
Blade Barringer
9f2a8c03b2 tests: Remove references to different api routes in helper 2016-01-16 09:45:02 -06:00
Blade Barringer
28fc6dd4bd tests: Convert helpers to use async/await 2016-01-15 20:36:54 -06:00
Luveluen
5315cc9055 Update character.json to separate optOut into two translation strings 
optOut is currently used to skip the class selection and to opt out of the messaging system.
that creates translation problems.

Fixes #6511
Closes #6518
 2016-01-14 20:40:07 -06:00
Georgi Gardev
24e08676db Add icon for pinned Safari tabs 
Fixes #6451
Closes #6522
 2016-01-14 20:32:51 -06:00
Georgi Gardev
e761315c74 Remove tooltip for 'reverse chat messages' checkbox 
Fixes #6517
Closes #6525
 2016-01-14 20:28:08 -06:00
Josh Holland
a0b264f686 Align progress and help icons on to-dos column 
Fixes #6474

As per #6474, progress and help icons on the to-dos column were
previously misaligned due to inline styles. This commit adds the same
inline styles to both icons.

Move inline styles on task column icons to a class

This uses existing classes instead of adding a new one, because if new
icons are added in the future this should catch them without any extra
classes having to be added to the new icons.

In addition, this will catch any new .option-box added to .task-column
in the future; this may be good or bad, but is easy to fix in any case.
 2016-01-14 20:24:09 -06:00
Blade Barringer
c084b6b7cd Merge pull request #6526 from HabitRPG/no_sprite_sheets_css 
refactor: Remove compiled spritesheet from source control
 2016-01-14 18:10:31 -06:00
Blade Barringer
d02c3d321e refactor: Remove compiled spritesheet from source control 2016-01-14 18:03:14 -06:00
Sabe Jones
b0a9425cee Merge pull request #6512 from HabitRPG/sabrecat/pets-201601 
feat(quests): January 2016 pet
 2016-01-13 17:01:57 -06:00
Sabe Jones
14a6d0dabf feat(quests): January 2016 pet 2016-01-13 17:15:02 -05:00
Blade Barringer
b68861681c tests(integration): Create separate helper for api integration tests 2016-01-13 12:32:36 -06:00
Matteo Pagliazzi
771bc0c5b5 put back acceptablePUTPaths variable deleted in merge 2016-01-13 18:41:09 +01:00
Matteo Pagliazzi
914b2eb008 Merge branch 'develop' into api-v3 2016-01-13 18:39:44 +01:00
Alys
fc01104a0d change habitrpg to habitica for PayPal subscription config 2016-01-14 03:08:16 +10:00
Matteo Pagliazzi
f83b271b30 rever new history preening 2016-01-13 11:07:52 +01:00
Blade Barringer
c9d378ab35 tests(api): bring in await format tests 2016-01-12 18:10:10 -06:00
Sabe Jones
9887fe58c4 fix(Stripe): zoom out so gryphon is visible 2016-01-12 16:12:44 -05:00
Sabe Jones
6247d5e365 Merge pull request #6346 from HabitRPG/sabrecat/conditional-buy-gem 
(WIP) Conditional Buy Gem modal, cont'd
 2016-01-12 14:47:31 -06:00
Sabe Jones
81842bbee1 fix(subscription): visual and wording tweaks 2016-01-12 15:29:10 -05:00
Sabe Jones
2db1ef0f7a style(subscriptions): Gem layout feedback 2016-01-12 15:00:07 -05:00
AnitaYCheng
8bc78af5ae Added specificity to CSS, removed exxtra line 2016-01-12 15:00:07 -05:00
AnitaYCheng
bf6ebd88f6 Modifications to settings mixin and misc last changes. 2016-01-12 15:00:07 -05:00
AnitaYCheng
6a72027d8b Add subscription conditionals for buying or purchasing gems 2016-01-12 14:58:39 -05:00
AnitaYCheng
5f88aef3ca Add new mixin for purchasing gems. Add new areas that will be conditionally set by user subscription status. 2016-01-12 14:58:39 -05:00
AnitaYCheng
313a18971e Add CSS changes for conditional buy-gem modal 2016-01-12 14:58:39 -05:00
AnitaYCheng
2a8eb9f476 Added translation strings for conditional buy-gems modal 2016-01-12 14:58:39 -05:00
Sabe Jones
dba620ee7a Merge pull request #6417 from GeorgeSG/reverse-chat-option 
Add option to reverse chat order
 2016-01-11 12:55:28 -06:00
Sabe Jones
7e8f0d24c5 Merge remote-tracking branch 'origin/pr/6307' into develop 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
 2016-01-11 13:48:01 -05:00
Matteo Pagliazzi
9e61137e8e Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2016-01-11 18:30:10 +01:00
Matteo Pagliazzi
5244702e48 perf improvements for challenges history and migration 2016-01-11 18:29:39 +01:00
Alys
0d47f8d116 allow purchase of Find the Cub evilsanta2 quest scroll before completing previous quest - fixes https://github.com/HabitRPG/habitrpg/issues/6405 2016-01-12 02:58:33 +10:00
Matteo Pagliazzi
193e89a79e fix index when marking task as modified after history preening 2016-01-10 15:57:22 +01:00
Blade Barringer
c5ad006007 chore(i18n): update locales 2016-01-09 23:46:53 -06:00
Blade Barringer
980bec9be3 Merge pull request #6456 from querry43/use-example-dot-com 
use example.com in the example json so as not to spam legit servers
 2016-01-09 23:38:38 -06:00
Blade Barringer
502ba27b47 chore(sprites): Compile sprites 2016-01-09 23:32:17 -06:00
Nathan Maton
b26d3bef40 replaced collars 2016-01-09 23:29:54 -06:00