9d18e9efd0
Merge pull request #1830 from nafoster/develop
...
Lots of Japanese translations
2013-11-15 18:47:58 -08:00
53db31d4fb
[ #1828 ] don't let users create party if they already belong to one
2013-11-15 18:16:48 -08:00
2b286ba889
[ #1821 ] [ #1723 ] fix pet counters (incl for member modals)
2013-11-15 17:51:00 -08:00
34ea6038f1
add single test for notificationServices
2013-11-15 22:42:30 -03:00
2f5025e322
add tests for groupServices
2013-11-15 22:42:30 -03:00
05334550b0
[ #1837 ] separate groups filter from "create new challenge"-available groups
2013-11-15 17:36:36 -08:00
c9ddc0e023
Merge pull request #1831 from snicker/develop
...
data exporting support, supports exporting task history via csv
2013-11-15 17:25:46 -08:00
5116a99dce
moved UI stuff into the settings area, moved authWithSession to the Auth controller
2013-11-15 16:25:09 -08:00
e2e7ba15b2
ack, trailing comma
2013-11-15 08:56:54 -08:00
c69bc0de58
derp. moment is already a dependency
2013-11-15 08:55:06 -08:00
00d6a5077a
Lots of Japanese translations
2013-11-15 09:22:46 -05: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
1e6dec0bbe
pets: popover placement fixes
2013-11-14 22:07:08 -08:00
9b1c8884a4
[ #1735 ] fix repeated timezone setting for UK users
2013-11-14 21:29:34 -08:00
3461d67995
challenges: include challenges that user created, or belongs to, even if
...
not in group anymore
2013-11-14 20:30:48 -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
97d592401b
Merge pull request #1825 from HabitRPG/sabe_tweak_fix
...
Shields don't come free ya know!
2013-11-14 20:00:00 -08:00
5ae2f06006
Shields don't come free ya know!
...
Fix a couple of missed pieces from reward tier text updates.
2013-11-14 20:42:09 -06:00
55faf443ce
send error to refresh page if they haven't since update
2013-11-14 18:23:07 -08:00
94459e429c
Merge pull request #1824 from HabitRPG/sabe_tweak
...
One does not simply *pull request* into Heroism.
2013-11-14 18:01:02 -08:00
ee1768b7e2
One does not simply *pull request* into Heroism.
...
Improved descriptions of reward tiers in the Tavern chat sidebar. Also a handful of miscellaneous English syntax tweaks.
2013-11-14 19:42:03 -06:00
4ca516b7bc
Merge pull request #1817 from nafoster/develop
...
Many JP translations
2013-11-14 14:07:47 -08:00
224cbe2277
pets: better fix than 64ac920 , and unsets beastmaster if wrongly set
2013-11-14 13:49:59 -08:00
af8ca6d5b0
Many JP translations
2013-11-14 16:34:36 -05:00
64ac920ca7
pets: fix to beastmaster with new pet system
2013-11-14 13:25:00 -08:00
92a7344a58
mounts: back to habirpg-shared#master
2013-11-14 13:05:31 -08:00
4c3f04cc49
Merge branch 'mounts' into develop
...
Conflicts:
views/options/inventory/stable.jade
2013-11-14 13:04:44 -08:00
d245c87f29
mounts: temporarily remove mounts code from views. merging to master so
...
we can run schema migration and start with item translations. This commit will be reverted
when mounts is fully merged
2013-11-14 12:59:00 -08:00
1631406a5e
greek code set to "el"
2013-11-14 21:21:49 +01:00
41d8bc04cd
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-11-14 20:50:36 +01:00
7df04633e2
correct languageName for Ukrainian
2013-11-14 20:50:17 +01:00
201b04f759
i18n: greek bug
2013-11-14 11:17:47 -08:00
edc4a8cdc2
Merge pull request #1814 from phil230/upper_save
...
contrib: Added 'icon-ok' as an upper save button
2013-11-14 10:51:30 -08:00
ffe8ae899b
Merge pull request #1816 from phil230/greek_tr
...
contrib: Added Greek Language
2013-11-14 10:46:16 -08:00
68c9748619
armour -> armor
2013-11-14 19:23:35 +01:00
fafa17c80d
Removed clientSideStrings
2013-11-14 17:25:15 +02:00
412c9efd60
Added Greek Language
2013-11-14 17:01:13 +02:00
c256295d6f
fix tests, @lefnire not the best solution but it works
2013-11-14 14:48:36 +01:00
b60eadf468
readme typo
2013-11-14 14:42:52 +01: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
c75bfaa4d9
remove $rootScope.translations, it should not be necessary, update readme
2013-11-14 14:16:46 +01:00
cbc1185f00
Added 'icon-ok' as an upper save button
2013-11-14 15:01:58 +02:00
ddb73f806a
translations: prep old app.json files for new setup
2013-11-14 01:27:11 -08:00
d44d6168bf
JP: translated head, skin, and profile heading and half translated show helm
2013-11-14 00:51:05 -08:00
8b33019b75
[ #1813 ] add bg.original.json, since old bg file not compatible with new
...
json. will need to revisit
2013-11-14 00:35:00 -08:00
5914848308
[ #1813 ] restore lost PT translations (@DanielTheBard can you double check
...
this?)
2013-11-14 00:25:36 -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
95c886eee8
Merge pull request #1811 from Fandekasp/update_contrib_link
...
replace github contributing links → wikia link
2013-11-13 23:26:19 -08:00
Tyler Renelle