cb566a9679
Merge pull request #441 from negue/markdown
...
markdown timeoutTime attribute
2015-01-20 17:57:23 +01:00
cc6cb3785e
Merge branch 'mountmaster' into bailey-20150120
...
Conflicts:
dist/habitrpg-shared.css
dist/spritesmith0.css
dist/spritesmith0.png
dist/spritesmith1.css
dist/spritesmith1.png
dist/spritesmith2.css
dist/spritesmith2.png
dist/spritesmith3.css
dist/spritesmith3.png
dist/spritesmith4.css
dist/spritesmith4.png
2015-01-20 10:39:45 -06:00
07fec4a205
Merge branch 'mountmaster' into bailey-20150120
2015-01-20 10:30:40 -06:00
f0d4135d54
Merge pull request #4546 from SabreCat/stressbeast
...
World boss desperation move
2015-01-19 23:17:32 -06:00
6a6a4e5924
Merge pull request #446 from SabreCat/stressbeast
...
World boss desperation move
2015-01-19 23:17:26 -06:00
da2d59734c
fix(world-boss): simplify desperation stats
2015-01-19 23:00:00 -06:00
0137dd7209
fix(world-boss): Need markModified
2015-01-19 22:36:10 -06:00
0a0a3f78cf
fix(world-boss): Desperation logic
2015-01-19 22:14:09 -06:00
3189ab92af
Wrote error message for when trying to send gems to self from balance
2015-01-19 22:13:21 -06:00
3ee965d8d2
feat(world-boss): Desperation move
2015-01-19 21:48:58 -06:00
7925935ff5
feat(world-boss): Desperation move
2015-01-19 21:47:27 -06:00
42e1020c60
Added back in showCompleted=false to display tags
2015-01-19 18:50:54 -06:00
899de5fc25
grunt
2015-01-19 16:14:21 -07:00
c3c144223a
Merge branch 'develop' into mountmaster
2015-01-19 14:47:17 -06:00
b26d5ee732
Merge pull request #4540 from crookedneighbor/add-ngsanitize
...
Added ng-sanitize
2015-01-19 21:37:43 +01:00
753cac236b
Added ng-sanitize
2015-01-19 14:17:43 -06:00
3a95db0b0d
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2015-01-19 17:06:27 +00:00
f93e0ba6b9
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
...
Conflicts:
views/shared/tasks/task.jade
2015-01-19 17:06:19 +00:00
e40ea3032a
chore(news): Stress Strike 2 Bailey
2015-01-19 10:51:07 -06:00
2c88be85cf
fix(tasks): vertically align habit buttons
...
* When a task has + and - buttons, display the buttons vertically and
expand them to fill the full height of the task.
* Use glyphicons for + and - icons
2015-01-19 16:41:01 +00:00
fa8ead20c4
Merge pull request #4208 from Alys/todos-dated-tab-2014-11-01
...
create a "Dated" To-Dos tab
2015-01-19 18:16:22 +10:00
64cd6eac25
Merge pull request #350 from Alys/todos-dated-tab-2014-11-01
...
create a "Dated" To-Dos tab
2015-01-19 18:16:17 +10:00
da1a11b62d
Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01
2015-01-19 17:53:48 +10:00
57637d4271
Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01
...
ally if it merges an updated upstream into a topic branch.
2015-01-19 17:52:54 +10:00
1318d0de38
Merge pull request #4451 from crookedneighbor/vIiRuS-groupSorting
...
Group Sorting
2015-01-18 23:08:40 -06:00
62d7505233
Merge pull request #423 from crookedneighbor/vIiRuS-groupSorting
...
Additional options for group sorting in header
2015-01-18 23:08:34 -06:00
5d572c2a40
Merge pull request #4501 from crookedneighbor/fix-day-start
...
Closes #4490 . Day start saves on blur instead of change
2015-01-18 22:57:23 -06:00
b73518af5f
Removed $root from view
2015-01-18 22:54:07 -06:00
055db157f6
Merge branch 'bug/habitspell' of https://github.com/etaiklein/habitrpg into etaiklein-bug/habitspell
2015-01-18 22:50:26 -06:00
6a7d84b842
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into develop
2015-01-18 21:24:28 -06:00
8b864e114b
Compiled spritesheets
2015-01-18 21:11:49 -06:00
86c7203170
Added rock mounts
2015-01-18 21:11:41 -06:00
511b4a1b0b
Added pet rocks
2015-01-18 20:34:12 -06:00
9b9b70b7d4
change "level" to "tier"; remove incorrect number of gems
2015-01-19 11:24:42 +10:00
5a11dea855
Merge pull request #4529 from HabitRPG/triad-bingo
...
Triad bingo
2015-01-18 19:12:28 -06:00
e22269fd61
Merge pull request #442 from HabitRPG/triad-bingo
...
Triad bingo
2015-01-18 19:12:18 -06:00
69c9c12969
Updated keys to kennel info for triad bingo
2015-01-18 19:10:50 -06:00
418f54a32d
Added rock pet egg
2015-01-18 18:38:56 -06:00
0bb9aa9f56
Added rock quest boss
2015-01-18 18:30:54 -06:00
3bed7d8153
Added january mystery items
2015-01-18 18:25:25 -06:00
c13f6b15a1
Added feb background images
2015-01-18 18:12:45 -06:00
bb78b121da
revert part of a053486, angular is madeningly inconsistent with this bug
2015-01-18 16:38:31 -07:00
7c10d27c04
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-01-18 15:56:11 -06:00
505a0c4ce9
Merge branch 'scribblypanda-issue4468' into develop
2015-01-18 15:55:49 -06:00
137ff71bc8
Added one way binding for email
2015-01-18 15:55:39 -06:00
13e89f1947
Added sync after changing username so username would update
2015-01-18 15:55:39 -06:00
e0a081b0ff
Adjusted spacing and line breaks
2015-01-18 15:55:39 -06:00
cdad6e36da
Adjusted some spacing and line breaks
2015-01-18 15:55:39 -06:00
4a5fe1867d
Removed target="_blank" attribute from mailto link
2015-01-18 15:55:39 -06:00
b3c9371d9f
changed links to relative, corrected mailto link
2015-01-18 15:55:39 -06:00
negue