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
8954 commits 3 branches 0 tags 1.6 GiB
Commit graph

139 commits

Author SHA1 Message Date
Kevin Gisi
705f9016c5 Use minification-friendly syntax 2015-04-22 12:04:04 -04:00
Alys
7c36e49243 Merge pull request #5022 from gisikw/dated-tasks-correct-impl 
Dated tasks correct impl
 2015-04-22 16:56:03 +10:00
Kevin Gisi
a05714405a Inject RootCtrl into MemberModalCtrl to expose shared methods 2015-04-21 05:17:15 -04:00
Tyler Renelle
cfc8ff96e6 feat(tour): tmp set variant=2 to (counter + finish button) until we can 
get google experiment working
 2015-04-16 20:17:13 -06:00
Blade Barringer
1d95784dde refactor isMemberOfGroup and tests 2015-04-16 07:58:35 -05:00
Blade Barringer
4853c0814d Corrected function 2015-04-16 07:39:55 -05:00
Kevin Gisi
160982df33 Simplify group detection logic for guilds 2015-04-15 23:10:12 -04:00
Kevin Gisi
d455666650 Join/Leave buttons on guild detail page. Addresses #4427 2015-04-15 06:15:11 -04:00
Kevin Gisi
b503a0fd64 Repaired task reordering issue 
* Created `conditionalOrderBy` filter with a similar signature to `orderBy`,
  using a single conditional argument that when false, causes the filter to
  return the array unchanged

* Updated task view to use `conditionalOrderBy`

* Added karma specs for `conditionalOrderBy` filter
 2015-04-13 08:51:08 -04:00
Kevin Gisi
02838214c7 Reimplement (broken) task ordering 2015-04-13 07:47:56 -04:00
Alys
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
Alys
0083c3f881 Revert "Put list back into removeTask fn, update removal logic within challegeCtrl" 2015-04-13 19:34:59 +10:00
Blade Barringer
8642366f15 scroll to top and load hero; add tests for new behavior. 2015-04-10 23:51:34 -05:00
Blade Barringer
24ef3aa012 Made uuid in hall of heroes populate the input box 2015-04-09 21:57:06 -05:00
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
def7ff906f Merge pull request #4866 from TheHollidayInn/edit-plusminus-habit-challenge 
Removed css style hack for IE6 and IE7 that was interfering with habit plus/minus button behavior
 2015-04-05 22:47:20 +10:00
Alys
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
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
Tyler Renelle
6b52e00b37 Merge pull request #4972 from HabitRPG/lefnire/sugarfiend2 
Static page redesign
 2015-04-03 13:53:59 -06:00
Tyler Renelle
c56c5ad12b tmp(static): use s3 & cdn for various resources to prevent rate-limiting homepage 2015-04-03 12:42:03 -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
Tyler Renelle
47157a1b52 feat(static): convert front to jade, hack to make work basically 2015-04-02 15:29:38 -06:00
TheHollidayInn
0e2867cce1 Marked group messages as seen when user syncs new messages 2015-04-02 10:58:24 -05:00
Tyler Renelle
e64499658b Add 'website/public/front/' from commit 'fb87f009292bfb08bd308dbf7f63bc5ef094838f' 
git-subtree-dir: website/public/front
git-subtree-mainline: 507c1dd69a
git-subtree-split: fb87f00929
 2015-04-01 20:12:32 -06: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