 Blade Barringer
|
4aef4dfd0f
|
Merge branch 'develop' into common-convert
|
2015-01-29 09:23:10 -06:00 |
|
|
Saagar Saini
|
c69e3195df
|
updated capitalization of habit(s), daily, dailies
|
2015-01-29 16:47:39 +05:30 |
|
|
Blade Barringer
|
154b8a00e5
|
Merge pull request #4585 from crookedneighbor/quest-scroll-popover-and-modal-changes
Quest scroll popover and modal changes
|
2015-01-28 15:39:32 -06:00 |
|
|
Blade Barringer
|
5f1d138241
|
Added comment about questPopover function
|
2015-01-28 15:38:41 -06:00 |
|
|
Blade Barringer
|
275f55cbfe
|
Removed extra space
|
2015-01-28 15:36:13 -06:00 |
|
|
Blade Barringer
|
c328d0fd3c
|
Removed hp from popover function
|
2015-01-28 15:11:32 -06:00 |
|
|
Blade Barringer
|
043baf4961
|
Removed hp from modals
|
2015-01-28 15:10:21 -06:00 |
|
|
Blade Barringer
|
e6e1ea086e
|
Fixed alignment of notes on tasks
|
2015-01-28 14:51:51 -06:00 |
|
|
Blade Barringer
|
d3d12bc638
|
Added popover-append-to-body to inventory popovers
|
2015-01-28 14:23:38 -06:00 |
|
|
Blade Barringer
|
84552597d6
|
Adjusted hrs for popovers
|
2015-01-28 14:00:06 -06:00 |
|
|
Blade Barringer
|
6acec132b0
|
Recompiled shared
|
2015-01-28 13:53:19 -06:00 |
|
|
Blade Barringer
|
6def48e77e
|
Merge pull request #455 from crookedneighbor/new-tasks-for-onboarding
New tasks for onboarding
|
2015-01-28 13:52:12 -06:00 |
|
|
Blade Barringer
|
75eb6304eb
|
Renamed variable name
|
2015-01-28 13:51:03 -06:00 |
|
|
Blade Barringer
|
520df87362
|
fixed default todo note
|
2015-01-28 13:50:11 -06:00 |
|
|
Blade Barringer
|
21be3e8957
|
Adjusted default tasks per lemoness
|
2015-01-28 13:43:15 -06:00 |
|
|
Blade Barringer
|
4c6bf8f543
|
Added append to body to quest scroll popovers
|
2015-01-28 13:37:34 -06:00 |
|
|
Matteo Pagliazzi
|
50bc48f325
|
fix(share): addthis in static pages
|
2015-01-28 20:32:35 +01:00 |
|
|
Blade Barringer
|
ca897d7cf3
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
|
2015-01-28 10:56:57 -06:00 |
|
|
Blade Barringer
|
23c31083ef
|
Fixed triad count to actually check and make sure count is 90
|
2015-01-28 10:56:16 -06:00 |
|
|
Matteo Pagliazzi
|
dca6880d13
|
chore(i18n): update locales
|
2015-01-28 17:30:54 +01:00 |
|
|
Saagar Saini
|
cd19ef9607
|
changed capitalization of 'dailies', 'daily', and 'habit(s)'
|
2015-01-28 20:08:09 +05:30 |
|
|
benmanley
|
dc5f980083
|
fix(tasks): improve habit icon alignment
See #4539
Align habit buttons using a different CSS technique to prevent plus
icon from being cropped on Chrome for Windows.
|
2015-01-28 13:25:24 +00:00 |
|
|
Blade Barringer
|
7ef0c70b8b
|
Added placeholder blank notes
|
2015-01-27 21:52:54 -06:00 |
|
|
Blade Barringer
|
b890326545
|
Added new tasks for onboarding per lemoness
|
2015-01-27 21:50:41 -06:00 |
|
|
Blade Barringer
|
e19cf6b37f
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into develop
|
2015-01-27 20:46:18 -06:00 |
|
|
Blade Barringer
|
70d3901000
|
New strings for quest modal
|
2015-01-27 20:46:01 -06:00 |
|
|
Blade Barringer
|
d8e09884a0
|
Added quest image and info to quest invitation modal
|
2015-01-27 20:37:09 -06:00 |
|
|
Blade Barringer
|
a77a46c543
|
Added one time bindings to quest modals
|
2015-01-27 20:27:14 -06:00 |
|
|
Blade Barringer
|
eaaa09c75a
|
Added quest details to buy quest and show quest modals
|
2015-01-27 20:16:11 -06:00 |
|
|
Blade Barringer
|
4e1716a8db
|
Added hp to quest popover
|
2015-01-27 20:15:28 -06:00 |
|
|
Blade Barringer
|
b56c5af978
|
Changed popover text for quest scrolls. Closes #4575
|
2015-01-27 19:32:06 -06:00 |
|
|
Matteo Pagliazzi
|
5ba1e96b3c
|
chore(i18n): update locales
|
2015-01-27 20:36:03 +01:00 |
|
|
Sabe Jones
|
6a1e9e616d
|
chore(grunt): grunt sprite
|
2015-01-27 12:01:12 -06:00 |
|
|
Sabe Jones
|
b8d9f047b1
|
fix(sprites): Rooster recolors
Fixes https://github.com/HabitRPG/habitrpg/issues/4576.
|
2015-01-27 11:54:16 -06:00 |
|
|
Blade Barringer
|
0096873cf5
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
|
2015-01-27 09:47:03 -06:00 |
|
|
Blade Barringer
|
58650baba3
|
Merge branch 'issue#4556' of https://github.com/matttelliott/habitrpg into border
|
2015-01-27 09:10:46 -06:00 |
|
|
Matteo Pagliazzi
|
42c0b443d7
|
fix(i18n): language selection working on static pages
|
2015-01-27 15:48:57 +01:00 |
|
|
Alice Harris
|
68573b1f31
|
Merge pull request #453 from Sporax/develop
changed description for A stern talking-to from - habit to negative Habit - fixes https://github.com/HabitRPG/habitrpg/issues/4570
|
2015-01-27 19:05:48 +10:00 |
|
|
Matt T Elliott
|
2c40097403
|
move from left div to right
|
2015-01-26 23:14:19 -08:00 |
|
|
Matt T Elliott
|
3a38bb849b
|
add .border-left
|
2015-01-26 23:08:15 -08:00 |
|
|
Blade Barringer
|
b9784fa4aa
|
Added notice for rebirth in seasonal shop
|
2015-01-26 22:15:24 -06:00 |
|
|
Blade Barringer
|
0c40b43013
|
Added rebirth notice for seasonal shop
|
2015-01-26 22:15:05 -06:00 |
|
|
Blade Barringer
|
07870e1c7c
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
|
2015-01-26 19:36:38 -06:00 |
|
|
Blade Barringer
|
7eae5db256
|
Added comment describing the silly conditional for transparency in the
seasonal shop
|
2015-01-26 19:25:53 -06:00 |
|
|
Blade Barringer
|
3b1743dee8
|
Corrected ng-class condition to show transparent class
on seasonal shop items after rebirth
|
2015-01-26 18:55:10 -06:00 |
|
|
Saagar Saini
|
c83a91886d
|
Update questsContent.json
|
2015-01-27 03:34:15 +05:30 |
|
|
Saagar Saini
|
b469419c70
|
changed description for A stern talking-to from - habit to negative Habit
|
2015-01-27 03:03:43 +05:30 |
|
|
Verabird
|
0f5d2411b1
|
Adjust calculation of cronMP from checklists
|
2015-01-26 15:51:55 -05:00 |
|
|
Blade Barringer
|
eceaaef954
|
Merge pull request #4567 from crookedneighbor/add-audio-watts
Added Watts' Theme to Audio Choices
|
2015-01-26 11:27:27 -06:00 |
|
|
Sabe Jones
|
9389899ed2
|
chore(grunt): grunt full
|
2015-01-26 11:23:40 -06:00 |
|