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
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
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
Tyler Renelle
2306b7c572
refactor(services): move to a single "habitrpg" module for services /
...
directives / filters
2015-01-17 18:43:37 -07:00
Alice Harris
6a5210d3ad
fix(plans): when gifting subscription, set plan.dateUpdated so it can roll gemCapExtra next month. Fixes #4480 . Removes datedUpdated from previous version of fix.
2015-01-17 16:45:55 +10:00
Tyler Renelle
f71737a84c
Merge pull request #4530 from HabitRPG/lefnire/httpinterceptor
...
move httpInterceptor from website/app.js to habitrpg-shared/config.js
2015-01-16 18:32:45 -07:00
Tyler Renelle
90c7142da5
refactor(config): move httpInterceptor from website/app.js to habitrpg-shared/config.js.
2015-01-16 16:48:53 -07:00
Matteo Pagliazzi
9a087d2d90
update angular and do not send api key to loggly
2015-01-16 17:39:47 +01:00
Blade Barringer
290e602f21
Added brackets to quest.boss check. Closes #4526
2015-01-16 10:22:47 -06:00
Sabe Jones
94d003ca5d
Merge pull request #4524 from SabreCat/develop
...
T-Rex pet quest and party boss Rage implementation
2015-01-15 16:41:07 -06:00
Tyler Renelle
35e8097b0c
refactor(challenges): wrap group.challenges as $resources, so they're
...
convenience functions $join/$leave/etc can be called directly
2015-01-15 15:24:02 -07:00
Sabe Jones
0b63e48c6e
feat(quest): T-Rex pet
...
Includes news announcements for 1/15/2014, Market implementation for T-Rex dual quest, and the ability for "healing" type Rage meters to work in party-scale boss fights.
2015-01-15 15:38:51 -06:00
scribblypanda
f9b507e782
changed links to relative, corrected mailto link
2015-01-15 08:23:23 -05:00
scribblypanda
9fe93351ae
applied .muted to text so less cluttered looking
2015-01-14 22:38:02 -05:00
scribblypanda
273dc4909f
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into issue4468
2015-01-14 22:29:07 -05:00
etaiklein
1c771fa4db
fixed bug where +habits would behave strangely when targeted by spells
2015-01-14 02:06:41 -05:00
Sabe Jones
17ab1d660f
chore(news): Stress Strike 1 Bailey
2015-01-13 13:29:10 -06:00
Sabe Jones
04ff888819
fix(world-boss): Scale based on current HP
2015-01-13 13:19:04 -06:00
