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

371 commits

Author SHA1 Message Date
Tyler Renelle
c52bbc8f0d graphs: hack 300px width on charts because I can't figure out how to 
make 100% work
 2013-10-19 16:42:29 -07:00
Tyler Renelle
cef8431af0 charts: port toggleChart back in (functional, but it's not getting the 
right width)
 2013-10-19 16:15:48 -07:00
Matteo Pagliazzi
08fd4a865a better code for last fix 2013-10-16 20:24:32 +02:00
Matteo Pagliazzi
28e8955379 do not reset user\ eggs if they are already there 2013-10-16 20:22:22 +02:00
Matteo Pagliazzi
285362de6f remove console.log for syncing 2013-10-16 20:19:42 +02:00
Tyler Renelle
5d46793373 Merge pull request #1591 from djuretic/develop 
Tests for AuthCtrl
 2013-10-15 19:59:47 -07:00
Dušan Juretić
6830a9281d add tests for userServices, changed alert to $window.alert in userServices 2013-10-13 19:01:46 -03:00
Matteo Pagliazzi
68426c7ccb profile edits saved only on click 2013-10-13 20:47:59 +02:00
Matteo Pagliazzi
4e56df0e82 restore values saved only when Save is clicked 2013-10-13 19:58:13 +02:00
Tyler Renelle
a53725da14 gems: add to tutorial on drop unlock 2013-10-12 20:22:56 -07:00
Tyler Renelle
81f9f9b4c5 gems: justin in gem-purchase dialog 2013-10-12 20:01:18 -07:00
Tyler Renelle
4c018d84c1 Merge branch 'paypal' into develop 
Conflicts:
	bower.json
 2013-10-12 19:23:44 -07:00
Tyler Renelle
f8328d3eeb paypal: add configurable merchant and sandbox/production environment 2013-10-12 19:22:06 -07:00
Dušan Juretić
89b4d2ece0 authCtrl tests now working, replaced window for $window 2013-10-12 22:46:13 -03:00
Tyler Renelle
5de0c928fe paypal: conslidate buy gems modals 2013-10-12 16:51:01 -07:00
Tyler Renelle
43be09a5d5 Merge pull request #1575 from Shaners/newSkin 
New skin tones
 2013-10-04 15:27:09 -07:00
Matteo Pagliazzi
bb8bbe4e0f remove stable flickering, fixes #1557 2013-09-29 16:43:01 +02:00
Shane Lister
ab9d6a53fe Update customizer.styl 
Add new skin types to customizer style. Add shirts to cropped images for customizer to fit with other customization options.
 2013-09-26 23:25:50 -07:00
