55d0a0a94d
classes: fix customizations based on habitrpg-shared#9821a88
2013-12-04 15:09:56 -07:00
19b6eb73e0
Merge branch 'develop' into classes
...
Conflicts:
public/css/index.styl
src/models/user.js
views/options/profile.jade
views/shared/header/avatar.jade
views/shared/tasks/lists.jade
views/shared/tasks/task.jade
2013-12-02 18:24:33 -07:00
91c141140d
classes: armory WIP
2013-11-30 16:33:21 -07:00
9bb4e2c272
update userschema to use specialPets from habitrpg-shared https://github.com/HabitRPG/habitrpg-shared/pull/45
2013-11-29 09:06:13 -08:00
7c20988c41
Merge branch 'thanksgiving' into develop
2013-11-27 11:53:18 -07:00
db5befb570
thanksgiving turkey & npcs
2013-11-27 11:50:18 -07:00
d3eed2282c
fix custom day start, @lefnire we may have to restore old values or make a bailey announcement about this, also client-side the validation prevents deleting the old value, it only allows to use the increase/decrease button or selecting the old value and replacing it
2013-11-27 16:08:34 +01:00
2b128f71f4
[ #1532 ] add better validation on preferences.dayStart, and a migration to
...
cleanup corrupt ones
2013-11-26 15:18:20 -07:00
878bfc7f46
removing sensitive user data from export
2013-11-26 06:48:18 -08:00
c0a02eeef8
support for xml and json export of all user data
2013-11-25 08:06:27 -08:00
b4d910c9cb
typo
2013-11-24 21:47:07 +01:00
d1698460e0
add momentjs translations, @lefnire this is a little cumbersome, the language is set server-side & momentjs languages are js functions so we can either load another javascript file in the browser or we can load the file content in window.env and execute it with eval which is what is used now. If you do not like this then feel free to revert the commit. It is useful for example for chat messages date and I will also add it to the repeat schedule so that we it is localized too
2013-11-24 21:45:24 +01:00
e9467dc466
Merge pull request #1896 from Fandekasp/party_members_order
...
Party members order
2013-11-23 16:52:31 -08:00
83e3a6aff2
classes WIP
2013-11-23 16:59:41 -07:00
5579030d20
party.order set and cases added
2013-11-23 21:18:33 +11:00
123c515cbb
challenges: only push history for dailies / habits
2013-11-22 23:22:24 -07:00
c2b8a62749
[ #1879 ] separate task schema types into habitschema, dailyschema, etc to reduce server load and to ensure the proper default type (some people are getting habits in the wrong columns)
2013-11-22 17:12:43 -07:00
18d6bed3b8
[ #1879 ] separate task schema types into habitschema, dailyschema, etc to reduce server load and to ensure the proper default type (some people are getting habits in the wrong columns)
2013-11-22 17:07:27 -07:00
8e5edbbef8
fix #1611 , @lefnire added a migration for deleted tags, this time it should not delete all of them ;)
2013-11-22 20:23:41 +01:00
1a388fa994
fix #1803 , when getting a drop do not return whole user, @lefnire it is ok to change api return data or we need to annouce it before so that third parties can update their code?
2013-11-20 21:36:18 +01:00
bca346e616
use _.isFunction
2013-11-20 18:56:40 +01:00
56437d499e
hotfix for pet count on server
2013-11-20 18:55:03 +01:00
4bedefbc57
use helpers.countPets on server, fix client side pet count
2013-11-20 18:48:48 +01:00
7c15f09e03
code logic to update preferences
2013-11-19 11:22:41 +11:00
98f3902224
deleteTag wasModified not necessary anymore
2013-11-18 17:03:09 +01:00
fb1cc7b127
auth.auth: ensure v
2013-11-16 02:22:56 -08:00
4fa4519b34
[ #1829 ] sort challenge-box by creation date
2013-11-15 21:32:25 -08:00
b762ecba81
admin: add list of contributors. Add contributor.contributions, textarea for links of contributions for tracking. move all admin stuff to dedicated controller & routes
2013-11-15 19:27:23 -08:00
460afb7763
[ #1829 ] sort by timestamp, show group & creator in challenge header
2013-11-15 18:57:35 -08:00
53db31d4fb
[ #1828 ] don't let users create party if they already belong to one
2013-11-15 18:16:48 -08:00
5116a99dce
moved UI stuff into the settings area, moved authWithSession to the Auth controller
2013-11-15 16:25:09 -08:00
b958103447
Merge branch 'develop' of https://github.com/snicker/habitrpg into develop
2013-11-15 06:20:37 -08:00
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
550ca394a9
groups: remove _v for now, it's causing issues (cast to Number failed
...
for Object) and I don't know why
2013-11-14 20:30:48 -08:00
55faf443ce
send error to refresh page if they haven't since update
2013-11-14 18:23:07 -08:00
224cbe2277
pets: better fix than 64ac920 , and unsets beastmaster if wrongly set
2013-11-14 13:49:59 -08:00
64ac920ca7
pets: fix to beastmaster with new pet system
2013-11-14 13:25:00 -08:00
4c3f04cc49
Merge branch 'mounts' into develop
...
Conflicts:
views/options/inventory/stable.jade
2013-11-14 13:04:44 -08:00
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
ddb73f806a
translations: prep old app.json files for new setup
2013-11-14 01:27:11 -08:00
10e9c205e6
Merge branch 'translations' into develop
...
Conflicts:
locales/bg/app.json
locales/nl/app.json
2013-11-13 23:37:29 -08:00
6512e17454
translations: temporarily using locales_new so we can work with existing
...
PRs (@paglias). I want to merge to develop sooner-than-later to avoid near-future
conflicts. Pushing to beta
2013-11-13 23:36:18 -08:00
aad8f80c9d
Merge pull request #1795 from Fandekasp/remove_website
...
remove broken website field from profile
2013-11-13 23:09:27 -08:00
153d1957a8
clean code from websites
...
Need review !
2013-11-14 15:20:35 +11:00
d85084c165
translations: add italian sample for testings & fix
2013-11-13 23:21:09 +01:00
47a1605460
merge missing strings from english at server start up
2013-11-13 23:13:00 +01:00
1b0bed0428
translations: add check
2013-11-13 22:04:31 +01:00
83d9368c2e
translations: move some computations to server start-up, remove console.log, add translations to $rootScope, update readme, update user.preference.language if not set
2013-11-13 22:01:02 +01:00
22267805ee
add support for getting strings under clientSideStrings and update sample
2013-11-12 22:23:47 +01:00
be2010b0a2
add sample app.json for new translations, send client side strings to the browser, send languages to the browser with a language name and code
2013-11-12 22:01:27 +01:00
Tyler Renelle