Blade Barringer
7842bbe22e
Added stressbeast strike news
2015-01-20 15:58:00 -06:00
Blade Barringer
ebd5bbd19b
Added new info to Bailey announcement
2015-01-20 14:37:17 -06:00
Blade Barringer
07fec4a205
Merge branch 'mountmaster' into bailey-20150120
2015-01-20 10:30:40 -06:00
Sabe Jones
f0d4135d54
Merge pull request #4546 from SabreCat/stressbeast
...
World boss desperation move
2015-01-19 23:17:32 -06:00
Sabe Jones
da2d59734c
fix(world-boss): simplify desperation stats
2015-01-19 23:00:00 -06:00
Sabe Jones
0137dd7209
fix(world-boss): Need markModified
2015-01-19 22:36:10 -06:00
Sabe Jones
0a0a3f78cf
fix(world-boss): Desperation logic
2015-01-19 22:14:09 -06:00
Blade Barringer
3189ab92af
Wrote error message for when trying to send gems to self from balance
2015-01-19 22:13:21 -06:00
Sabe Jones
3ee965d8d2
feat(world-boss): Desperation move
2015-01-19 21:48:58 -06:00
Blade Barringer
c3c144223a
Merge branch 'develop' into mountmaster
2015-01-19 14:47:17 -06:00
Matteo Pagliazzi
b26d5ee732
Merge pull request #4540 from crookedneighbor/add-ngsanitize
...
Added ng-sanitize
2015-01-19 21:37:43 +01:00
Blade Barringer
753cac236b
Added ng-sanitize
2015-01-19 14:17:43 -06:00
benmanley
3a95db0b0d
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2015-01-19 17:06:27 +00:00
benmanley
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
Sabe Jones
e40ea3032a
chore(news): Stress Strike 2 Bailey
2015-01-19 10:51:07 -06:00
benmanley
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
Alice Harris
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
Alice Harris
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
Blade Barringer
1318d0de38
Merge pull request #4451 from crookedneighbor/vIiRuS-groupSorting
...
Group Sorting
2015-01-18 23:08:40 -06:00
Blade Barringer
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
Blade Barringer
b73518af5f
Removed $root from view
2015-01-18 22:54:07 -06:00
Blade Barringer
055db157f6
Merge branch 'bug/habitspell' of https://github.com/etaiklein/habitrpg into etaiklein-bug/habitspell
2015-01-18 22:50:26 -06:00
Blade Barringer
5a11dea855
Merge pull request #4529 from HabitRPG/triad-bingo
...
Triad bingo
2015-01-18 19:12:28 -06:00
Tyler Renelle
bb78b121da
revert part of a053486, angular is madeningly inconsistent with this bug
2015-01-18 16:38:31 -07:00
Blade Barringer
7c10d27c04
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-01-18 15:56:11 -06:00
Blade Barringer
505a0c4ce9
Merge branch 'scribblypanda-issue4468' into develop
2015-01-18 15:55:49 -06:00
Blade Barringer
137ff71bc8
Added one way binding for email
2015-01-18 15:55:39 -06:00
Blade Barringer
13e89f1947
Added sync after changing username so username would update
2015-01-18 15:55:39 -06:00
Blade Barringer
e0a081b0ff
Adjusted spacing and line breaks
2015-01-18 15:55:39 -06:00
Blade Barringer
cdad6e36da
Adjusted some spacing and line breaks
2015-01-18 15:55:39 -06:00
Blade Barringer
4a5fe1867d
Removed target="_blank" attribute from mailto link
2015-01-18 15:55:39 -06:00
scribblypanda
b3c9371d9f
changed links to relative, corrected mailto link
2015-01-18 15:55:39 -06:00
scribblypanda
1c151f57c2
applied .muted to text so less cluttered looking
2015-01-18 15:55:39 -06:00
scribblypanda
b978852e11
added description of login name and link to page to edit display name
2015-01-18 15:55:39 -06:00
scribblypanda
ae90889dec
added description of display name and link to page to edit login name
2015-01-18 15:55:39 -06:00
scribblypanda
18317f3346
fixed emailChange message, displays properly on localhost
2015-01-18 15:55:39 -06:00
scribblypanda
5a4ebda187
plain text to translatable strings
2015-01-18 15:55:39 -06:00
scribblypanda
c4113994e6
plain text to translatable strings
2015-01-18 15:55:38 -06:00
scribblypanda
330a9191a5
added new translatable string emailChange
2015-01-18 15:55:38 -06:00
scribblypanda
7c990ba109
changed Username to Login Name
2015-01-18 15:55:38 -06:00
Tyler Renelle
a44e0f7c31
fix(avatar-sharing): screw it, 1.3.3 backwards compat isn't working at
...
the router level anyway. Besides, avatar sharing hasn't worked via
addthis for a while, so we don't need this
2015-01-18 14:53:18 -07:00
Tyler Renelle
a053486fcd
fix(avatar-sharing): angular@1.3.9 upgrade fixed the /#?memberId=x
...
bug. Also, anon wasn't able to view avatar shares!
2015-01-18 14:51:40 -07:00
Blade Barringer
5026e67ead
Added one way binding for email
2015-01-18 15:51:00 -06:00
Blade Barringer
62c9aafb7d
Added sync after changing username so username would update
2015-01-18 15:50:43 -06:00
Blade Barringer
c4c2c6a1dc
Adjusted spacing and line breaks
2015-01-18 15:39:45 -06:00
Blade Barringer
ad612a9c36
Adjusted some spacing and line breaks
2015-01-18 15:38:16 -06:00
Blade Barringer
801a5a957a
Removed target="_blank" attribute from mailto link
2015-01-18 15:33:58 -06:00
Blade Barringer
a2d6ed83a1
Merge branch 'issue4468' of https://github.com/scribblypanda/habitrpg into scribblypanda-issue4468
2015-01-18 15:23:52 -06:00
Tyler Renelle
7b753e7543
Merge pull request #4533 from HabitRPG/lefnire/one-module
...
Move to a single "habitrpg" module for services / directives / filters
2015-01-17 19:08:41 -07:00
Tyler Renelle
503fd9ff51
refactor(services): remove un-used authService, cleanup authCtrl
2015-01-17 18:59:28 -07:00