Matteo Pagliazzi
993a255c46 may be fix for #1560 2013-09-22 17:29:16 +02:00
Matteo Pagliazzi
3fb6f25c42 set reorder distance to 5px 2013-09-21 16:50:14 +02:00
Matteo Pagliazzi
332b4bd899 allow header to be scrolled horizontally 2013-09-21 16:25:17 +02:00
Matteo Pagliazzi
93aab9d459 typo 2013-09-21 16:14:19 +02:00
Matteo Pagliazzi
55661a6659 typo 2013-09-20 18:05:01 +02:00
Matteo Pagliazzi
2c2367cf7c update store, fix #1553 2013-09-20 18:04:20 +02:00
Matteo Pagliazzi
2c32095924 confirmation when leaving party or guilds, fix #866 2013-09-18 20:09:35 +02:00
Matteo Pagliazzi
190c617d4c fix #1045 2013-09-18 17:02:17 +02:00
Dušan Juretić
c6472bc615 fix hardcoded total pets count 2013-09-18 11:07:23 -03:00
Tyler Renelle
9ec3c4aaed fix so admins can delete chat msgs 2013-09-18 09:06:51 -04:00
Tyler Renelle
5006cda946 [#1394] fix customizationsNotification issue 2013-09-17 14:59:06 -04:00
Tyler Renelle
402e2aedb0 [#1397 #1543 #1540] misc bug fixes 2013-09-17 14:44:02 -04:00
Tyler Renelle
082bfd46da Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-09-17 14:16:11 -04:00
Tyler Renelle
5ab3ea7311 [#1397 #1543 #1540]use justin in popovers instead of indicator icons (may want to revisit) 2013-09-17 14:15:57 -04:00
Tyler Renelle
36b3a77877 [#1397 #1543 #1540] start adding in unlock notifications (working for some, not for all). Also some tour & header fixes 2013-09-17 14:10:10 -04:00
Matteo Pagliazzi
66a8af5959 Merge pull request #1545 from djuretic/develop 
Profile: allow deletion of websites
 2013-09-17 10:50:04 -07:00
Tyler Renelle
1c7081495f misc cleanup 2013-09-17 12:52:51 -04:00
Tyler Renelle
f26b0a2cf5 [#1394] add drop notifications back in 2013-09-17 12:16:16 -04:00
Tyler Renelle
9d633eceaf [#1394] bug fixes 2013-09-17 12:04:46 -04:00
Tyler Renelle
0fc413f3b7 [#1394] move notifications from controller to service, lots of notification 
fixes, put streak notification back in
 2013-09-17 11:43:05 -04:00
Tyler Renelle
1d3728ea77 spacing cleanup 2013-09-17 10:50:24 -04:00
Dušan Juretić
2c8a5b5ff8 remove website in edit profile page works 2013-09-16 22:58:20 -03:00
Tyler Renelle
dc303f83c1 [#1221] misc bug fixes on backer.* doesn't exist in chat, default backer & 
preference attrs in user model
 2013-09-13 15:10:47 -04:00
J. Ozymandias Fallick
5457bfb2e5 Better due date placement and formatting 2013-09-12 17:04:52 -04:00
Tyler Renelle
0d8e1f2043 cleanup on end tour 2013-09-12 16:51:49 -04:00
Matteo Pagliazzi
e6021d9cf8 show tour only once 2013-09-12 19:24:04 +02:00
Tyler Renelle
bf032ce808 Merge branch 'origin-paglias-fix-guilds' into develop 
Conflicts:
	public/css/index.styl
 2013-09-11 17:18:36 -04:00
Tyler Renelle
2f8c9fea78 [#1516] fixes to handling user.invitations.guilds - both accept & reject 2013-09-11 17:16:23 -04:00
Matteo Pagliazzi
dc96df43cc add margin-right to all .btn, typo in stylus, add build to .nodemonignore 2013-09-11 20:36:57 +02:00
Matteo Pagliazzi
48c078a6ea various fixed 2013-09-11 20:08:53 +02:00
Matteo Pagliazzi
1342a2cb89 fix reject guild function 2013-09-11 17:07:38 +02:00
Matteo Pagliazzi
8e377d7343 fix various guilds issues 2013-09-11 16:28:14 +02:00
Matteo Pagliazzi
1bc5f0eb0c add margin to buttons in setting page 2013-09-11 15:42:11 +02:00
Tyler Renelle
a7e99d0ac0 [#1396] add ability to show tour at any time. Also add ability to show 
Bailey at any time
 2013-09-10 18:36:10 -04:00
Tyler Renelle
964eb91799 update tour to conform to guidelines at #1507 2013-09-10 18:31:26 -04:00
Tyler Renelle
16a4e87fea [#1396] Add justin to tour bubbles 2013-09-10 18:20:10 -04:00
Tyler Renelle
598c4445ff [#1396] setup tour, using user.flags.showTour now instead of 
localStorage. double check with #1507
 2013-09-10 18:06:16 -04:00
Matteo Pagliazzi
c9212d76d8 add padding to gem wallet 2013-09-10 15:30:38 +02:00
Tyler Renelle
a6590e7d84 [#1505] add memberServices into static. I'm adding way too many deps to the 
static page, I need to separate out authServices bare-bones & only use
that in static
 2013-09-09 21:25:45 -04:00
Tyler Renelle
89fabc38cb add "member since" in modal 2013-09-09 18:56:46 -04:00
Tyler Renelle
b123843837 [#1479] when clicking guild member name, replace their limited loaded data with 
more full data from server
 2013-09-09 17:39:26 -04:00
Tyler Renelle
87c2a5b57d [#1489] populate user to Members service on initial load, so it will show self 
as leaderMessage if you're the leader of a group
 2013-09-09 17:23:09 -04:00
Tyler Renelle
e1828153dd [#1489] add edit-gropu server route, basic editing of group info for now (with markdown!) 2013-09-09 17:09:45 -04:00
Tyler Renelle
09963ee30a [#1489] WIP start adding group edit. remove angular-ui-bootstrap accordion as it 
was causing problems.
 2013-09-09 16:15:57 -04:00
Tyler Renelle
774fa4f645 use marked instead of showdown, it's more performant and allows us to 
sanitize the content
 2013-09-09 14:06:36 -04:00
Tyler Renelle
6e800ea2d9 use markdown for profile-editing. Add save button. will remove linky 
once everything's in markdown
 2013-09-09 13:27:25 -04:00
Tyler Renelle
4caec6f737 [#1444] implement delete-tag (incl server route). run tags-cleanup migration 2013-09-09 00:04:02 -04:00
Tyler Renelle
f99b496a29 [#1444] add filters back to use schema. Allow editing of top-level tags 
object in PUT /user, WARNING! We want to get away from that ASAP and
instead have a nested resource for managing tags. Set default task tags
if not present, will revisit after tasks are a subdoc too
 2013-09-08 23:28:34 -04:00
Tyler Renelle
55dffcc317 [#1476] re-order "you already have this combo" message to bail early 2013-09-08 22:42:59 -04:00
Tyler Renelle
5c5212eb0e [#1477] add delete account 2013-09-08 15:17:49 -04:00
Tyler Renelle
f250a98fb7 [#1477] add reset account 2013-09-08 15:11:04 -04:00
Tyler Renelle
5e51148f8e [#1477] port settings modals to jade, implemented restore 2013-09-08 13:23:37 -04:00
Tyler Renelle
aad034564e [#1459] add profile-editing (note, it requires bluring the input fields for 
changes to go through - this is a pretty assuming solution, but I doubt it
will cause problems)
 2013-09-08 12:28:06 -04:00
Tyler Renelle
0b34b41bbe fix to toggle helm 2013-09-08 11:39:30 -04:00
Matteo Pagliazzi
c9f3d3029c delete chat message 2013-09-08 17:22:03 +02:00
Matteo Pagliazzi
75613b0508 add word-wrap to member modal, linky and <a> for website 2013-09-08 12:13:55 +02:00
Tyler Renelle
0ccdb48751 [#1468] hatchingPotion purchasing fix. also some temp hacks to get the UI to update 2013-09-07 19:06:41 -04:00
Tyler Renelle
5cb8238b7c change badge from master => royal 2013-09-07 15:31:36 -04:00
Tyler Renelle
a960d310f7 [#1465] allow clicking self for modal 2013-09-07 13:59:49 -04:00
Tyler Renelle
b820417953 slight updates to chat colors 2013-09-07 13:44:08 -04:00
Tyler Renelle
69faa27f68 [#1465] bug fixes to achievements listing 2013-09-07 13:38:43 -04:00
Tyler Renelle
91d1cdf361 [#1465] add member modals back in. Not all info is present, just a bit more 
work. Can now click guild & tavern members! does lazy-loading of members
so we don't have to load all their information at once
 2013-09-07 12:45:39 -04:00
Matteo Pagliazzi
d30d20d987 add margin to chat-btn 2013-09-07 15:16:49 +02:00
Tyler Renelle
e23acc4c0a Merge branch 'paglias/grunt' into develop 2013-09-06 22:23:02 -04:00
Matteo Pagliazzi
9046bd5041 css 2013-09-06 21:39:18 +02:00
Matteo Pagliazzi
7cd075d787 initial grunt support, gzip enabled 2013-09-06 19:19:43 +02:00
Tyler Renelle
b470abb441 small static-pages tweaks 2013-09-02 01:20:43 -04:00
Tyler Renelle
872b834f07 rewrite: add sync button, menus now update when switching b/w options / tasks 2013-09-01 19:41:17 -04:00
Tyler Renelle
bc4798b354 groups: big changes here i may decide to revert. GET /api/v1/groups 
optionally takes ?type=guilds (guilds, party, tavern, public). this
allows us to incrementally load the app as they click through the tabs,
because guilds is really large (1.5mb!) - gotta cut this down
somehow. The big issue is requireing return values as an array, so
ngResource can work with the response (subsequent group.$postChat(),
group.$join(), etc.). The array format doesn't really work out that
well, so I may scrap
 2013-08-31 22:59:35 -04:00
Tyler Renelle
dddb0be9f3 rewrite2 move css files up a directory. Move *all* images to habitrpg-shared. moved a lot of spritesheet css to habitrpg-shared. still more to be moved, but this is a start 2013-08-26 21:34:33 -04:00
Tyler Renelle
bf654b26ee rewrite2 remove entire vendor directory 2013-08-26 19:37:32 -04:00
Tyler Renelle
25f807efce rewrite2 remove cached browserquest, bootstrap-tour, github-buttons from submodules 2013-08-26 19:36:12 -04:00
Sabe Jones
fe6f478a60 Remove unneeded class reference 
Finish removing image rotation
 2013-08-11 11:04:51 -05:00
Sabe Jones
420a8617d7 Server is respawning 
Humorous wording tweak
 2013-08-10 16:11:27 -05:00
Sabe Jones
c7381485a3 Fix broken image on 500 error page 
Replaced nonexistent male armor sprite with Grim Reaper; removed rotation
 2013-08-10 15:18:56 -05:00
Sabe Jones
1aa5ff2db2 Fix typos and update current-events notice on 500 error 
Brings "Server restarting" message up to date re: Angular rewrite.
 2013-08-01 13:41:39 -05:00
Andre Casey
6d27b898a2 Adjust CSS to show full egg and potion artwork, and center the artwork above the label 2013-07-02 01:37:35 -07:00
Stan Lindsey
8aee73c79a Slight rewording 2013-06-07 13:13:11 +02:00
Slappybag
903587b776 Reworded 500.html to better represent the most likely cause of display - (server restart) 2013-06-07 11:50:24 +01:00
Tyler Renelle
ed057799a3 put coin_single_[silver|gold].png back in (thought we weren't using 
anymore, i was wrong)
 2013-05-20 10:27:53 +01:00
Shane Lister
5cff970947 Bacon Bacon 
Putting some bacon into the tavern NPC graphic. The people demand bacon.
 2013-05-17 16:42:26 -07:00
Tyler Renelle
f6df9a610a get rid of some old unused images 2013-05-16 12:16:24 +01:00
Tyler Renelle
af8dbb9f1a Use @Shaners new NPCs sprites instead of images 2013-05-16 12:00:04 +01:00
Shane Lister
2cebbb93e5 NPC Sprite Sheet and CSS 2013-05-15 21:44:39 -07:00
Shane Lister
8bb0718cea Backer-Gear Tweaks, NPCs 2013-05-15 17:22:32 -07:00
Tyler Renelle
be08568c3b npcs: matt stable-master in the the pets tab (bravo @Shaners!). also 
include link to the pets spritesheet, and some info on mounts
 2013-05-13 21:29:27 +01:00
Slappybag
88e6f40804 Tokens = Gems for front-end display. 2013-05-10 17:30:13 +01:00
Tyler Renelle
cd6a7fbcc4 nix old paw 2013-05-10 11:21:12 +01:00
Shane Lister
2234f57d73 Resting icon and pixely version of missing pet 2013-05-09 16:41:44 -07:00
Shane Lister
bbf08efd44 105x Sprite Sheet and Lowered Shade Helmet 
I made a 105x sized Sprite Sheet but haven't done the new CSS. Could
still be used for some testing with some quick CSS.
 2013-05-08 23:40:12 -07:00
Shane Lister
25e3500f74 Backer-only GIF Timing Adjustments 2013-05-08 22:11:29 -07:00
Shane Lister
4300e04e43 Backer-Only Shop Sprites 2013-05-08 17:02:39 -07:00
Tyler Renelle
e95e313e45 temporary shop sprites to test how things work, will replace with 
@Shaners official stuff
 2013-05-08 22:28:17 +01:00
Shane Lister
26b33d7da4 Backer Only Gear 
Animated GIFs and a sprite sheet.
 2013-05-07 17:38:13 -07:00
Tyler Renelle
2b9f4e336b add achievemnts in as spritesheet 2013-05-03 15:46:59 +01:00
Tyler Renelle
710e45cc84 Merge branch 'develop' 2013-05-02 17:59:05 +01:00
Tyler Renelle
77bd61c244 Add bailey the crier for alerts. move CHANGELOG.md into the modal 2013-05-02 16:56:43 +01:00
Tyler Renelle
a40a41fa9c add in alexander the merchant 2013-05-02 15:12:00 +01:00
Tyler Renelle
e22634658a add in daniel / tavern tab content 2013-05-02 15:01:11 +01:00
Tyler Renelle
166225b8b0 add logo assets (@litenull) 2013-05-02 12:27:08 +01:00
Tyler Renelle
9e86248120 "unlock all the pets" style stable layout 2013-04-15 02:03:32 -04:00
Tyler Renelle
f9db24354f Merge branch 'develop' 2013-04-09 23:02:19 -04:00
Tyler Renelle
d2f6597e9f remove jquery-ui as git submodule, add it into public/vendor manually due to large direcotry size with build files 2013-04-09 13:45:09 -04:00
Tyler Renelle
72ee444608 back to our roots: store vendor files in public/vendor instead of 
using CDN, hoping to fix #773 (hoping! will follow up). We can close #755 as a result. We use
require() to min/concat for performance. Note, previously we had "too
many files open" error because we had /vendor tracking git submodules,
which includes all files for those projects - now we're downloading
manually, which gives us minimum required files from each project's
build steps
 2013-04-09 13:21:20 -04:00
Tyler Renelle
3918eb6731 Merge branch 'develop' 2013-04-06 13:17:07 -04:00
Shane Lister
35da5c2a1e Fix to some pixel grid alignment issues 2013-04-06 10:06:37 -07:00
Tyler Renelle
db4ebe3813 add bs-docs-masthead 2013-04-05 14:16:26 -04:00
Shane Lister
b5665cdd7c new line 2013-03-29 22:50:15 -07:00
Shane Lister
86102ce8e7 More Gem sizes 2013-03-29 22:44:44 -07:00
Shane Lister
f72c8f33ec Added Gem to Sprite Sheet and Egg CSS 2013-03-28 19:04:01 -07:00
Tyler Renelle
a84d1920bf pets: remove unecessary css 2013-03-27 17:57:39 -07:00
Shane Lister
0ac25e7686 Last four potions for new pet system 2013-03-27 17:16:49 -07:00
Tyler Renelle
6520bfb789 pets: rename shaners Item_HatchingPotion to Pet_HatchingPotion to fit 
previous architecture, add some placeholders for the un-finished
potions. got them working
 2013-03-27 00:20:33 -07:00
Shane Lister
2cb5fed3fc egg and mount image update 2013-03-26 23:28:20 -07:00
Shane Lister
ca66c658d7 Update PetEggs.css 
Fixed flying pig and fox positions since they seemed to be reversed. Added positions for new hatching potion items.
 2013-03-26 22:52:45 -07:00
Tyler Renelle
8ce1945001 pets: pull @Shaners updated sprites with wolf-base 2013-03-26 18:29:16 -07:00
Tyler Renelle
b95fd4a053 Merge pull request #731 from Shaners/patch-1 
Update Mounts.css
 2013-03-26 11:28:56 -07:00
Shane Lister
79ead2cdff Update pet_sprites.css 
Added missing wolf base position.
 2013-03-26 09:40:01 -07:00
Shane Lister
2f38286716 Update Mounts.css 
periods and ethereal lion position
 2013-03-26 09:31:42 -07:00
Tyler Renelle
62892bdc9b remove more unecessary imgs 2013-03-25 14:02:55 -07:00
Tyler Renelle
3c75caffd8 Merge branch 'develop' into pets 2013-03-22 23:50:41 -06:00
Tyler Renelle
e7fe8f40a7 move backer mount into backer/ 2013-03-22 23:41:22 -06:00
Tyler Renelle
7ab4abad60 adding in as much currently-designed, unused pixel art that I could find into public/img/unprocessed 2013-03-22 23:39:33 -06:00
Tyler Renelle
b490133bd8 fix cactus css sprites 2013-03-22 22:16:30 -06:00
Tyler Renelle
fc788f3f86 fix eggs css - was missing fox 2013-03-22 19:35:40 -06:00
Tyler Renelle
a1a85241d5 add "hatching powder" (as temporary pet food), clean up some dialogs, 
fix eggs using their actual animal sprites
 2013-03-21 14:56:25 -06:00
Tyler Renelle
3ce2686662 Merge branch 'develop' into switz-inventory 
Conflicts:
	src/app/helpers.coffee
	styles/app/avatar.styl
	styles/app/index.styl
	views/app/avatar.html
	views/app/tasks.html
Merge branch 'develop' into switz-inventory

Conflicts:
	src/app/helpers.coffee
	styles/app/avatar.styl
	styles/app/index.styl
	views/app/avatar.html
	views/app/tasks.html
 2013-03-21 13:51:38 -06:00
Tyler Renelle
fa89b20dd5 Merge branch 'develop' into zakkain-ui-tweaks 
Conflicts:
	styles/app/index.styl
	styles/app/tasks.styl
	views/app/alerts.html
	views/app/avatar.html
	views/app/header.html
	views/app/index.html
Merge branch 'develop' into zakkain-ui-tweaks

Conflicts:
	styles/app/index.styl
	styles/app/tasks.styl
	views/app/alerts.html
	views/app/avatar.html
	views/app/header.html
	views/app/index.html
by popular demand, we're dropping the crosshatched square and going blank

Conflicts:
	styles/app/tasks.styl
 2013-03-21 12:36:05 -06:00
Tyler Renelle
7c77126129 try some protocol-agnostics to fix homepage css 2013-03-21 11:23:46 -06:00
Tyler Renelle
d737bd0714 remove a ton of public/vendor git submodules, using CDN instead. The 
reason we're removing the submodules (intead of keeping them around
for offline development) is that derby does some watchfile magic on the
public directory, and it causes a "max file limit" operating system
error (mitigated by `ulimit -u 2048`). For offline developers, you may
want to have some symlinks and a git stash handy
 2013-03-21 11:11:15 -06:00
Shane Lister
63f0a9f3a4 Mount Sprite Sheet, Mount CSS, Revised Pet Egg CSS 
Here is a copy of the mount sprite sheet, mount CSS, and a revised pet
egg CSS. CSS now matches the player CSS structure. Removed individual
mount images as they'd no longer be needed.
 2013-03-18 22:19:20 -07:00
Zachary Kain
e18c53f97f middle of wrasslin the new header 2013-03-18 16:48:47 -04:00