Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,099 Commits 64 Branches 1,256 Tags
98e74b42e0a67caeaa7cda25587ac5dc932c19e9
Commit Graph

14099 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer 3a63896e40 chore: Upgrade dependencies to v3 versions 2016-04-08 17:35:03 -05:00
Blade Barringer 3250d9d064 chore: Remove unused qs dependency 2016-04-08 17:35:03 -05:00
Blade Barringer 46681d9a1a chore: Update nodemailer to v1 2016-04-08 17:35:03 -05:00
Blade Barringer e6b5a6820f Merge pull request #7044 from HabitRPG/flag_email_refactor 
refactor: Simplify flag_report_email load
 2016-04-08 17:31:13 -05:00
Blade Barringer 2bbae8c5f5 refactor: Simplify flag_report_email load 2016-04-08 17:14:14 -05:00
Sabe Jones b7d801a603 fix(news): typo 2016-04-08 16:17:51 -05:00
Keith Holliday 1685b7285f Ported reroll. Added unit tests. Added reroll route. Added integration tests 2016-04-08 15:56:11 -05:00
Ubuntu 7118e68cf0 chore(news): Beguilement Strike Bailey 2016-04-08 19:06:09 +00:00
Matteo Pagliazzi 83fa30fd0a v3 adapt v2: port challenges closing and fix create 2016-04-08 18:45:50 +02:00
Matteo Pagliazzi 70fd869934 Merge branch 'api-v3' into api-v3-adapt-v2 2016-04-08 12:03:50 +02:00
Matteo Pagliazzi 276cbc58bb v3: fix cron middleware, remove unused code from shared 2016-04-08 11:56:51 +02:00
Matteo Pagliazzi 116839ca81 Merge pull request #7018 from piousbox/shared-code-webhooks 
Shared code webhooks
 2016-04-08 11:04:57 +02:00
Victor Piousbox 9704c47293 Merge branch 'api-v3' into shared-code-webhooks 2016-04-07 21:23:38 +00:00
Victor Piousbox 4c0f9ed1c8 resolving conflicts 2016-04-07 21:23:16 +00:00
Matteo Pagliazzi 4d28eea6e2 Merge pull request #7037 from TheHollidayInn/api-v3-ops-rebirth 
Ported rebirth. Add unit tests. Added rebirth route. Added integration tests
 2016-04-07 23:18:15 +02:00
Keith Holliday fec9ce3dbe Ported rebirth. Add unit tests. Added rebirth route. Added integration tests 2016-04-07 15:02:55 -05:00
Matteo Pagliazzi 5a259e7a25 v3 adapt v2: port quests 2016-04-07 16:11:17 +02:00
Matteo Pagliazzi 2d3fbe9f13 v3 adapt v2: lint client only shared ops and enable members integration tests 2016-04-07 11:54:36 +02:00
Matteo Pagliazzi d49847688e v2 adapt to v3: port challenges create, get and list 2016-04-07 11:22:10 +02:00
Matteo Pagliazzi 12255181d8 Merge branch 'TheHollidayInn-api-v3-ops-revive' into api-v3 2016-04-06 23:24:27 +02:00
Matteo Pagliazzi 81d665513c Merge branch 'api-v3-ops-revive' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-revive 2016-04-06 23:24:14 +02:00
Matteo Pagliazzi cc4ade2e6d Merge pull request #7029 from TheHollidayInn/api-v3-ops-unlock 
Ported unlock. Add unit tests. Create unlock route. Add integration tests
 2016-04-06 23:08:17 +02:00
