krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 07:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,343 Commits 64 Branches 1,226 Tags
a63d5ae97ff8ff58151bbcf2b51aef151e5aa4f5
Commit Graph

2671 Commits

Author SHA1 Message Date
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
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
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
d49847688e v2 adapt to v3: port challenges create, get and list 2016-04-07 11:22:10 +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
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
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
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
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
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
c86898c7e4 Merge branch 'api-v3-ops-release-mounts' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-release-mounts 2016-04-04 11:49:06 +02:00
Matteo Pagliazzi
66959c23f5 Merge branch 'api-v3-ops-release-both' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-release-both 2016-04-04 11:46:46 +02:00
Keith Holliday
c916c74775 Ported release both, added unit tests, add release both route with integration tests 2016-04-03 14:44:00 -05:00
Keith Holliday
487a26ec43 Ported release pets, added unit tests, added route with integration tests 2016-04-03 14:37:20 -05:00
Keith Holliday
24b7b4c838 Ported release mounts, add unit tests, added release mounts route with integration tests 2016-04-03 14:34:43 -05:00
Husman
bb373ed93a Splitting party and boss damage notifications into two code blocks. 
Splitting the party and boss damage notifications into two code blocks will allow the page to push them to newlines if needed instead of added a scroll bar and making the user scroll to see the entire message.

Related issue: https://github.com/HabitRPG/habitrpg/issues/3453
 2016-04-03 10:42:15 -07:00
Matteo Pagliazzi
de74fae0b4 v3: port coupons 2016-04-02 16:37:55 +02:00
Matteo Pagliazzi
731ac86244 port changes to cron develop 2016-04-02 12:15:24 +02:00
Matteo Pagliazzi
e95837f69f Merge branch 'develop' into api-v3 2016-04-02 11:34:04 +02:00
Alys
0ba47de43d adjust cron so that it prevents a double cron when timezone decreases (timezoneOffset increases) 
* start to fix cron for when timezones change

* add some incomplete code

* change cron to identify when timezone changes and run only if both zones agree it should run - BAD - does cron an hour early one day later

* change timezone offset variable names

* improve handling of each individual timezone change possibility

* remove unnecessary casting to number

* remove duplicated code

* finish code for dangerous timezone change

* fix linting errors

* remove console.log lines and other testing code

* add a TODO comment for further actions for timezone changes in the "safe" direction
 2016-04-02 11:42:15 +10:00
Matteo Pagliazzi
843dd09d35 Merge pull request #6986 from HabitRPG/api-v3-one-app 
[Api v3] Consolidate server code and share middlewares where possible
 2016-04-01 19:30:52 +02:00
Matteo Pagliazzi
6cbbdcdcbe v3: port static pages, make routes lib more flexible, share middlewares between v2 and v3, port v1, simplify server.js 2016-04-01 19:07:03 +02:00
Matteo Pagliazzi
238dee7608 Merge pull request #6962 from piousbox/shared-code-user-score-task 
shared-code-user-score-task
 2016-04-01 18:28:55 +02:00
Victor Piousbox
e6e2c26a12 shared-code-user-score-task 2016-04-01 16:11:37 +00:00
Matteo Pagliazzi
aae94bf1b4 Merge branch 'api-v3-open-mystery-item' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-open-mystery-item3 2016-04-01 16:39:52 +02:00
Matteo Pagliazzi
82afc1971d Merge branch 'api-v3-ops-read-card' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-read-card 2016-04-01 16:30:48 +02:00
Matteo Pagliazzi
7e093f1622 Merge branch 'api-v3-hourglass-purchase' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-hourglass-purchase2 2016-04-01 16:28:20 +02:00
Matteo Pagliazzi
519b3a1e4f Merge pull request #6988 from TheHollidayInn/api-v3-ops-purchase 
Ported purchase, add unit tests, created new user purchase route, and added tests
 2016-04-01 16:20:33 +02:00