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

5766 commits

This branch
This branch
All branches
Author SHA1 Message Date
Blade Barringer
9fd4588b74 Added buttons to footer, cleaned up functions 2014-12-12 11:05:16 +01:00
Blade Barringer
658046024e Corrected tooltip name 2014-12-12 11:05:16 +01:00
Blade Barringer
f50f40b77d Added text-danger span on username 2014-12-12 11:05:16 +01:00
Blade Barringer
ee9214396b Renamed everything from flag to abuseFlag 2014-12-12 11:05:16 +01:00
Blade Barringer
b3a56b6ded Added heading and body of flag modal 2014-12-12 11:05:15 +01:00
Blade Barringer
1e3a07b8b5 Flag icon opens blank modal 2014-12-12 11:05:15 +01:00
Tyler Renelle
ae762837e2 refactor(challenges): cleanup challenge-creation. can use async.auto to 
keep variables around, no need to set parent closure vars
 2014-12-11 21:35:41 -07:00
Tyler Renelle
3027ccff83 fix(plans): fix fields which are NaN 2014-12-11 21:06:38 -07:00
Tyler Renelle
14a38033f9 Merge branch 'negue-iap_verification' into develop 2014-12-11 14:51:31 -07:00
Matteo Pagliazzi
29382d18f7 fix(reset-password): use array for variables 2014-12-11 17:05:31 +01:00
Matteo Pagliazzi
1761752240 use email server for reset-password 2014-12-11 16:51:39 +01:00
Blade Barringer
e79126bf59 Merge pull request #4372 from thehindenburg/optoutspace 
added space in Jade to the arrow and opt out text in the inbox
 2014-12-10 15:51:38 -06:00
Tyler Renelle
f9cc2adda5 fix(iap): iap verification fixes 2014-12-10 14:25:00 -07:00
Negue
bb37c163cf fix spacing 2014-12-10 14:21:03 -07:00
Negue
d92832bfb2 Hopefully a working IOS Verification 2014-12-10 14:21:03 -07:00
Negue
ecf20f423c IAP Verification for Android 2014-12-10 14:21:03 -07:00
Negue
b59a70f128 more dummy controller, just for iap data 2014-12-10 14:21:02 -07:00
Negue
cc4812712a dummy iap verify routes 2014-12-10 14:21:02 -07:00
Negue
2ea12d5c71 Add in-app-purchase Package 2014-12-10 14:21:02 -07:00
thehindenburg
799934c31b added space in Jade to the arrow and opt out text in the inbox 2014-12-10 12:31:09 -08:00
Blade Barringer
7fb1e69927 Changed inbox text to use an env.t var 2014-12-10 10:47:05 -06:00
Blade Barringer
4af70a2a0f Made invite button for guild invitations part of an input-group 2014-12-10 09:47:58 -06:00
Sabe Jones
fdf25611fb Merge pull request #4370 from SabreCat/penguin 
Penguin quest
 2014-12-09 21:22:45 -06:00
Sabe Jones
dc034e4ab5 fix(quest): Add penguin to shop 2014-12-09 20:48:08 -06:00
Sabe Jones
2d9d8fe209 chore(Bailey): Announce Penguin 2014-12-09 20:20:17 -06:00
Matteo Pagliazzi
ce73a75133 feat(email): add new image for subscription email 2014-12-09 17:34:28 +01:00
Blade Barringer
1511002a08 Fixed styling of invitation to guild page 2014-12-08 17:03:11 -06:00
Blade Barringer
5230883015 Adjusted styling of select box used for ordering party 2014-12-08 16:57:37 -06:00
Blade Barringer
2a3bd8a9cb No longer displays an extra popover that says true. Closes #4362 2014-12-08 12:44:37 -06:00
Blade Barringer
5ac7f479d3 Added some spacing between icons and text on challenge/guild buttons 2014-12-07 21:03:09 -06:00
Blade Barringer
05c01ebd3c Made glyphicons white on for challenge/guild join/leave buttons 2014-12-07 21:01:40 -06:00
Blade Barringer
72fbe6a8a7 Removed yellow background from join public guild page 2014-12-07 20:58:42 -06:00
Blade Barringer
bd21c93b36 Fixed weirdness on create guild page. Elements were overflowing out of 
their boxes
 2014-12-07 20:52:49 -06:00
Blade Barringer
46cb38660e Fixed padding on challenges filter box 2014-12-07 20:20:42 -06:00
Blade Barringer
d0cf285468 Merge pull request #4358 from andymantell/feature/linking-timetravellers-names 
Link for Tyler and Vicky's names
 2014-12-06 16:48:09 -06:00
Blade Barringer
8ba6bcddde Merge pull request #4354 from crookedneighbor/markdown-lists-in-tasks 
Adjusted margin for markdown list in task-text.
 2014-12-06 16:42:31 -06:00
Blade Barringer
60f3e0032e Adjusted margin for markdown list in tast-text. Closes #2721 2014-12-06 16:41:59 -06:00
Tyler Renelle
cb9083d9ba fix(webhooks): don't send webhooks if not valid url (also if not 
enabled), fixes #4357
 2014-12-06 10:25:41 -07:00
Andy Mantell
58359f1e89 Link for Tyler and Vicky's names #4351 2014-12-06 15:42:12 +00:00
Blade Barringer
66f913e833 closes #4353. If time on chat would break onto new line, just puts whole 
time statment on new line
 2014-12-05 23:51:07 -06:00
Blade Barringer
024e606f5c Merge pull request #4348 from crookedneighbor/fix-transparent-challenge-buttons 
Adjust transparent class of challenge buttons.
 2014-12-05 22:17:38 -06:00
Tyler Renelle
7ab5456c2a Merge pull request #4352 from crookedneighbor/show-gem-purchases-with-customer-id 
Converted planId to customerId as test for whether or not gems can be purchased.
 2014-12-05 14:56:41 -07:00
Blade Barringer
ae62a04497 Converted planId to customerId on whether or not gems can be purchased. 
Closes #4340
 2014-12-05 15:53:53 -06:00
Blade Barringer
ea869a4487 Adjust trasnparent class of challenge buttons. Closes #4346 2014-12-05 15:13:34 -06:00
Matteo Pagliazzi
6380584f46 Merge pull request #4343 from HabitRPG/revert-4342-revert-4329-tranlsate-mystic-items 
Revert "Revert "Tranlsate mystic items""
 2014-12-05 16:07:33 +01:00
Matteo Pagliazzi
0450e2b924 Revert "Revert "Tranlsate mystic items"" 2014-12-05 16:07:27 +01:00
Matteo Pagliazzi
6ad4f5004d Merge pull request #4342 from HabitRPG/revert-4329-tranlsate-mystic-items 
Revert "Tranlsate mystic items"
 2014-12-05 16:03:50 +01:00
Matteo Pagliazzi
1d1de38956 Revert "Tranlsate mystic items" 2014-12-05 16:03:41 +01:00
Matteo Pagliazzi
a1075a5193 Merge pull request #4329 from crookedneighbor/tranlsate-mystic-items 
Tranlsate mystic items
 2014-12-05 16:02:34 +01:00
Sabe Jones
aa346c9271 Merge pull request #4328 from SabreCat/gems 
Add available Gems counter to Market
 2014-12-04 20:30:46 -06:00