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

12744 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matteo Pagliazzi 9ef4b6409e Merge branch 'develop' into api-v3 and move new relic to new location 2016-02-22 11:43:35 +01:00
Matteo Pagliazzi d3e1a415a8 require newrelic as the first thing on startup 2016-02-21 22:39:55 +01:00
Matteo Pagliazzi f4d66c7384 config newrelic 2016-02-21 22:30:25 +01:00
Matteo Pagliazzi 4dfb24af6e enable newrelic 2016-02-21 22:02:37 +01:00
Matteo Pagliazzi 91be89e05a Merge pull request #6735 from HabitRPG/api-v3-dataexport 
[API v3] Data export
 2016-02-20 21:17:32 +01:00
Matteo Pagliazzi e9ac123d0e make sure cookie is never shared among multiple test users 2016-02-20 21:14:11 +01:00
Matteo Pagliazzi 62ebde3186 fix tests that require session authentication 2016-02-20 21:02:46 +01:00
Matteo Pagliazzi 2ed2fb5d06 tests for user data export 2016-02-20 10:46:11 +01:00
Matteo Pagliazzi a6d87aaa9b add tests for /export/history.csv 2016-02-20 10:16:55 +01:00
Matteo Pagliazzi 3aab4d3ef6 Merge pull request #6739 from HabitRPG/api-v3-pushnotifications 
port push notifications in api v3
 2016-02-19 21:08:00 +01:00
Matteo Pagliazzi fbc944a5cc fix push notifications imports 2016-02-19 20:59:12 +01:00
Matteo Pagliazzi fb343f8feb port push notifications in api v3 2016-02-19 20:34:55 +01:00
Matteo Pagliazzi 130110fed2 use correct path for v2 locals middleware 2016-02-19 19:44:43 +01:00
Matteo Pagliazzi cc31d266e4 port locals middleware, add some tests and a lot of fixes 2016-02-19 18:42:03 +01:00
Matteo Pagliazzi feadfbcd9e fix case when req.session is undefined and use correct syntax for authWithSession 2016-02-19 12:23:53 +01:00
Matteo Pagliazzi 192c57fa85 re-add removed code for dataexport.history 2016-02-19 12:16:09 +01:00
Matteo Pagliazzi a6db8e693f refactor dataexport controller 2016-02-19 12:13:48 +01:00
Matteo Pagliazzi 624c0da5ab Merge pull request #6732 from HabitRPG/api-v3-hall 
[API v3] Hall
 2016-02-18 20:49:51 +01:00
Matteo Pagliazzi d79e0f6e2e add tests for hall 2016-02-18 19:41:35 +01:00
Matteo Pagliazzi 2547676783 add hall controller, missing tests 2016-02-18 14:55:52 +01:00
Alys c95950c679 recompile spritesheets 2016-02-18 20:07:35 +10:00
Alys 8d106d6d78 Merge branch 'fix_gryphons' of https://github.com/taldin/habitrpg into taldin-fix_gryphons 
Conflicts:
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png
 2016-02-18 18:56:40 +10:00
Alys f631712a45 deemphasise the warning that spritesheets might be too large for mobile safari - ref https://github.com/HabitRPG/habitrpg/pull/6683#issuecomment-185462180 2016-02-18 18:52:09 +10:00
Alys 3563244cdc change number of users from 1,000,000 to 1,100,000 2016-02-18 12:42:47 +10:00
Sabe Jones bafdfc4ed5 chore(news): Bailey 20160217 2016-02-17 20:59:11 -05:00
Alys ffb5cfd46e Merge pull request #6582 from tylerxo/remove_modal_username 
Adds user details to the removal modal
 2016-02-18 06:39:31 +10:00
Matteo Pagliazzi 5ca45df602 Revert "tests for deleting old todos" 
This reverts commit d9dd031e7f.
 2016-02-15 22:12:21 +01:00
Matteo Pagliazzi e6b425d713 Revert "delete completed todos 30/90 days after completion" 
This reverts commit 0a9391ea75.
 2016-02-15 22:11:03 +01:00
Sabe Jones f7c9769aab chore(event): revert Valentine's 2016-02-15 14:48:39 -05:00
Blade Barringer d0ac43592f chore(i18n): update locales 2016-02-14 21:13:40 -06:00
Matteo Pagliazzi 28c6c27b78 Merge branch 'develop' into api-v3 2016-02-14 13:03:29 +01:00
Matteo Pagliazzi 8b7719d25e fix apidoc comments 2016-02-14 12:56:40 +01:00
Matteo Pagliazzi 1eee27bdd4 Merge pull request #6374 from HabitRPG/api-v3-groups 
[API v3] Port groups, challenges and members
 2016-02-13 11:48:31 +01:00
Matteo Pagliazzi e1b01e3853 Merge pull request #6565 from HabitRPG/sabrecat/quest-accept 
WIP: Quests for API v3
 2016-02-12 20:56:19 +01:00
Sabe Jones 00f98d90b6 Merge pull request #6705 from HabitRPG/sabrecat/chat-cutoff 
No chat notifs from big Guilds
 2016-02-12 13:22:10 -06:00
Matteo Pagliazzi edaf3ef4db fix typo: 1028->1024 bytes 2016-02-12 19:50:50 +01:00
Matteo Pagliazzi 599510aa78 higher maxBuffer for integration tests 2016-02-12 19:49:53 +01:00
Sabe Jones b4b64dcf19 fix(performance): no chat notifs from big Guilds 2016-02-12 13:18:30 -05:00
Blade Barringer 4360f01936 feat(api-v3): Add force-start quest route 2016-02-12 08:09:16 -06:00
Sabe Jones a74279f629 Merge pull request #6702 from HabitRPG/sabrecat/fix-newbie-guild 
Don't send chat notifs for Newbies Guild
 2016-02-11 20:48:17 -06:00
Sabe Jones 67929f3a96 fix(performance): don't send chat notifs for Newbies Guild 2016-02-11 21:29:32 -05:00
Matteo Pagliazzi befdb189fc fix tests for quests routes 2016-02-11 21:09:14 +01:00
Matteo Pagliazzi f68b812b90 Merge branch 'TheHollidayInn-api-v3-quests-leave' into sabrecat/quest-accept 2016-02-11 20:48:26 +01:00
Matteo Pagliazzi 6cae147b83 Merge branch 'sabrecat/quest-accept' into TheHollidayInn-api-v3-quests-leave 2016-02-11 20:48:18 +01:00
Matteo Pagliazzi 498bd31f10 Merge branch 'TheHollidayInn-api-v3-quests-abort' into sabrecat/quest-accept 2016-02-11 20:44:45 +01:00
Matteo Pagliazzi e8a38a6326 Merge branch 'sabrecat/quest-accept' into TheHollidayInn-api-v3-quests-abort 2016-02-11 20:44:27 +01:00
Matteo Pagliazzi 7d86039a82 Merge branch 'TheHollidayInn-api-v3-quests-cancel' into sabrecat/quest-accept 2016-02-11 20:24:44 +01:00
Matteo Pagliazzi 84d03dc2ad Merge branch 'sabrecat/quest-accept' into TheHollidayInn-api-v3-quests-cancel 2016-02-11 20:24:16 +01:00
Matteo Pagliazzi a73d9af020 Merge pull request #6693 from HabitRPG/TheHollidayInn-api-v3-quests-reject 
Updated quest reject
 2016-02-11 20:18:25 +01:00
Sabe Jones fdd170c977 Merge pull request #6698 from HabitRPG/sabrecat/elastic-beanstalk 
AWS Elastic Beanstalk
 2016-02-11 11:38:12 -06:00