7ec9687774
Add linting from api-v3
2015-11-14 07:40:05 -06:00
d365868fdc
Merge pull request #6235 from crookedneighbor/fix_ch_tw
...
Adjust i18n script to actually display zh_TW language.
2015-11-13 16:17:58 -06:00
0a99361953
Adjust i18n script to actually display zh_TW language.
2015-11-13 15:52:52 -06:00
256bce1172
Revert "Ignorado sublime"
...
This reverts commit 0947a5be73
2015-11-13 10:36:27 -04:30
ada97c1f91
Add invite party to ios tutorial
2015-11-13 07:19:51 -06:00
27d3d9d296
Merge pull request #6229 from HabitRPG/emails
...
Adjust the way email invitations resolve.
2015-11-13 07:18:41 -06:00
565aaff976
Merge pull request #6219 from HabitRPG/js_ify_common
...
Js ify common
2015-11-13 06:49:54 -06:00
e4679d6a63
Adjust the way email invitations resolve.
2015-11-12 18:58:01 -06:00
8e147d7b12
Allow users who register via facebook to see site tutorial.
2015-11-12 18:26:42 -06:00
807726305f
Added timezone form
2015-11-12 19:27:25 -04:30
3f37da6f04
Created filter to convert timezone offset to UTC
2015-11-12 19:24:28 -04:30
71567be4a6
Merge pull request #6227 from crookedneighbor/fix_tutorial_flag
...
Fixes #6225
2015-11-12 13:05:18 -06:00
abe778836d
Fixes #6225
2015-11-12 12:52:35 -06:00
5fb585b896
Merge pull request #6226 from HabitRPG/fix_tutorial_flag
...
Move header assignment to app level
2015-11-12 12:37:31 -06:00
431bbd762f
Move header assignment to app level
2015-11-12 12:23:42 -06:00
5ebead68ab
Remove coffee version of i18n
2015-11-11 21:24:21 -06:00
efd0e2333e
Merge pull request #6200 from gauthamchandra/feature/quick-checkout-from-dailies
...
User can now check out of inn from tasks page
2015-11-11 20:49:35 -06:00
7559f14f4d
Remove coffee from files
2015-11-11 20:40:26 -06:00
3a13a5ee2c
Remove unneeded coffeescript requires in tests.
2015-11-11 20:32:17 -06:00
25ae2e4252
Move browserify task to gulp
2015-11-11 20:32:17 -06:00
9408effb4e
Remove coffeescript dependency from website
2015-11-11 20:32:16 -06:00
774a42d67e
Convert coffee files to JS
2015-11-11 20:32:00 -06:00
b5efa4ae4c
Additional formatting
2015-11-11 21:25:22 -05:00
92a8c3d958
chore(i18n): update locales
2015-11-11 20:24:12 -06:00
f0a484bbe1
fix(strings): Variable population count
2015-11-11 21:10:24 -05:00
77ded02fa0
Formatting changes for readability
2015-11-11 21:05:08 -05:00
52f9f03afb
fix(news): Link to Teespring storefront
2015-11-11 20:19:48 -05:00
6acd6460ea
Merge pull request #6218 from crookedneighbor/increase_code_coverage_for_clearflags_route
...
Increase code coverage for clearflags route
2015-11-11 18:49:37 -06:00
43064dcf9a
Wrap flag purcging code in check for flags object
2015-11-11 18:00:15 -06:00
13da95b552
Add tests for clearflags route
2015-11-11 17:58:41 -06:00
bbff19920f
Merge pull request #6217 from HabitRPG/sabrecat/pet-201511
...
November pet quest: Snakes
2015-11-11 17:51:41 -06:00
83b61f9aa3
Merge branch 'develop' into sabrecat/pet-201511
...
Conflicts:
common/dist/sprites/spritesmith-main-5.css
common/dist/sprites/spritesmith-main-5.png
common/dist/sprites/spritesmith-main-6.css
common/dist/sprites/spritesmith-main-6.png
common/dist/sprites/spritesmith-main-7.css
common/dist/sprites/spritesmith-main-7.png
common/dist/sprites/spritesmith-main-8.css
common/dist/sprites/spritesmith-main-8.png
common/dist/sprites/spritesmith-main-9.css
common/dist/sprites/spritesmith-main-9.png
2015-11-11 18:36:25 -05:00
06a5a1cb95
Merge pull request #6042 from HabitRPG/sabrecat/more-modals
...
More and better modals; Social Media sharing
2015-11-11 17:32:43 -06:00
b32ab5a587
chore(news): Pet quest Bailey
...
Also adds one missing sprite asset for the quest.
2015-11-11 18:31:22 -05:00
edb0b5e0af
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-11-11 18:28:12 -04:30
eba2ac386e
feat(pets): November quest
...
Fully functional commit. Missing only Bailey and the quest scroll sprite.
2015-11-11 17:23:16 -05:00
3672601999
fix(chat): Handle nonexistent message.flags
2015-11-11 16:25:36 -05:00
586edc03c6
WIP(pets): Incomplete cobra sprites
2015-11-11 16:23:38 -05:00
cc92b985a2
fix(sharing): Translatable share strings
2015-11-11 13:35:14 -05:00
cc2a6d4db1
fix(sharing): Push ng-binding into Jade
2015-11-11 13:09:00 -05:00
117a254cc8
Patch exploit that would allow users to auto-delete messages
2015-11-11 06:46:11 -06:00
be3fe8f1f4
Added check for existence of dateTerminated field
2015-11-10 22:39:53 -05:00
63f00d3643
fix(sharing): Better Tweet syntax
...
Angular bindings would fail to parse in Tweets if the expression evaluated to something with a space in it. Adding quotes stretches the Tweet by two characters, but addresses the issue. Commit also takes out a spurious console message from the Notifications service.
2015-11-10 17:07:34 -05:00
a393cdc94b
fix(sharing): Correct Jade interpolation
2015-11-10 16:33:33 -05:00
ada7ca71ad
fix(sharing): Use env BASE_URL
2015-11-10 16:27:40 -05:00
23df5b608d
feat(sharing): Remaining cheevo modals
2015-11-10 13:43:37 -05:00
1fc21167dc
Send back flag data if user had flagged the message.
2015-11-10 08:15:54 -06:00
875f2ac552
feat(sharing): More achievements
2015-11-10 00:08:17 -05:00
eed4207c6d
Merge branch 'develop' into sabrecat/more-modals
...
Conflicts:
common/dist/sprites/spritesmith-largeSprites-0.png
common/locales/en/front.json
2015-11-09 16:24:17 -05:00
e3f3be828e
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-11-09 14:58:38 -04:30
Blade Barringer