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

366 commits

Author SHA1 Message Date
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
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
Matteo Pagliazzi
40bd38af53 add spring 2015 emails images 2015-03-29 22:32:52 +02: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
Alys
e7c0c370ee Merge pull request #4909 from TheHollidayInn/notify-user-empty-task 
Added tooltip for when a task is empty
 2015-03-25 17:59:20 +10: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
kholliday
e5cd319ef5 Changed empty task messageand added style. 2015-03-23 20:18:14 -05:00
Tyler Renelle
7c102c577b tmp(robots.txt): temporarily remove robots.txt, not working in current state 2015-03-23 11:45:55 -06: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
Sabe Jones
f3f5669ab2 feat(spring): Fling 2015-03-20 14:56:00 -05:00
Tyler Renelle
1e8265a9f1 feat(tour): add the other tour entries @lemoness 2015-03-19 15:53:12 -06:00
Alys
5198050cd2 Merge pull request #4863 from rdhammond/InstantPartySource 
Instant party source
 2015-03-20 06:46:38 +10:00
Tyler Renelle
cca2d81bc3 feat(tour): ESC to perma-close #4886 @lemoness @alys 2015-03-19 14:41:04 -06:00
Tyler Renelle
84a77695ea feat(ads): remove ads completely 2015-03-19 11:39:17 -06:00
kholliday
ceb2639f81 Added focus directive to focus textarea for a private message model box 2015-03-19 11:49:46 -05:00
kholliday
67b38f71f9 Removed styles and sorting ability for locked tasks (Challenge tasks) 2015-03-18 14:39:23 -05:00
Matteo Pagliazzi
9e540e86af add email with optional message when kicking user from group 2015-03-18 19:12:53 +01:00
Matteo Pagliazzi
0722a17897 start working on kick from group email & message 2015-03-18 17:31:07 +01:00
kholliday
6e7aea991e Made default group for a challenge the selected group filter if there is only one filter selected. 2015-03-17 09:34:12 -05:00
kholliday
4c141f8918 Removed css style hack for IE6 and IE7 that was interfering with habit plus/minus button behavior 2015-03-16 12:28:23 -05:00
Alice Harris
44259925e4 re-add the dequip option for removing backgrounds with proper bug fix (ref 9199c6c7e2); make whitespace consistent 2015-03-16 19:27:44 +10:00
R. Daniel Hammond
5ac73aca9e Adding a couple of watch statements should make the party order auto-update on changes. 2015-03-15 20:49:13 -04:00
kholliday
c54794fd2a Added previous state tracker and a filter for challenges by a guild if the user has clicked that guild's challenge link. 2015-03-15 12:29:45 -05:00
Alice Harris
9199c6c7e2 remove unequip background feature temporarily - fixes https://github.com/HabitRPG/habitrpg/issues/4857#issuecomment-80722868 2015-03-15 07:44:36 +10:00
Alice Harris
f82469eba7 remove trailing whitespace 2015-03-14 22:40:26 +10:00
Alys
94f9cff279 Merge pull request #4850 from stillsnowedin/develop 
Added confirmation before deleting messages and moved buttons to top of ...
 2015-03-14 22:32:46 +10:00
Alys
59f64830b1 Merge pull request #4799 from TheHollidayInn/add-dequip-button 
Added dequip ability per ticket: 3730
 2015-03-14 21:36:57 +10:00
Tyler Renelle
f993a5868f fix(robots): fix robots.txt per 
http://stackoverflow.com/a/7609187/362790 #4746
 2015-03-13 09:01:04 -06:00
