8af1f0538b
revert PR #4996 (Sort dated todos) because of problems sorting other tasks - see comments in #4996
2015-04-13 20:16:24 +10:00
0083c3f881
Revert "Put list back into removeTask fn, update removal logic within challegeCtrl"
2015-04-13 19:34:59 +10:00
24ef3aa012
Made uuid in hall of heroes populate the input box
2015-04-09 21:57:06 -05:00
9e118cbfcc
Added gem popover title back in
2015-04-09 17:19:58 -05:00
252e2d0768
Removed gem popover string
2015-04-09 08:09:09 -05:00
69e1b4f8e6
Update challenges.jade
...
Additional changes in translations required before merging!
https://trello.com/c/SvTsLdRF/12-translations
"0leg
It would be great if we could have "%number_of% Participants" instead of just "Participants" in the source language so that we could translate it as "участников: %number_of%" which is the only correct way to translate it into Russian without grammatical mistakes. (This example is from Challenges tab.)"
2015-04-09 07:55:44 -05:00
0878293138
Update menu.jade
...
https://github.com/HabitRPG/habitrpg/issues/2932
2015-04-09 07:55:44 -05:00
b9490d39b8
Update gems.jade
...
https://github.com/HabitRPG/habitrpg/issues/2932
2015-04-09 07:53:53 -05:00
860ca9fc16
Put list back into removeTask function, update removal logic within challengeCtrl
2015-04-08 23:03:45 -04:00
f12d56e456
Revert "Merge pull request #4995 from HabitRPG/revert-4980-sort-dated-todos"
...
This reverts commit 33f928b6d876ef1fdd92
2015-04-07 22:38:43 -04:00
9bb2f46264
Modify removeTask to accept a task object. Update task view to reflect new method signature.
2015-04-07 22:38:20 -04:00
cc674f57cd
Revert "Sorted dated todos by date."
2015-04-07 19:51:27 -05:00
66d5b38dad
fix(news): Move pic
2015-04-06 19:26:14 -05:00
38bbf63a22
fix(news): Add heading
2015-04-06 19:24:48 -05:00
616a7d9650
feat(backgrounds): April BGs
2015-04-06 19:03:24 -05:00
32a71bfc74
Merge pull request #4980 from gisikw/sort-dated-todos
...
Sorted dated todos by date.
2015-04-06 18:22:51 +10:00
ac01d9ad8b
Sorted dated todos by date.
2015-04-06 03:47:00 -04:00
6cfdfc5225
Added group type to challenge API, link to guild/party on challenges
2015-04-06 02:44:43 -04:00
145f4c0fa7
Check leader._id, rather than just leader for checking challenge ownership
2015-04-06 02:32:24 -04:00
da81241ebe
Transition Challenge -> Edit to the Singleton challenge view, to address issues associated with #4814
2015-04-06 02:18:29 -04:00
3e653c9282
Reimplemented single challenge view code from #3319
2015-04-06 02:18:29 -04:00
934fd13042
update More Info challenges link to point to wiki instead of old trello card
2015-04-06 15:35:41 +10:00
7d579ea08a
Merge branch 'CancelSendOnBlankPM' of https://github.com/rdhammond/habitrpg into rdhammond-CancelSendOnBlankPM
...
Conflicts:
website/views/shared/modals/members.jade
2015-04-05 23:24:46 +10:00
6199e1d843
Merge branch 'remove-interactivity-challenge-tasks' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-remove-interactivity-challenge-tasks
...
Conflicts:
website/public/css/tasks.styl
website/views/shared/tasks/task.jade
2015-04-05 22:01:10 +10:00
7aba0475fe
Merge pull request #4967 from Alys/API-wording-changes-2015-04-03
...
API wording adjustments (specify task types, describe when authentication is not required)
2015-04-05 19:01:09 +10:00
3c07a8ee6b
fix(frontpage): Wording tweak
2015-04-04 13:03:57 -05:00
e3626f6113
fix(static): use different intro image
2015-04-03 20:08:00 -06:00
8033b129ff
Merge pull request #4915 from gisikw/free_100_key_to_the_kennels
...
Make Key to the Kennels free for Triad Bingoers.
2015-04-04 10:48:15 +10:00
7336d5bc23
fix(auth): hacky fix to get around tabset hiding the surrounding
...
authctrl scope (due to isolate scope)
2015-04-03 15:48:32 -06:00
6b52e00b37
Merge pull request #4972 from HabitRPG/lefnire/sugarfiend2
...
Static page redesign
2015-04-03 13:53:59 -06:00
b99ae745c3
fix(static): update login modal to use ui-bootstrap
2015-04-03 12:54:07 -06:00
c56c5ad12b
tmp(static): use s3 & cdn for various resources to prevent rate-limiting homepage
2015-04-03 12:42:03 -06:00
7a357933dc
Merge pull request #4914 from gisikw/repair_ie_meters
...
Fix broken meters in IE
2015-04-04 01:54:24 +10:00
0e581444b7
Merge pull request #4887 from TheHollidayInn/focus-textarea-on-pm
...
Added focus directive to focus textarea for a private message model box
2015-04-04 01:45:30 +10:00
ab6d8d0821
Merge pull request #4950 from gisikw/force-latest-bailey
...
Ensure Bailey always displays the most recent message.
2015-04-04 01:29:32 +10:00
5f3e57274d
Merge pull request #4938 from ExperimentMonty/clear-after-add-task
...
New tag field correctly clears when new tag added.
2015-04-04 01:16:21 +10:00
ec66bfb0cd
Specify which API routes need no authentication. Specify task types for full scoring route. For simple scoring, state that it's only Habits and explain that other tasks can use full scoring.
2015-04-03 21:24:48 +10:00
26f1d6bb39
feat(static): secondary statics reflect front. merge front.old into features
2015-04-02 17:41:38 -06:00
cdaa776978
feat(static): remove pipes, replace static footer with shared/footer
2015-04-02 17:22:36 -06:00
47157a1b52
feat(static): convert front to jade, hack to make work basically
2015-04-02 15:29:38 -06:00
7740f1969b
Fix broken meters in IE
...
Health, XP, and Mana bars were broken in IE, due to the use of {{ }} within
style attributes. Using Angular's string interpolation within style attributes
doesn't work in IE, as IE will actually strip the property immediately upon DOM
render. Using ng-style allows properties to be preserved, and renders
cross-browser correctly.
2015-04-02 15:41:01 -04:00
d4329c7a5a
fix(news): Corrections
2015-04-01 23:37:24 -05:00
b263ba3099
fix(seasonal): Sneaky floral
...
Srsly, just don't say it.
2015-04-01 23:19:54 -05:00
f0e7f0464c
fix(seasonal): NO FLOWERS
...
We do not say the F word here. Strange things happen in Habitica when someone uses that word. We speak only of "the smelly things with the petals."
2015-04-01 23:07:36 -05:00
b6a4d65d8c
feat(seasonal): Shiny Seed
2015-04-01 22:36:07 -05:00
6e1024d8ed
fix(flowers): FLOWERS ON FLOWERS
2015-03-31 20:17:01 -05:00
79606736a1
Ensure Bailey always displays the most recent message.
...
* Added a Grunt task to precompile website/views/shared/new-stuff.jade to a
static html file.
* Updated the new-stuff.jade modal template to use a $rootScope property.
* Added a special case to openModal for the newStuff template, by which it
fetches the flat file, marks it as trusted HTML, and sets it to the
$rootScope property before rendering the modal.
2015-03-31 20:38:15 -04:00
740ddefd76
fix(flowers): AND FIXES
2015-03-31 18:55:07 -05:00
1cc3c5539f
feat(flowers): AND SLIMES
...
AND BACKGROUNDS
2015-03-31 18:41:50 -05:00
2acef4d42b
feat(flowers): FLOWERS
2015-03-31 18:30:22 -05:00
Alys