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

404 commits

Author SHA1 Message Date
Sabe Jones
f9cf860ae8 Merge pull request #5058 from SabreCat/busy-bee 
April 2015 Subscriber Items
 2015-04-24 11:05:03 -05:00
Kevin Gisi
65e42345f2 Ensure correct join/leave button for parties 2015-04-24 11:54:00 -04:00
Blade Barringer
523582f870 Add clear:both after task-column to fix floating issue 2015-04-23 17:58:33 -05:00
Blade Barringer
f1c8941724 Merge pull request #5065 from crookedneighbor/social-number-placement 
Added button for jumping to inbox
 2015-04-23 17:41:03 -05:00
Matteo Pagliazzi
54e82a14a2 fix(invite-friends): text should be valid for both parties and guilds 2015-04-23 20:48:44 +02:00
hairlessbear
e16c1c2ec3 Fixed challenge achievement always displaying 
Challenge achievement will now only display if the user has won 1 or more challenges.
 2015-04-22 22:06:50 -04:00
hairlessbear
93fcc8e71b Fixed challenges achievement always displaying 2015-04-22 21:54:08 -04:00
Blade Barringer
8cec2da905 Added button for jumping to inbox 2015-04-22 19:29:24 -05:00
Kevin Gisi
705f9016c5 Use minification-friendly syntax 2015-04-22 12:04:04 -04:00
Matteo Pagliazzi
37f7db3c4e feat(emails): add support for weekly recap emails 2015-04-22 16:30:53 +02:00
Alys
7c36e49243 Merge pull request #5022 from gisikw/dated-tasks-correct-impl 
Dated tasks correct impl
 2015-04-22 16:56:03 +10:00
Alys
56592d144d Merge pull request #5048 from Rbrinkley/patch-1 
Update front.jade
 2015-04-22 15:34:22 +10:00
Alys
28e49f99f5 Merge pull request #5055 from gisikw/contributor-profile-fix 
Inject RootCtrl into MemberModalCtrl to expose shared methods
 2015-04-22 15:34:10 +10:00
Sabe Jones
7a7fc96818 feat(mystery): April Subscribee Items 2015-04-21 21:14:19 -05:00
Kevin Gisi
a05714405a Inject RootCtrl into MemberModalCtrl to expose shared methods 2015-04-21 05:17:15 -04:00
Rbrinkley
340c484547 Increased Carousel Sliding Time on Static.Front 
Increased carousel sliding time for front page in the "Players use HabitRPG to Manage" section. Increased time from 4 seconds to 10 seconds. Not too slow and not too fast. fixes https://github.com/HabitRPG/habitrpg/issues/5047
 2015-04-19 10:52:34 -05:00
