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

9134 commits

This branch
This branch
All branches
Author SHA1 Message Date
Blade Barringer
fc979dfdaa create new string for quest participants to correct processing error 
closes #5025, closes #5029
 2015-04-14 17:52:08 -05:00
Kathryn Norris
6a461be0a4 Replaced toggleCustomDayStartInfo function with angular magic. (#5006) 2015-04-14 14:49:45 -07:00
Kathryn Norris
8c45ab8dc4 Removed unused strings and altered custom day start text. (#5006) 2015-04-14 14:23:20 -07:00
Blade Barringer
83858da25e Change button to be more specific 2015-04-14 08:11:39 -05:00
Alys
9aaf252628 Merge pull request #5016 from hairlessbear/develop 
Changed Difficulty link from Trello to Wiki
 2015-04-14 22:32:14 +10:00
Alys
6296a2f4df Merge pull request #4969 from Alys/explain-drops-2015-03-04 
add text to Market for eggs, etc to explain to new users that the items will also drop
 2015-04-14 18:22:47 +10:00
Alys
00abf0d694 update Drop System explanation 2015-04-14 17:57:10 +10:00
Kathryn Norris
5dc1d58f8f Altered custom day start text. (#5006) 2015-04-13 17:13:23 -07:00
Kathryn Norris
ea2ad4e4b5 Changed the text for custom day start info. (#5006) 2015-04-13 17:13:22 -07:00
Kathryn Norris
ddb7643ff7 Updated the custom day start information in settings. (#5006) 2015-04-13 17:13:22 -07:00
Blade Barringer
b027e2c407 Corrected port and db to use 2015-04-13 17:22:24 -05:00
Alys
a7abbe0e05 changed drops Learn More link and added drop types to Drops Unlocked message 2015-04-14 08:01:32 +10:00
Matteo Pagliazzi
4fe740a403 chore(i18n): update locales 2015-04-13 19:31:53 +02:00
Kevin Gisi
b503a0fd64 Repaired task reordering issue 
* Created `conditionalOrderBy` filter with a similar signature to `orderBy`,
  using a single conditional argument that when false, causes the filter to
  return the array unchanged

* Updated task view to use `conditionalOrderBy`

* Added karma specs for `conditionalOrderBy` filter
 2015-04-13 08:51:08 -04:00
Kevin Gisi
02838214c7 Reimplement (broken) task ordering 2015-04-13 07:47:56 -04:00
Alys
e7775c1d82 Merge pull request #5021 from Alys/revert-4996-Sort-dated-todos 
revert PR #4996 (Sort dated todos) because of problems sorting other tasks
 2015-04-13 20:24:27 +10:00
Alys
8af1f0538b revert PR #4996 (Sort dated todos) because of problems sorting other tasks - see comments in #4996 2015-04-13 20:16:24 +10:00
Alys
c8b5d652cd Merge pull request #5020 from HabitRPG/revert-5000-sort-dated-todos 
Revert "Put list back into removeTask fn, update removal logic within ch...
 2015-04-13 19:42:05 +10:00
Alys
0083c3f881 Revert "Put list back into removeTask fn, update removal logic within challegeCtrl" 2015-04-13 19:34:59 +10:00
Alys
e7c2afb4f4 Merge pull request #4929 from melissamcewen/issue-3852-vagrant 
Issue 3852 vagrant
 2015-04-12 16:13:22 +10:00
hairlessbear
91562c82b4 changed Difficulty link from Trello to Wiki 2015-04-11 23:23:25 -04:00
hairlessbear
54578366b2 Revert "Changed Difficulty link from Trello to Wiki" 
This reverts commit 0f7ccca00b.
 2015-04-11 21:53:20 -04:00
hairlessbear
0f7ccca00b Changed Difficulty link from Trello to Wiki 
Changed the Difficulty link from the Trello feature request to the
appropriate wiki page
 2015-04-11 21:49:57 -04:00
Blade Barringer
24ad30aab4 Add port to BASE_URL in config example 2015-04-11 19:31:25 -05:00
Matteo Pagliazzi
9b19bd5076 chore(i18n): update locales 2015-04-11 14:53:33 +02:00
Blade Barringer
f7d30dbc86 Remove only block on karma test 2015-04-11 00:01:39 -05:00
Blade Barringer
5f8477ff10 Merge pull request #5005 from crookedneighbor/hall_of_heroes_quick_click 
Made uuid in hall of heroes populate the input box
 2015-04-10 23:56:34 -05:00
Blade Barringer
8642366f15 scroll to top and load hero; add tests for new behavior. 2015-04-10 23:51:34 -05:00
Blade Barringer
730ac4b3df correct chat api tests; prevent sending a blank message via the api 2015-04-10 18:27:58 -05:00
Blade Barringer
426960c590 Merge branch 'develop' into Horacious-APIv2 2015-04-10 07:33:26 -05:00
Blade Barringer
24ef3aa012 Made uuid in hall of heroes populate the input box 2015-04-09 21:57:06 -05:00
Blade Barringer
ddc91e0227 Merge branch 'develop' into TheHollidayInn-tasks-add-multiple-maintain-order 2015-04-09 17:32:09 -05:00
Blade Barringer
3fe47957fb Merge pull request #4989 from TheHollidayInn/fortify-potion-new-art 
Updated fotify potion art
 2015-04-09 17:22:23 -05:00
Blade Barringer
9e118cbfcc Added gem popover title back in 2015-04-09 17:19:58 -05:00
TheHollidayInn
ab2390e8c9 Updated fotify potion art 2015-04-09 09:15:32 -05:00
Blade Barringer
252e2d0768 Removed gem popover string 2015-04-09 08:09:09 -05:00
Sphinx
7efb594838 Pulling in commits from shared repo 
Additional changes to other languages are required before merging!

https://trello.com/c/SvTsLdRF/12-translations
"0leg
It would be great if we could have "%number_of% Participants" instead of just "Participants" in the source language so that we could translate it as "участников: %number_of%" which is the only correct way to translate it into Russian without grammatical mistakes. (This example is from Challenges tab.)"
Conflicts:
	locales/en/challenge.json
 2015-04-09 08:01:34 -05:00
Sphinx
69e1b4f8e6 Update challenges.jade 
Additional changes in translations required before merging!

https://trello.com/c/SvTsLdRF/12-translations
"0leg
It would be great if we could have "%number_of% Participants" instead of just "Participants" in the source language so that we could translate it as "участников: %number_of%" which is the only correct way to translate it into Russian without grammatical mistakes. (This example is from Challenges tab.)"
 2015-04-09 07:55:44 -05:00
Sphinx
0878293138 Update menu.jade 
https://github.com/HabitRPG/habitrpg/issues/2932
 2015-04-09 07:55:44 -05:00
Sphinx
b9490d39b8 Update gems.jade 
https://github.com/HabitRPG/habitrpg/issues/2932
 2015-04-09 07:53:53 -05:00
Alys
556a1640c6 Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03 
Conflicts:
	common/dist/scripts/habitrpg-shared.js
	common/script/content.coffee
	common/script/index.coffee
 2015-04-09 16:50:10 +10:00
Alys
882827c105 Merge pull request #5000 from gisikw/sort-dated-todos 
Put list back into removeTask fn, update removal logic within challegeCtrl
 2015-04-09 16:37:57 +10:00
Kevin Gisi
860ca9fc16 Put list back into removeTask function, update removal logic within challengeCtrl 2015-04-08 23:03:45 -04:00
Blade Barringer
a3cbca2089 Merge pull request #4991 from TheHollidayInn/filters-sort-adjustments 
Removed axis resrtiction to ease reordering of large number of tags
 2015-04-08 20:57:40 -05:00
Blade Barringer
cdd0b29924 Merge branch 'develop' into gisikw-sort-dated-todos 2015-04-08 20:47:38 -05:00
Blade Barringer
695d5f9ef3 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-04-08 19:47:21 -05:00
Blade Barringer
9b406a3c3b Merge branch 'gisikw-make-e2e-specs-travis-friendly' into develop 
Conflicts:
	common/dist/scripts/habitrpg-shared.js
 2015-04-08 19:46:31 -05:00
Tyler Renelle
8a33de219c feat(analytics): updated cron experiment ID 2015-04-08 17:37:40 -06:00
Tyler Renelle
fee002b289 feat(analytics): better events organization via category>label>action>value 2015-04-08 17:29:55 -06:00
Blade Barringer
3df45a8cb0 Merge branch 'TheHollidayInn-error-message-rewrite' into develop 2015-04-08 18:11:51 -05:00