Commit graph

27 commits

Author SHA1 Message Date
Nick Gordon
b958103447 Merge branch 'develop' of https://github.com/snicker/habitrpg into develop 2013-11-15 06:20:37 -08:00
Nick Gordon
7bf1bf2af0 data export commit, supports exporting task history via csv
*adds the following new dependencies: moment, express-csv
*recommend replacing functionality of 'relative-date' with features from 'moment'
*supports retrieval of CSV history via the API and in browser
**/api/v1/export/history (requires typical API authorization)
**/export/history.csv (requires session authorization)
*adds new routes for data export
2013-11-15 06:18:16 -08:00
Tyler Renelle
4c3f04cc49 Merge branch 'mounts' into develop
Conflicts:
	views/options/inventory/stable.jade
2013-11-14 13:04:44 -08:00
Matteo Pagliazzi
c256295d6f fix tests, @lefnire not the best solution but it works 2013-11-14 14:48:36 +01:00
Matteo Pagliazzi
0c40d44de7 remove clientSideStrings part, stringNotFound added to locales/en/app.json, should be added to other languages, readme updated, $rootscope.translations removed 2013-11-14 14:41:42 +01:00
Nick Gordon
cd693835ce Autocompletion of nicknames in chat works. this commit will require a npm install to fetch new packages 2013-11-11 22:32:52 -08:00
Tyler Renelle
284114c056 mounts: counting bug fixes, put pets & mounts in tabs 2013-11-10 12:28:08 -08:00
Tyler Renelle
085919c000 mounts: update all html & javascript to support UserSchema overhaul (60421a8). Also add very basic feeding & saddling mounts functionality. use progress bars to indicate pet feeding progress 2013-11-10 11:04:41 -08:00
Tyler Renelle
d679fa1e62 contrib: add Admin page to update contributor status. Start migrating from User.backer => User.contributor 2013-11-06 15:59:56 -08:00
Tyler Renelle
4f52c7e15d [#1722] have to click twice for options.profile.profile 2013-11-04 00:41:16 -08:00
Tyler Renelle
646a5c942b [#1716 #1705] working modal for challenge.participants.stats! also don't
scroll to top of page. We'll want to test that this doesn't break
anything else in the app, @paglias looks like the guys on that thread
felt pretty dirty about this workaround for some reason
2013-11-02 16:07:12 -07:00
Tyler Renelle
8ae75e09c5 [#1716] use ui-router to collapse challenge participants (WIP) 2013-11-01 23:46:14 -07:00
Tyler Renelle
39821752fa challenges: move options/challenges to options/social/challenges 2013-10-31 14:37:04 -07:00
Matteo Pagliazzi
e2331e5194 added growl style notification for errors 2013-10-30 19:29:46 +01:00
Matteo Pagliazzi
1490380e53 @lefnire since we are just testing and not deploying from this I liked to try the loading bar we talked about so that everyone can say what they do think 2013-10-30 19:13:21 +01:00
Tyler Renelle
ff3266bac8 get rid of ngRoute completely, depend on ui-router instead 2013-10-30 10:31:36 -07:00
Tyler Renelle
6e71a76e22 challenges: back to dealing with taskLists from scopes, rather than the
habitrpg-tasks directive. Was having trouble accessing it by reference
otherwise. Would love to move off of the directive entirely and use
ng-include instead, but some scope issues with lists
2013-10-29 19:07:39 -07:00
Tyler Renelle
02ebc536ca challenges: get Challenges (mostly) working along the same ui-router
principles as groups. Having some $scope variable resolution timing issues
2013-10-29 17:49:49 -07:00
Tyler Renelle
d9d769a0e1 challenges: much better implemntation of ui-router for nested groups. No
need to specify fields or populate members at /groups - instead, provide
that functionality at /groups/:gid
2013-10-29 15:25:50 -07:00
Tyler Renelle
be657a76e0 challenges: pass down if user is member of group (group._isMember) for
performance. some bug fixes
2013-10-29 12:26:13 -07:00
Tyler Renelle
35c4a62de0 challenges: switch from ngRoute to ui-router 2013-10-28 11:34:08 -07:00
Tyler Renelle
e45d8307e7 Subdocs & script templates. Migrate the API from User.tasks =>
User.habits/dailys/todos/rewards. Move /#/tasks & /#/options page
loading from server-sent html to everything loaded in the page as script
templates (including necessary fixes for adsense). NOTE: this commit
won't work, it depends a bit on the *next* commit with Challenges
functionality, but I wanted to separate it out a bit for clarity
2013-10-28 11:34:07 -07: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
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
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
7cd075d787 initial grunt support, gzip enabled 2013-09-06 19:19:43 +02:00
Renamed from assets/js/app.js (Browse further)