Alys
175ec9bb46 Merge pull request #5007 from stillsnowedin/develop 
Updated the custom day start information in settings. (#5006)
 2015-04-19 15:02:37 +10:00
Rbrinkley
26c1003f4a Update front.jade 
Increased time for carousel sliding from 4 seconds to 10 seconds. 4 seconds too fast for user to full read all the information, 10 seconds is  not too slow but not too fast.
 2015-04-18 22:29:36 -05:00
Tyler Renelle
cfc8ff96e6 feat(tour): tmp set variant=2 to (counter + finish button) until we can 
get google experiment working
 2015-04-16 20:17:13 -06:00
Blade Barringer
1d95784dde refactor isMemberOfGroup and tests 2015-04-16 07:58:35 -05:00
hairlessbear
68486f7c42 Fixed display of Pet Hydra in Tavern (Tier 6) 
In the Tier 6 contributor description, the Pet Hydra wasn't displaying. Changed `div` tag to `span` to fix the issue.
 2015-04-16 07:48:15 -05:00
Blade Barringer
4853c0814d Corrected function 2015-04-16 07:39:55 -05:00
Blade Barringer
e1a623d3e0 Merge pull request #5031 from gisikw/guild-detail-join-leave 
Join/Leave buttons on guild detail page. Addresses #4427
 2015-04-15 22:46:33 -05:00
Kevin Gisi
160982df33 Simplify group detection logic for guilds 2015-04-15 23:10:12 -04:00
Sabe Jones
7d1a58ca00 fix(slimes): Tweaks and missing sprite 
Slimes don't have skeletons anyway, right?
 2015-04-15 18:48:57 -05:00
Sabe Jones
f13c6cba00 feat(pets): Slime Quest 2015-04-15 18:08:43 -05:00
Kevin Gisi
d455666650 Join/Leave buttons on guild detail page. Addresses #4427 2015-04-15 06:15:11 -04:00
Blade Barringer
c7cc6f0ae8 Merge pull request #5027 from crookedneighbor/send_test_data_to_test_db 
Send test data to test db
 2015-04-14 19:59:02 -05:00
Kathryn Norris
2fc01ee776 Simplified custom day start info in settings. (#5006) 2015-04-14 16:47:37 -07:00
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
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
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
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
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
0083c3f881 Revert "Put list back into removeTask fn, update removal logic within challegeCtrl" 2015-04-13 19:34:59 +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
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
9e118cbfcc Added gem popover title back in 2015-04-09 17:19:58 -05:00
Blade Barringer
252e2d0768 Removed gem popover string 2015-04-09 08:09:09 -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
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
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
Matteo Pagliazzi
e58521f416 Merge pull request #4968 from HabitRPG/paglias/emails-unsubscription-page 
WIP Emails unsubscription page
 2015-04-08 19:12:28 +02:00
Matteo Pagliazzi
804b7b20c7 fix email sending for non registered users 2015-04-08 19:07:36 +02:00
Kevin Gisi
f12d56e456 Revert "Merge pull request #4995 from HabitRPG/revert-4980-sort-dated-todos" 
This reverts commit 33f928b6d8, reversing
changes made to 76ef1fdd92.
 2015-04-07 22:38:43 -04:00
Kevin Gisi
9bb2f46264 Modify removeTask to accept a task object. Update task view to reflect new method signature. 2015-04-07 22:38:20 -04:00
Blade Barringer
cc674f57cd Revert "Sorted dated todos by date." 2015-04-07 19:51:27 -05:00
TheHollidayInn
9619c46df2 Removed extra console.log 2015-04-07 18:49:25 -05:00
TheHollidayInn
09761c5c53 Corrected ordering that tasks appear in when user enters multiple tasks 2015-04-07 14:51:26 -05:00
TheHollidayInn
8826ae8c41 Removed axis resrtiction to ease reordering of large number of tags 2015-04-07 09:47:52 -05:00
Matteo Pagliazzi
f12f2b201a typos 2015-04-07 16:07:52 +02:00
Matteo Pagliazzi
d21fb41aef when signing up, delete previous email preferences 2015-04-07 16:04:33 +02:00
Matteo Pagliazzi
b2ffbf4113 password resets back to nodemailer... 2015-04-07 15:53:26 +02:00
Matteo Pagliazzi
16e67ab7d4 put password resets back to email server, check for non registered users unsubscriptions 2015-04-07 14:04:03 +02:00
Matteo Pagliazzi
e6c1a72c39 use callback itself as context 2015-04-07 14:04:03 +02:00
Matteo Pagliazzi
9e95f9c17d pass entire unsubscription url to email server 2015-04-07 14:04:03 +02:00
Matteo Pagliazzi
ab1b75b655 finalize unsubscription page 2015-04-07 14:04:03 +02:00
Matteo Pagliazzi
a7c789746a fix error when signing up 2015-04-07 14:04:03 +02:00
Matteo Pagliazzi
71108ee935 feat(email): WIP start implementing unsubscription page and related features 2015-04-07 14:04:03 +02:00
Matteo Pagliazzi
7d735519ec feat(email-unsubscription-page): create model to hold unsubscriptions 2015-04-07 14:04:03 +02:00
Sabe Jones
66d5b38dad fix(news): Move pic 2015-04-06 19:26:14 -05:00
Sabe Jones
38bbf63a22 fix(news): Add heading 2015-04-06 19:24:48 -05:00
Sabe Jones
616a7d9650 feat(backgrounds): April BGs 2015-04-06 19:03:24 -05:00
Alys
32a71bfc74 Merge pull request #4980 from gisikw/sort-dated-todos 
Sorted dated todos by date.
 2015-04-06 18:22:51 +10:00
Kevin Gisi
ac01d9ad8b Sorted dated todos by date. 2015-04-06 03:47:00 -04:00
Kevin Gisi
6cfdfc5225 Added group type to challenge API, link to guild/party on challenges 2015-04-06 02:44:43 -04:00
Kevin Gisi
145f4c0fa7 Check leader._id, rather than just leader for checking challenge ownership 2015-04-06 02:32:24 -04:00
Kevin Gisi
eef3e293e2 Populate group and challenge leader on challenge GET request 2015-04-06 02:18:29 -04:00
Kevin Gisi
da81241ebe Transition Challenge -> Edit to the Singleton challenge view, to address issues associated with #4814 2015-04-06 02:18:29 -04:00
Kevin Gisi
6fb95ec27b Unset .cid for challenge on challenge delete 2015-04-06 02:18:29 -04:00
Kevin Gisi
79fe0b53c5 Added _isMember to APIv2 challenges/:cid endpoint (requires user auth) 2015-04-06 02:18:29 -04:00
Kevin Gisi
3e653c9282 Reimplemented single challenge view code from #3319 2015-04-06 02:18:29 -04:00
Alys
934fd13042 update More Info challenges link to point to wiki instead of old trello card 2015-04-06 15:35:41 +10:00
Alys
5405dbe085 revert b0bf033c54 to see if Travis build then stops failing 2015-04-06 00:43:27 +10:00
Alys
7d579ea08a Merge branch 'CancelSendOnBlankPM' of https://github.com/rdhammond/habitrpg into rdhammond-CancelSendOnBlankPM 
Conflicts:
	website/views/shared/modals/members.jade
 2015-04-05 23:24:46 +10:00
Alys
b0bf033c54 Merge pull request #4861 from TheHollidayInn/retain-guild-filters-challenges 
Added previous state tracker and a filter for challenges by a guild if the user has clicked that guilds challenge link.
 2015-04-05 23:11:36 +10:00
Alys
def7ff906f Merge pull request #4866 from TheHollidayInn/edit-plusminus-habit-challenge 
Removed css style hack for IE6 and IE7 that was interfering with habit plus/minus button behavior
 2015-04-05 22:47:20 +10:00
Alys
6199e1d843 Merge branch 'remove-interactivity-challenge-tasks' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-remove-interactivity-challenge-tasks 
Conflicts:
	website/public/css/tasks.styl
	website/views/shared/tasks/task.jade
 2015-04-05 22:01:10 +10:00
Alys
efb4773c27 Merge pull request #4958 from TheHollidayInn/groups-clear-notifs-fetch-messages 
Marked group messages as seen when user syncs new messages
 2015-04-05 20:19:51 +10:00
Alys
7aba0475fe Merge pull request #4967 from Alys/API-wording-changes-2015-04-03 
API wording adjustments (specify task types, describe when authentication is not required)
 2015-04-05 19:01:09 +10:00
Sabe Jones
3c07a8ee6b fix(frontpage): Wording tweak 2015-04-04 13:03:57 -05:00
Alys
baf38acc07 Merge pull request #4871 from TheHollidayInn/default-group-based-on-filter 
Made default group for a challenge the selected group filter if there is only one filter selected
 2015-04-04 17:01:35 +10:00