Kathryn Norris
47a05338e5 Added confirmation before deleting messages and moved buttons to top of Inbox. (fixes #4848) 2015-03-13 04:11:35 -07:00
Alys
881f70997b Merge pull request #4815 from Alys/debug-options-2015-03-07 
new local install Debug options in footer: +2 Missed days, +MP
 2015-03-13 14:06:12 +10:00
Alice Harris
cd8c0956f8 add debug button to footer for increasing mana points (MP) 2015-03-13 13:53:21 +10:00
kholliday
8a121a5dc3 Added hide and error message when a user tries to create a challenge for HabitRPG group and they have no gems 2015-03-10 22:15:24 -05:00
Tyler Renelle
962bb65608 tmp(interactive-tour): temporarily remove Hide button 2015-03-10 15:40:19 -06:00
Tyler Renelle
63a6af6e0a fix(interactive-tour): small updates per 
https://github.com/HabitRPG/habitrpg/issues/4726#issuecomment-77643235
 2015-03-10 15:40:19 -06:00
Tyler Renelle
98f50374c9 fix(interactive-tour): "hide" on the left, nav on the right 2015-03-10 15:40:19 -06:00
Tyler Renelle
a7232b5abe fix(interactive-tour): cleanup steps when navigating chapters, don't use tour.restart() 2015-03-10 15:40:19 -06:00
Tyler Renelle
232224c497 fix(interactive-tour): don't automatically show guide when on mobile devices 2015-03-10 15:40:19 -06:00
Tyler Renelle
62739346c7 tmp(interactive-tour): add "ok" to each step, see #4726 2015-03-10 15:40:18 -06:00
Tyler Renelle
812493fec5 feat(tour): Refactor the Justin Guide to be much more streamlined and interactive. Backdrop focuses user on present task. Chapterized guides 2015-03-10 15:40:18 -06:00
Tyler Renelle
c5240da81f perf(robots): add robots.txt, see #4746 2015-03-10 14:31:00 -06:00
kholliday
fc3e1c6c9b Added ability to remove pet, mount, and background. Also, changed text for all dequip buttons. 2015-03-08 15:35:37 -05:00
Nicholas Thomson
075b3e5b4e Denser task edit style 2015-03-08 15:14:21 -04:00
Matteo Pagliazzi
1b53aeaee8 increase timeout when usubscribing from email 2015-03-08 16:25:19 +01:00
Alice Harris
044930b7d3 add +2 Missed Days to debug menu in footer, adjust addMissedDay function and all calls to it 2015-03-07 18:39:43 +10:00
kholliday
11f61c2732 Add functionality to dequip all Battle Gear or Cosutme. 2015-03-05 09:40:37 -06:00
kholliday
f28bc31a2c Added dequip ability per ticket: 3730 2015-03-04 21:43:17 -06:00
Blade Barringer
cbc49829c8 Merge branch 'food_tray_padding' of https://github.com/kangabell/habitrpg into food-tray 2015-02-26 14:08:17 -06:00
Blade Barringer
e9b72ad40d Merge pull request #4721 from crookedneighbor/fix-challenge-select-ios 
Fixes #4719. Guild select for challenges pre-populates with first group
 2015-02-23 22:09:17 -06:00
Matteo Pagliazzi
4da8eb1d58 fix(typo) 2015-02-23 21:51:15 +01:00
Matteo Pagliazzi
4151b0733f add ability to unsubscribe from a single event using a dedicated link 2015-02-23 21:25:01 +01:00
Blade Barringer
98ecd4b457 Fixes #4719. Guild select for challenges pre-populates with first group 2015-02-19 16:53:15 -06:00
Bill Parrott
98c6526cf7 add auto-focus when single/multiple is toggled 2015-02-19 08:46:45 -06:00
Bill Parrott
3599eaefaf Merge branch 'develop' into bulk-add-tasks 2015-02-17 22:32:28 -06:00
Blade Barringer
44b9ac7215 Fixed path to audio files. Closes #4704 2015-02-17 13:53:32 -06:00
Blade Barringer
6c85cd18a9 Adjusted style of bulk tasks 2015-02-17 08:37:26 -06:00
Blade Barringer
48e688d815 Merge branch 'bulk-add-tasks' of https://github.com/chimericdream/habitrpg into bulk-add 2015-02-17 08:05:36 -06:00
Bill Parrott
2de3a5dd55 first draft of bulk add 2015-02-17 00:25:56 -06:00
Bill Parrott
b1b478bc74 add task export functionality 2015-02-16 21:21:49 -06:00
Sabe Jones
130261dacf feat(event): End Valentine's 2015-02-16 18:15:09 -06:00
Blade Barringer
0858b871ff Closes #4693 2015-02-16 16:04:51 -06:00
Blade Barringer
477d3d6085 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 2015-02-12 13:32:23 -06:00
Blade Barringer
8ac9dc3ced Merge branch 'develop' into common-convert 2015-02-10 16:27:46 -06:00
Blade Barringer
6548db8095 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 2015-02-09 22:41:52 -06:00
Blade Barringer
75c9b5a978 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 
Conflicts:
	src/controllers/groups.js
	src/controllers/payments/index.js
	src/controllers/user.js
	src/models/user.js
 2015-02-09 22:21:27 -06:00
Blade Barringer
a1568b0c32 Corrected title on readme 2015-02-09 19:10:59 -06:00
Blade Barringer
8a25a5a744 Corrected paths 2015-02-09 13:32:56 -06:00
Blade Barringer
67f478bb0e Adjusted paths to files 2015-02-05 16:37:22 -06:00
Blade Barringer
dca2f13dda Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 
Conflicts:
	bower.json
	public/manifest.json
	src/controllers/auth.js
 2015-02-05 11:20:40 -06:00
Blade Barringer
28b9ad11cb Added paths for common scripts 2015-02-04 13:22:41 -06:00
Blade Barringer
5d9cda3b76 Corrected some paths to serve files directly from comon 2015-02-04 12:25:14 -06:00
Blade Barringer
cc767efa20 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 
Conflicts:
	src/controllers/auth.js
	src/controllers/challenges.js
	src/controllers/groups.js
	src/controllers/members.js
	src/controllers/payments/index.js
	src/controllers/user.js
	src/middleware.js
	src/models/user.js
 2015-02-03 21:13:55 -06:00
Blade Barringer
44a89dd0bd Corrected sprite task 2015-02-03 19:29:22 -06:00
Blade Barringer
bf6fdf8d9d Updated paths 2015-02-03 18:55:17 -06:00
Blade Barringer
9f420d0e7a Made symlink to audio folder 2015-02-03 14:06:04 -06:00
Blade Barringer
d2eafdd021 Started moving public folder stuff back to website 2015-02-03 14:02:34 -06:00