Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,228 Commits 64 Branches 1,256 Tags
979acded92e5a60581b7bdbfa515cd929efeaeb2
Commit Graph

12228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kaitlin Hipkin 979acded92 Merge branch 'develop' into new_party_badges 2016-03-15 16:17:25 -04:00
Kaitlin Hipkin 93c5cc0385 add tests for awarding party {up,on} achievs 2016-03-15 16:03:36 -04:00
Sabe Jones a9e0a4dfaf chore(news): announce badges and Spring Plot 2016-03-15 15:42:15 -04:00
Sabe Jones beb86ea4bd Merge branch 'khipkin/party-badges' into develop 
Conflicts:
	common/dist/sprites/spritesmith-main-10.png
	common/dist/sprites/spritesmith-main-11.png
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png
	common/dist/sprites/spritesmith-main-6.png
	common/dist/sprites/spritesmith-main-7.png
	common/dist/sprites/spritesmith-main-8.png
	common/dist/sprites/spritesmith-main-9.png
 2016-03-15 14:57:38 -04:00
Matteo Pagliazzi fdeddc8631 pin stripe to specific version 2016-03-14 18:30:10 +01:00
Blade Barringer ed013ee34d Merge pull request #6878 from crookedneighbor/update_protractor 
Update protractor
 2016-03-13 22:24:59 -05:00
Blade Barringer 278b972c61 lint: Add missing semicolon to test helper 2016-03-13 22:06:09 -05:00
Blade Barringer 6ce0893edc test: unpend registration test 2016-03-13 21:56:42 -05:00
Blade Barringer 3ffb84d890 test: Reset db before running e2e tests 2016-03-13 21:56:12 -05:00
Blade Barringer 88ef920a2f fix: Update travis yaml to run protractor 3 2016-03-13 21:16:51 -05:00
Blade Barringer 17d2efb822 refactor: Organize protractor setup 2016-03-13 16:41:57 -05:00
Matteo Pagliazzi b948fc031f fix typo in common code 2016-03-13 21:12:19 +01:00
Blade Barringer 0b65292e4b test: Update protractor to v3 and use mocha 2016-03-13 09:51:01 -05:00
Matteo Pagliazzi 6fa23ae49f make sure to clone drop so original properties do not change 2016-03-11 19:11:46 +01:00
Kaitlin Hipkin 997fe155e2 fix blurry upscale of achievement-partyUp img 2016-03-10 20:49:54 -05:00
Kaitlin Hipkin 792e8d8094 fix awarding of party {up,on} achievs to update server 2016-03-10 20:38:53 -05:00
Sabe Jones d28219e90d fix(content): Pfeffernusse typo, again 2016-03-10 17:35:36 -06:00
Sabe Jones d608fdb437 fix(news): Pfeffernusse typo 2016-03-10 16:59:39 -06:00
Matteo Pagliazzi a9c9d6d1cc Merge pull request #6834 from HabitRPG/split-shared 
Split shared ops
 2016-03-10 17:34:46 +01:00
Matteo Pagliazzi 05676d834e remove git conflict data 2016-03-10 17:13:13 +01:00
Matteo Pagliazzi c39967767c Merge branch 'develop' into split-shared 2016-03-10 17:00:59 +01:00
Sabe Jones 2a5011b648 fix(content): don't be clever with quest names 2016-03-09 16:57:43 -06:00
Sabe Jones d92614844a Merge pull request #6849 from HabitRPG/sabrecat/pets-201603 
Pet quest March 2016
 2016-03-09 15:11:14 -06:00
Sabe Jones cc53e6e9dc Merge pull request #6733 from vIiRuS/mobileStorage 
Store data for next mobile update
 2016-03-09 14:56:15 -06:00
Sabe Jones 45b8dbc1a6 feat(content): snails complete 2016-03-09 15:55:22 -05:00
Sabe Jones d153df7805 feat(content): snail pet quest WIP 2016-03-09 15:34:57 -05:00
Kaitlin Hipkin b0fe5f4081 add 2x party up/on achieve images and recompile spritesheets 2016-03-09 12:43:54 -05:00
Kaitlin Hipkin 6642a8e131 add party up/on achiev images and recompile spritesheets 2016-03-09 12:02:43 -05:00
Kaitlin Hipkin fe178a62d9 move party up/on achievs about beast/mount achievs on profile 2016-03-08 21:03:57 -05:00
Kaitlin Hipkin 2ade78fc34 show party up/on achievs on user's profile achievements section 2016-03-08 20:57:19 -05:00
Kaitlin Hipkin d2d3b9deab award party {up,on} achiev when party reaches {2,4} members 2016-03-08 20:55:18 -05:00
Kaitlin Hipkin 167eb8973a add strings for new partyUp and partyOn achievs 2016-03-08 20:45:33 -05:00
Matteo Pagliazzi 582ded4494 disable rate limiting middleware 2016-03-08 23:21:11 +01:00
Sabe Jones f5ea9c5524 fix(analytics): don't log chat messages 2016-03-08 15:19:39 -05:00
Blade Barringer 842d031d5b Merge pull request #6828 from HabitRPG/upgrade_node 
chore: Upgrade node
 2016-03-08 13:09:59 -06:00
Matteo Pagliazzi 986bfd8035 split remaining utilities from shared 2016-03-08 19:35:02 +01:00
Blade Barringer 155cd6c626 fix: Correct how faq module is exported 2016-03-08 11:59:45 -06:00
Matteo Pagliazzi bb6f0f4252 split user.fns 2016-03-08 18:58:39 +01:00
Matteo Pagliazzi 393a26e51a fix typo: reroll -> rebirth 2016-03-08 18:02:23 +01:00
Matteo Pagliazzi a351cb5f4e change references to imported libs 2016-03-08 17:49:18 +01:00
Matteo Pagliazzi 5a2daabada remove all changes from eslint --fix 2016-03-08 17:45:14 +01:00
Alys 76799eee05 Merge pull request #6837 from zesme/fix-tavern-tier-1-icon 
Changed tavern tier 1 text icon
 2016-03-08 20:26:46 +10:00
Lucas Torroba d502db71e5 Changed tavern tier 1 text icon 
The icon for the text/description of the 1st tier contributor was
incorrect. It should be the boot icon, but the firefox icon was being
displayed.
 2016-03-08 03:05:46 -03:00
Matteo Pagliazzi eeebe4c342 wip: split shared ops 2016-03-07 23:02:42 +01:00
Matteo Pagliazzi 8437c21a51 start splitting ops (readCard has tests) 2016-03-07 19:32:49 +01:00
Kaitlin Hipkin 98497ea739 Merge branch 'develop' of https://github.com/khipkin/habitrpg into develop 2016-03-07 03:20:58 -05:00
Phillip Thelen 36790592c6 add tests for improvement categories 2016-03-06 17:56:51 +01:00
Alys 34057c375b Merge pull request #6819 from zesme/develop 
Closed issue #6758 - prevent multiple confirm/cancel popups from group Leave button
 2016-03-06 20:28:47 +10:00
Alys 87bd55cca1 Merge pull request #6780 from colwem/issue6774 
Improve styling of markdown blockquotes - fixes #6774
 2016-03-06 19:59:30 +10:00
Alys e59f614568 Merge pull request #6786 from murraybd/use-level-style-in-modals 
Use level style in modals
 2016-03-06 18:52:21 +10:00