Nick Gordon
5116a99dce
moved UI stuff into the settings area, moved authWithSession to the Auth controller
2013-11-15 16:25:09 -08:00
Nick Gordon
e2e7ba15b2
ack, trailing comma
2013-11-15 08:56:54 -08:00
Nick Gordon
c69bc0de58
derp. moment is already a dependency
2013-11-15 08:55:06 -08:00
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
1e6dec0bbe
pets: popover placement fixes
2013-11-14 22:07:08 -08:00
Tyler Renelle
9b1c8884a4
[ #1735 ] fix repeated timezone setting for UK users
2013-11-14 21:29:34 -08:00
Tyler Renelle
3461d67995
challenges: include challenges that user created, or belongs to, even if
...
not in group anymore
2013-11-14 20:30:48 -08:00
Tyler Renelle
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
Tyler Renelle
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
Sabe Jones
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
Tyler Renelle
55faf443ce
send error to refresh page if they haven't since update
2013-11-14 18:23:07 -08:00
Tyler Renelle
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
Sabe Jones
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
Tyler Renelle
4ca516b7bc
Merge pull request #1817 from nafoster/develop
...
Many JP translations
2013-11-14 14:07:47 -08:00
Tyler Renelle
224cbe2277
pets: better fix than 64ac920 , and unsets beastmaster if wrongly set
2013-11-14 13:49:59 -08:00
Nicole Foster
af8ca6d5b0
Many JP translations
2013-11-14 16:34:36 -05:00
Tyler Renelle
64ac920ca7
pets: fix to beastmaster with new pet system
2013-11-14 13:25:00 -08:00
Tyler Renelle
92a7344a58
mounts: back to habirpg-shared#master
2013-11-14 13:05:31 -08:00
Tyler Renelle
4c3f04cc49
Merge branch 'mounts' into develop
...
Conflicts:
views/options/inventory/stable.jade
2013-11-14 13:04:44 -08:00
Tyler Renelle
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
Matteo Pagliazzi
1631406a5e
greek code set to "el"
2013-11-14 21:21:49 +01:00
Matteo Pagliazzi
41d8bc04cd
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-11-14 20:50:36 +01:00
Matteo Pagliazzi
7df04633e2
correct languageName for Ukrainian
2013-11-14 20:50:17 +01:00
Tyler Renelle
201b04f759
i18n: greek bug
2013-11-14 11:17:47 -08:00
Tyler Renelle
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
Tyler Renelle
ffe8ae899b
Merge pull request #1816 from phil230/greek_tr
...
contrib: Added Greek Language
2013-11-14 10:46:16 -08:00
Matteo Pagliazzi
68c9748619
armour -> armor
2013-11-14 19:23:35 +01:00
Filippos
fafa17c80d
Removed clientSideStrings
2013-11-14 17:25:15 +02:00
Filippos
412c9efd60
Added Greek Language
2013-11-14 17:01:13 +02:00
Matteo Pagliazzi
c256295d6f
fix tests, @lefnire not the best solution but it works
2013-11-14 14:48:36 +01:00
Matteo Pagliazzi
b60eadf468
readme typo
2013-11-14 14:42:52 +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
Matteo Pagliazzi
c75bfaa4d9
remove $rootScope.translations, it should not be necessary, update readme
2013-11-14 14:16:46 +01:00
Filippos
cbc1185f00
Added 'icon-ok' as an upper save button
2013-11-14 15:01:58 +02:00
Tyler Renelle
ddb73f806a
translations: prep old app.json files for new setup
2013-11-14 01:27:11 -08:00
Nicole Foster
d44d6168bf
JP: translated head, skin, and profile heading and half translated show helm
2013-11-14 00:51:05 -08:00
Tyler Renelle
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
Tyler Renelle
5914848308
[ #1813 ] restore lost PT translations (@DanielTheBard can you double check
...
this?)
2013-11-14 00:25:36 -08:00
Tyler Renelle
10e9c205e6
Merge branch 'translations' into develop
...
Conflicts:
locales/bg/app.json
locales/nl/app.json
2013-11-13 23:37:29 -08:00
Tyler Renelle
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
Tyler Renelle
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
5038885baf
[ #923 ] also migrate group.websites => group.description (@Fandekasp the
...
user stuff is solid, thanks!)
2013-11-13 23:24:59 -08:00
Tyler Renelle
aad8f80c9d
Merge pull request #1795 from Fandekasp/remove_website
...
remove broken website field from profile
2013-11-13 23:09:27 -08:00
Adrien Lemaire
9083645dc3
migration script: websites → blurb
2013-11-14 17:57:07 +11:00
Adrien Lemaire
153d1957a8
clean code from websites
...
Need review !
2013-11-14 15:20:35 +11:00
Adrien Lemaire
340590774c
replace github contributing links → wikia link
2013-11-14 15:09:20 +11:00
Tyler Renelle
1150de9d9d
Merge pull request #1780 from Fandekasp/fix_armour
...
Issue #1149 : armour → armor
2013-11-13 16:19:04 -08:00
Adrien Lemaire
c90248f817
update new armour → armor after rebase
2013-11-14 11:13:09 +11:00
Adrien Lemaire
1fab48f1db
Issue #1149 : armour → armor
2013-11-14 11:10:54 +11:00
