sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-03 12:40:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
8884 commits 1 branch 0 tags 1.6 GiB
Commit graph

98 commits

Author SHA1 Message Date
Blade Barringer
ddc91e0227 Merge branch 'develop' into TheHollidayInn-tasks-add-multiple-maintain-order 2015-04-09 17:32:09 -05:00
Alys
882827c105 Merge pull request #5000 from gisikw/sort-dated-todos 
Put list back into removeTask fn, update removal logic within challegeCtrl
 2015-04-09 16:37:57 +10:00
Kevin Gisi
860ca9fc16 Put list back into removeTask function, update removal logic within challengeCtrl 2015-04-08 23:03:45 -04:00
Blade Barringer
a3cbca2089 Merge pull request #4991 from TheHollidayInn/filters-sort-adjustments 
Removed axis resrtiction to ease reordering of large number of tags
 2015-04-08 20:57:40 -05:00
Blade Barringer
cdd0b29924 Merge branch 'develop' into gisikw-sort-dated-todos 2015-04-08 20:47:38 -05:00
Tyler Renelle
8a33de219c feat(analytics): updated cron experiment ID 2015-04-08 17:37:40 -06:00
Tyler Renelle
fee002b289 feat(analytics): better events organization via category>label>action>value 2015-04-08 17:29:55 -06:00
Kevin Gisi
9bb2f46264 Modify removeTask to accept a task object. Update task view to reflect new method signature. 2015-04-07 22:38:20 -04:00
TheHollidayInn
9619c46df2 Removed extra console.log 2015-04-07 18:49:25 -05:00
TheHollidayInn
09761c5c53 Corrected ordering that tasks appear in when user enters multiple tasks 2015-04-07 14:51:26 -05:00
TheHollidayInn
8826ae8c41 Removed axis resrtiction to ease reordering of large number of tags 2015-04-07 09:47:52 -05:00
Kevin Gisi
da81241ebe Transition Challenge -> Edit to the Singleton challenge view, to address issues associated with #4814 2015-04-06 02:18:29 -04:00
Kevin Gisi
6fb95ec27b Unset .cid for challenge on challenge delete 2015-04-06 02:18:29 -04:00
Kevin Gisi
3e653c9282 Reimplemented single challenge view code from #3319 2015-04-06 02:18:29 -04:00
Alys
5405dbe085 revert b0bf033c54 to see if Travis build then stops failing 2015-04-06 00:43:27 +10:00
Alys
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
Alys
b0bf033c54 Merge pull request #4861 from TheHollidayInn/retain-guild-filters-challenges 
Added previous state tracker and a filter for challenges by a guild if the user has clicked that guilds challenge link.
 2015-04-05 23:11:36 +10:00
Alys
efb4773c27 Merge pull request #4958 from TheHollidayInn/groups-clear-notifs-fetch-messages 
Marked group messages as seen when user syncs new messages
 2015-04-05 20:19:51 +10:00
Alys
baf38acc07 Merge pull request #4871 from TheHollidayInn/default-group-based-on-filter 
Made default group for a challenge the selected group filter if there is only one filter selected
 2015-04-04 17:01:35 +10:00
Tyler Renelle
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
Alys
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
Alys
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
Alys
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
Alys
f432bc1f17 Merge pull request #4919 from TheHollidayInn/spells-level-with-exp 
Added sync on mage fireball spell and rogue backstab skill and give correct mp reduction notification for ethereal surge
 2015-04-04 00:29:41 +10:00
TheHollidayInn
0e2867cce1 Marked group messages as seen when user syncs new messages 2015-04-02 10:58:24 -05:00
John Montgomery
5163ee466b Fixes more bad git-fu. New tag creation works now. 2015-03-31 23:23:24 -04:00
Kevin Gisi
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
John Montgomery
e35c753bdc Fixed errors caused by poor git-fu. 
Forgot I was on a detached head, made a commit, and failed hard at
cherry-picking the commit back to the correct branch.
 2015-03-31 08:55:16 -04:00
John Montgomery
c22acb81a8 Updates new tag code and test spec for new tags. 2015-03-30 22:07:02 -04:00
Tyler Renelle
edb50f7081 feat(analytics): a/b on tour (counter, finish button) 2015-03-30 16:57:17 -06:00
Tyler Renelle
e0dae01dda fix(analytics): remove a/b on play button, fixes #4947 2015-03-30 16:43:49 -06:00
John Montgomery
f95f892491 Changed new tag code to be more angular-idiomatic. 2015-03-30 08:32:45 -04:00
John Montgomery
99aad96688 New tag field correctly clears when new tag added. 2015-03-29 15:10:24 -04:00
Daniel Hammond
cea97e4da8 Documenting the (Bootstrap recommended!) wrapper workaround for tooltips 
on disabled elements. Added code to prevent user from posting blank
messages by using meta-enter as a workaround.
 2015-03-28 01:21:39 -04:00
Alice Harris
61e8b65f14 fix drop notification images for hatching potions 2015-03-28 11:24:58 +10:00
Alys
1202c624f1 Revert "Added hide and error message when a user tries to create a challenge for..." 2015-03-27 20:11:12 +10:00
Alys
f16ef869a3 Merge pull request #4836 from TheHollidayInn/fix-max-value-0-challenges 
Added hide and error message when a user tries to create a challenge for...
 2015-03-27 19:21:51 +10:00
Tyler Renelle
f3e48093fb feat(analytics): track tour step 2015-03-26 17:11:46 -04:00
Alys
cb88862f6f Merge pull request #4911 from TheHollidayInn/drops-add-item-icons 
Added icons to Notification for the item that is dropped.
 2015-03-26 18:06:55 +10:00
kholliday
258da77586 Added sync on mage fireball spell 2015-03-26 00:18:18 -05:00
kholliday
1a6b828e05 Moved dropClass to correct scope. 2015-03-25 07:49:49 -05:00
Tyler Renelle
d3ebc03865 feat(tour): add tour counter 2015-03-24 15:41:44 -06:00
Tyler Renelle
560d51b2e2 feat(tour): esc force closes, but puts justin head in toolbar. clicking 
justin head brings tour back.
 2015-03-24 15:41:44 -06:00
kholliday
a7873a41a1 Added icons to Notification for the item that is dropped. 2015-03-24 16:28:24 -05:00
Tyler Renelle
5de42b03c9 fix(analytics): remove testing code 2015-03-20 17:03:01 -06:00
Sabe Jones
fbcf8e9a6f Merge pull request #4895 from SabreCat/spring2015 
Spring Fling 2015
 2015-03-20 17:29:02 -05:00
Sabe Jones
3f4bddc57d fix(tour): Try k 2015-03-20 17:22:12 -05:00
Sabe Jones
18649144a8 feat(tour): Early quit classes tour 2015-03-20 17:18:48 -05:00
Tyler Renelle
009b582f25 feat(analytics): add A/B testing on play button using GA's Experiments 
API. Revert this after the experiment
 2015-03-20 14:44:47 -06:00
Sabe Jones
ae25af7c02 fix(shop): Enable head accessories 2015-03-20 15:27:56 -05:00