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
8583 commits 3 branches 0 tags 1.6 GiB
Commit graph

8583 commits

This branch
This branch
All branches
Author SHA1 Message Date
Blade Barringer
caaf5c6704 Merge branch 'archery' of https://github.com/remmz0r/habitrpg into archery 2015-02-17 15:13:42 -06:00
Bryce Wojtowicz
3a86435655 fixes #4670 
edited groups.json (again)
sorry last edit
!!!
 2015-02-18 05:08:02 +08:00
Bryce Wojtowicz
9f49626156 fixes #4670 
edit: fixed the linkLFG so it included the entire Guild name
 2015-02-18 05:06:13 +08:00
Bryce Wojtowicz
33520fc64d Fixed groups.json 
fixes #4702

Cheers
 2015-02-18 05:03:34 +08:00
Blade Barringer
6b0bad186e Merge pull request #4706 from ojintoad/windows-vagrant-investigations-working 
Windows vagrant investigations working
 2015-02-17 14:45:29 -06:00
Bill Parrott
7042c97d5d removing export functionality to move to its own branch 2015-02-17 14:23:55 -06:00
Bill Parrott
4563d22bf0 minor updates from code review 2015-02-17 14:05:09 -06:00
Blade Barringer
44b9ac7215 Fixed path to audio files. Closes #4704 2015-02-17 13:53:32 -06:00
scribblypanda
d46633b089 added pet colour to feed/evolve notif 2015-02-17 12:54:34 -05:00
Blade Barringer
6a910637eb Merge branch 'archery' of https://github.com/remmz0r/habitrpg into archery 2015-02-17 10:45:43 -06:00
remmz0r
2e98185c5d fixes #4670 
removed target="_blank" from archery link
 2015-02-18 00:03:37 +08:00
remmy poos
cfabb12b04 fixes #4670 
Replaced archery links in index.jade and tavern.jade

Let me know if this isn't all the links

Cheers
- remmz0r
 2015-02-17 23:52:48 +08:00
Blade Barringer
d4397a5403 Merge branch 'develop' of https://github.com/remmz0r/habitrpg into archery 2015-02-17 09:41:06 -06:00
Blade Barringer
a5ce3f58b1 Removed original user text from veteran achievement 2015-02-17 08:42:43 -06:00
remmy poos
b2aa9f399f fixes #4670 
changes Archery links to guild in tavern
 2015-02-17 22:40:18 +08:00
remmy poos
1746ec4518 fixes nothing (breaks everything) 2015-02-17 22:37:42 +08:00
Blade Barringer
6c85cd18a9 Adjusted style of bulk tasks 2015-02-17 08:37:26 -06:00
remmy poos
56c7d9ff9a couldn't figure out how to push two unedited files so this is an edit so i can repush correct files 2015-02-17 22:34:59 +08:00
remmy poos
263d136993 fixes #4696 
sorry, a billion things to learn about git
this code -should- work
tested locally
 2015-02-17 22:17:01 +08:00
Blade Barringer
48e688d815 Merge branch 'bulk-add-tasks' of https://github.com/chimericdream/habitrpg into bulk-add 2015-02-17 08:05:36 -06:00
remmy poos
a3aaa0370d Merge branch 'develop' of https://github.com/remmz0r/habitrpg into develop 
Conflicts:
	website/views/shared/profiles/achievements.jade
 2015-02-17 22:03:58 +08:00
remmz0r
f6e549caf0 fixes #4696 
original user badge not showing
veteran badge also showing now
 2015-02-17 21:58:32 +08:00
remmy poos
2ef3848a09 Fixes issue #4670 
find/replaced archery links with new guild
 2015-02-17 21:39:24 +08:00
Bill Parrott
2de3a5dd55 first draft of bulk add 2015-02-17 00:25:56 -06:00
remmz0r
02744e0c17 possibly fixed - can't test it as I can't figure out how to make a user an 'originalUser' on mongodb 2015-02-17 14:17:08 +08:00
remmz0r
7a08ff360f possibly fixed - can't test it as I can't figure out how to make a user an 'originalUser' on mongodb 2015-02-17 13:36:12 +08:00
Bill Parrott
b1b478bc74 add task export functionality 2015-02-16 21:21:49 -06:00
remmz0r
feb1e01c4d Fixed original user code in achievements.jade 2015-02-17 10:48:27 +08:00
Sabe Jones
a2772e843c Merge pull request #4697 from SabreCat/valentines 
End Valentine's event
 2015-02-16 18:42:06 -06:00
Sabe Jones
e0cbeaadc5 chore(grunt): compile sprites 2015-02-16 18:31:00 -06:00
Sabe Jones
130261dacf feat(event): End Valentine's 2015-02-16 18:15:09 -06:00
Blade Barringer
6d26d3e053 Added original user achievement badge 2015-02-16 17:55:18 -06:00
Blade Barringer
0858b871ff Closes #4693 2015-02-16 16:04:51 -06:00
Bill Parrott
9cf4d9086b be more explicit about priority value vs context class 2015-02-16 15:49:31 -06:00
Bill Parrott
812599cb77 add difficulty context class to task list items 2015-02-16 15:02:04 -06:00
Blade Barringer
16140089b0 Compiled sprites for bunny quest 2015-02-15 21:08:14 -06:00
Blade Barringer
c23f83c5ac Added new files for bunny quest 2015-02-15 21:05:03 -06:00
Todd Ogin
6c9a075aae running grunt is technically unnecessary 2015-02-15 18:17:52 -05:00
Todd Ogin
65c6d5fc9d Restores postinstall hook to use local modules 
Adds grunt to vagrant.sh to mimic postinstall hook
 2015-02-15 12:38:48 -05:00
Todd Ogin
1c317b01b4 Removes custom bower directories 
Updates Vagrantfile with correct symlink configuration option
Switches bower/grunt in postinstall script to use the globals
Changes phantomjs to an npm package install
adds --no-bin-link to npm install
 2015-02-15 09:30:07 -05:00
Blade Barringer
db97c74033 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-02-14 18:19:21 -06:00
Blade Barringer
60b73af22e Removed gulp and some duplicate dependencies 2015-02-14 18:19:06 -06:00
Matteo Pagliazzi
34d8a910e3 chore(i18n): update locales 2015-02-14 17:56:11 +01:00
Blade Barringer
28c648bb0b Compiled sprites for new backgrounds 2015-02-13 16:22:28 -06:00
Blade Barringer
235cf8cc24 Added new backgrounds 2015-02-13 16:20:49 -06:00
Blade Barringer
5d35d7dc86 Merge pull request #4680 from crookedneighbor/config-grunt 
Config grunt
 2015-02-13 10:21:05 -06:00
Blade Barringer
84ce4bb5d8 Corrected path to config.json 2015-02-13 09:45:18 -06:00
Blade Barringer
7cf8745375 Corrected gruntfile to use process.env.NODE_ENV 2015-02-13 09:43:28 -06:00
Blade Barringer
ca50c31bc0 Adjusted grunt command so it behaves differently on production and 
development
 2015-02-13 09:31:56 -06:00
Blade Barringer
9dfd96b84f Moved and configured config.json to be in root of directory 2015-02-13 09:24:16 -06:00