sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 12:02:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
5612 commits 3 branches 0 tags 1.6 GiB
Commit graph

5612 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian Chen
5809e52fe9 Make attribute referencing in notification logic more robust 2014-10-04 20:56:13 +08:00
Brian Chen
9ecbe9d48f Add unallocated attribute points notification 
* Uses i18n "haveUnallocated" string, to come in another commit
 2014-10-04 19:57:30 +08:00
Brian Chen
74be4b211b DRY-refactor notification display conditions 
* Condense the different notification icons into one span with a
  dynamically selected ng-class.
* Move logic for determining which notification icon to show and whether
  there are no notifications into AuthCtrl.
* Refactor out the two similar sequences of logic conditions into a
  helper function.
 2014-10-04 17:56:56 +08:00
Tyler Renelle
ef83c9999b fix(tests): snowball 2014-10-03 15:51:30 -06:00
Tyler Renelle
2b08e550e0 Merge pull request #4108 from HabitRPG/paglias/tags 
Paglias/tags
 2014-10-03 14:49:58 -06:00
Tyler Renelle
0bb1de680c fix(challenges): since we're setting {minimize:false} on tasks, don't 
overwrite user tasks.*.challenges in the _.merge()
 2014-10-03 14:34:58 -06:00
Tyler Renelle
8e85581679 fix(spookDust): rename to spooky sparkles 2014-10-03 13:24:55 -06:00
Matteo Pagliazzi
704a8658f3 require moment where necessary 2014-10-03 19:38:18 +02:00
Matteo Pagliazzi
8fa8e39eca Revert "Revert "fix(tasks): tmp fix for #4066, minimize:false on tasks so they have"" 
This reverts commit 0fa7277cf0.
 2014-10-03 19:05:37 +02:00
Matteo Pagliazzi
0f2c773bcb Merge pull request #4058 from Feriority/codeclimate_improvements 
small payments refactor for better codeclimate
 2014-10-03 17:44:15 +02:00
Matteo Pagliazzi
64b19ed090 Merge pull request #4101 from betaveros/betaveros/meter-text-nowrap 
Make .meter-text nowrap to prevent truncation
 2014-10-03 17:12:36 +02:00