Keith Holliday 621bf9609e Ported revive. Added unit tests. Add revive route. Added integration tests 2016-04-06 15:59:42 -05:00
Keith Holliday 2bd710a882 Ported unlock. Add unit tests. Create unlock route. Add integration tests 2016-04-06 15:53:32 -05:00
Matteo Pagliazzi 884493f165 fix(delete tags): correctly import Tasks module 2016-04-06 19:41:38 +02:00
Matteo Pagliazzi b431b02012 v3 adapt v2: port tags, cast, cron, deletUser and removeMember. Fix a few bugs in v3 2016-04-06 19:28:43 +02:00
Matteo Pagliazzi a72c6c782d Merge pull request #7026 from TheHollidayInn/api-v3-ops-sell 
Ported sell function. Add unit tests. Create sell route. Add integration tests
 2016-04-06 18:42:06 +02:00
Keith Holliday 05b41bb41c Ported sell function. Add unit tests. Create sell route. Add integration tests 2016-04-06 08:27:18 -05:00
Blade Barringer 7e9163a17f chore: Remove apdex check from new relic monitoring 2016-04-05 20:08:44 -05:00
Blade Barringer 74dace9b5a chore: Re-enable New Relic 
closes #7011
 2016-04-05 20:08:31 -05:00
Blade Barringer ae14d405cb fix(css): Scope textarea z-index to just task boxes 2016-04-05 20:07:11 -05:00
Sabe Jones 1f6eef0082 Sabrecat/armoire 201604 
* WIP(content): add sprites

* feat(content): Armoire and Backgrounds 2016-04
 2016-04-05 15:30:01 -05:00
Blade Barringer 7425af4fb4 Merge pull request #7013 from Hus274/develop 
Splitting party and boss damage notifications into two code blocks.
 2016-04-05 09:01:36 -05:00
Blade Barringer 7d17921621 Merge pull request #7020 from MathWhiz/patch-2 
fix: Allow task notes textarea to rest above other elements when expanded
 2016-04-05 08:56:39 -05:00
Matteo Pagliazzi 08239345b5 v3 adapt v2: port leave, join and invite for groups controller 2016-04-05 13:03:20 +02:00
Matteo Pagliazzi 374d11b0e4 v3 adapt v2: port chat routes and group.update 2016-04-05 12:02:00 +02:00
MathWhiz c7d058f2bc Add z-index to notes textarea 2016-04-04 20:48:54 -05:00
Matteo Pagliazzi 0a40c56973 api v3 adapt v2: correctly import dependencies, port create, get, list groups 2016-04-04 23:18:49 +02:00
Victor Piousbox 14b0ec8b03 shared-code-webhooks 2016-04-04 16:31:48 +00:00
Matteo Pagliazzi f6fc50f6c2 adapt v2: port updateUser 2016-04-04 17:18:42 +02:00
Matteo Pagliazzi 10583b78de fix challenge unit tests 2016-04-04 17:18:42 +02:00
Matteo Pagliazzi c3945de098 fix tasks updating and reminders tests 2016-04-04 17:18:42 +02:00
Matteo Pagliazzi f3abdaf692 adapt v2: port updateTask 2016-04-04 17:18:42 +02:00
Matteo Pagliazzi 382e391fd0 port updateTask, addTask, clearCompleted, taskDefaults, uuid 2016-04-04 17:18:42 +02:00
Matteo Pagliazzi 060e3b1045 adapt v2: fix linting 2016-04-04 17:16:57 +02:00
Matteo Pagliazzi cc65bb1ed7 adapt v2: getTask, getTasks, clearCompleted, addTask, deleteTask, getUser, getUserAnonymized, scoreTask (challenge part missing) 2016-04-04 17:16:57 +02:00
Matteo Pagliazzi 58c20c2a64 v2 port: enable integration tests, port register route 2016-04-04 17:16:57 +02:00
Matteo Pagliazzi fc73fc7f8c v3: start adapting v2 2016-04-04 17:16:57 +02:00
Matteo Pagliazzi 68ff26e6d6 v3: check that tasks are deleted when the user deletes the acocunt and misc fixes 2016-04-04 17:16:36 +02:00
Matteo Pagliazzi 1620614b3b Merge branch 'TheHollidayInn-api-v3-ops-release-mounts' into api-v3 2016-04-04 11:49:17 +02:00