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
5ddf54466c
can change language from setting
2013-11-12 16:13:35 +01:00
154a652726
middleware.locals back to a middleware, use user specified language if avalaible, list of avalaible languages avalaible in window.env
2013-11-12 15:57:46 +01:00
6e33b88c85
remove middleware.splash
2013-11-12 15:10:16 +01:00
7eaed0348f
git merge Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into translations
2013-11-12 14:54:17 +01:00
1d9148eebb
move middleware.locals only where it is needed and transform it into a common function, simplify translations and adds automatic language detection
2013-11-12 14:49:01 +01:00
cb36881edd
minimal translations
2013-11-11 22:22:25 +01:00
de7ae2203f
remove old files
2013-11-11 21:21:19 +01:00
a1f9bf60fb
try
2013-11-11 21:20:12 +01:00
72f64fa85c
[ #1751 ] /challenges/:cid/:mid task filtering by "in this challenge" at
...
application level, not Mongo. $elemMatch doesn't support returning
multiple items, see http://goo.gl/MxmWdQ & http://goo.gl/Iku44w
2013-11-10 23:41:42 -08:00
244fe63bdd
mounts: add support for rare mounts
2013-11-10 14:36:40 -08:00
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
60421a85cc
mounts: revamp UserSchema.items to store all animal-related items as
...
objects rather than arrays. Preparation for the mount system
2013-11-09 20:14:35 -08:00
ddd45d76d4
contrib: fix to upping lvl 0 contrib
2013-11-09 13:24:03 -08:00
66041442da
Merge pull request #1770 from snicker/develop
...
updated README to show initial seeding tasks, and fixed a small typo
2013-11-09 13:19:31 -08:00
de1f056af8
typo
2013-11-09 19:32:47 +01:00
e198bac475
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-11-09 19:31:50 +01:00
aff43acc84
fix #1769
2013-11-09 19:31:28 +01:00
d802c502b0
updated README to show initial seeding tasks, and fixed a small typo
2013-11-09 08:48:38 -08:00
242bcda96a
contrib: remove gems from admin section, update automatically when they
...
increase a level
2013-11-08 19:28:07 -08:00
f35df8a47f
[ #1726 ] remove updateTasks() batch api route. That's not how we're using
...
batch (we'll create a proper batch route & document later), and we
shouldn't support this route
2013-11-08 14:01:29 -08:00
3a332c4c45
port beastMaster achievement, @lefnire shown client side but not set, using user.pre("save") for setting
2013-11-08 22:33:48 +01:00
03905ef90b
solve conflicts 3
2013-11-08 17:09:06 +01:00
e1b86c64a6
solve conflicts 2
2013-11-08 17:08:23 +01:00
02651d52a4
solve conflict
2013-11-08 17:05:03 +01:00
Matteo Pagliazzi