Tyler Renelle
e666d2f837 fix(spookDust): user serverside method for spookdust as it's path-protected 2014-10-03 00:33:39 -06:00
Tyler Renelle
4925882804 Merge pull request #4028 from Verabird/challengecvsalt 
Make export to csv button on challenges export all tasks (issue #2947)
 2014-10-02 23:40:41 -06:00
Tyler Renelle
27d6514629 chore(mongoose): finally, mongoose 3.8.17! 2014-10-02 23:29:23 -06:00
Tyler Renelle
6ab1e70440 Revert "Revert "perf(challenges): WIP" (see #4085)" 
This reverts commit efbf151c11.
 2014-10-02 23:23:39 -06:00
Tyler Renelle
81c98f7630 bailey(): spookDust, october backgrounds, memleak 2014-10-02 23:18:13 -06:00
Tyler Renelle
0841cafd1f feat(spookDust): add the spookDust special spell, like snowballs. Note: this is handled specially so spookDust can be bought with GP, is a WIP 2014-10-02 23:18:13 -06:00
Tyler Renelle
e759dbe951 Merge pull request #4045 from Verabird/guildreject 
fixing guild reject error (issue #2886)-correcting syntax
 2014-10-02 17:22:36 -06:00
Tyler Renelle
ead42e7cef fix(memleak): temp, wonky fix to #4079 . Sets closure vars user to 
null in api.batchUpdate(). More will be needed
 2014-10-02 16:38:01 -06:00
Brian Chen
42c4096be7 Make .meter-text nowrap to prevent truncation 
* Add white-space: nowrap to .meter-text to prevent the meter text from
  being cut off when the meter is very short and its content is long
  (mainly an issue with the experience bar, which can easily have a bar
  graph symbol plus one four-digit number over another e.g. 1,234 /
  5,678)
 2014-10-02 19:47:48 +08:00
Negue
bf662ff119 fix rootCtrl.js ; forgot a comma while merging... 2014-10-01 20:53:29 +02:00
Negue
b1a34a25a8 - add popoverHtml to enable Markdown in Popovers 
- add markdown filter to get Task Notes as Markdown
 2014-10-01 20:30:13 +02:00
negue
a595880568 Merge pull request #4044 from negue/apiUrlService 
Use ApiUrlService in all services
 2014-10-01 19:58:26 +02:00
Tyler Renelle
ab3c238d11 fix(avatar): put missing ng-click=buy-set back in 2014-09-30 22:06:05 -06:00
Tyler Renelle
5c56b0b7c9 bailey(halloween): 2014-09-30 21:53:34 -06:00
Tyler Renelle
e21230f8c2 Revert "small fix" 
This reverts commit f3401e72c2.
 2014-09-30 21:42:48 -06:00
Tyler Renelle
0fa7277cf0 Revert "fix(tasks): tmp fix for #4066, minimize:false on tasks so they have" 
This reverts commit a6631f5d36.
 2014-09-30 21:28:47 -06:00
Tyler Renelle
3605b51748 feat(halloween): refactoring skin & hair to use the same mixins, add new 
halloween seasonal set
 2014-09-30 21:25:06 -06:00
Alice Harris
ee325ce27f Merge pull request #4093 from deilann/release_pets 
feat(pets): release pets
 2014-10-01 06:35:36 +10:00
deilann
8427c53d90 release pets feature 2014-09-29 13:35:38 -07:00
Tyler Renelle
a6631f5d36 fix(tasks): tmp fix for #4066, minimize:false on tasks so they have 
tags:{} default empty object
 2014-09-27 15:53:42 -06:00
Tyler Renelle
efd17fe86b GA demographics 2014-09-26 13:45:01 -06:00
Tyler Renelle
f3401e72c2 small fix 2014-09-26 11:24:29 -06:00
Tyler Renelle
efbf151c11 Revert "perf(challenges): WIP" (see #4085) 
This reverts commit 632726fe02.

Conflicts:
	src/controllers/challenges.js
 2014-09-25 20:47:44 -06:00
Tyler Renelle
351e220b83 feat(mystery): 201409 2014-09-24 23:15:46 -06:00
Tyler Renelle
632726fe02 perf(challenges): WIP 2014-09-24 21:50:14 -06:00
Tyler Renelle
3f7b9b98cb chore(modules): upgrade mongoose, attempt to mitigate these server 
meltdowns. Also upgrade newrelic
 2014-09-24 13:08:48 -06:00
Tyler Renelle
562f593c8f fix(spells): temp fix to #4067, for some reason _v is undefined after 
casting spells?
 2014-09-24 13:07:40 -06:00
Matteo Pagliazzi
577cfb8d31 Merge pull request #4061 from Alys/trackFix2 
remove "track by" to fix https://github.com/HabitRPG/habitrpg/issues/4060
 2014-09-22 12:36:53 +02:00
Alice Harris
73f7f6605e remove track by to fix https://github.com/HabitRPG/habitrpg/issues/4060 2014-09-22 20:23:37 +10:00
Alice Harris
49afe21a41 Update VAGRANT.md 
move instructions to wiki and link to them there
 2014-09-21 17:13:15 +10:00
Alice Harris
deb6d8fcbf Update CONTRIBUTING.md 
bug reporting: link to the primary location for bug report instructions
 2014-09-21 16:57:52 +10:00
Aneesh Goel
0dc20b4b08 small payments refactor for better codeclimate 2014-09-20 14:53:14 -07:00
Tyler Renelle
f38db7b964 feat(fall): bailey + free candy script 2014-09-20 14:13:07 -06:00
Negue
c501652194 - add popoverHtml to enable Markdown in Popovers 
- add markdown filter to get Task Notes as Markdown
 2014-09-20 12:13:36 +02:00
Negue
71c9ea66f4 3rd and last! header scrolling fix, now the full scroll bar is "visible" for the mouse 2014-09-18 21:37:53 +02:00
Negue
b3c8acef10 fix guild list 2014-09-18 19:47:30 +02:00
Matteo Pagliazzi
292d2455ba fix(emails): try multiple attemps (delay not avalaible in api because in not yet released version) 2014-09-18 18:43:55 +02:00
Matteo Pagliazzi
7e53eaf1ae Revert "Revert "ngRepeat with track by"" 
This reverts commit c90c8f9a5f.
 2014-09-18 18:37:02 +02:00
Alice Harris
f6e1e091f4 Merge pull request #4010 from negue/group_returnMembers 
return group members on questAccept / questAbort
 2014-09-18 18:39:38 +10:00