Michał Barciś
|
78d6111fbc
|
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
|
2013-05-31 22:33:15 +02:00 |
|
Tyler Renelle
|
268157ca24
|
tags: use explicit {#each users[_userId].tags} instead of model.ref private path {#each _user.tags}. fixed many tags issues. see https://github.com/codeparty/derby/issues/267
|
2013-05-31 16:25:59 -04:00 |
|
Stan Lindsey
|
389276d7f8
|
Merge pull request #1109 from wildcate/translations
Update app.json
|
2013-05-31 11:12:49 -07:00 |
|
Stan Lindsey
|
4ca8315278
|
Merge pull request #1098 from kubiku/translations
Polish translation updated
|
2013-05-31 11:00:37 -07:00 |
|
wildcate
|
6c481e1065
|
Update app.json
translated up to "daily1comment"
|
2013-05-31 19:33:07 +02:00 |
|
Tyler Renelle
|
9ca9717387
|
Revert "WIP addTask in api.coffee"
This reverts commit 81f2b6789e.
|
2013-05-31 11:20:40 -04:00 |
|
Tyler Renelle
|
cdc7b06f92
|
api_v2 bug fix
|
2013-05-31 11:12:39 -04:00 |
|
Tyler Renelle
|
413abdb345
|
api_v2 bug fix
|
2013-05-31 11:12:18 -04:00 |
|
Tyler Renelle
|
81f2b6789e
|
WIP addTask in api.coffee
|
2013-05-31 11:05:09 -04:00 |
|
yangit
|
9f0e94a5a7
|
APIv2 init2
|
2013-05-31 22:56:55 +08:00 |
|
Tyler Renelle
|
39d29f50f4
|
challenge: don't allow to create new challenge unless in group
|
2013-05-31 09:36:00 -04:00 |
|
Tyler Renelle
|
1411d04518
|
challenges: add basic task stats for challenge subscribers
|
2013-05-31 09:35:50 -04:00 |
|
yangit
|
73d71a0be1
|
APIv2 init
|
2013-05-31 21:11:07 +08:00 |
|
Tyler Renelle
|
10c7d3cc08
|
Merge branch 'develop'
|
2013-05-30 18:48:17 -04:00 |
|
Tyler Renelle
|
60948e7881
|
move fixCorruptUser to the client
Conflicts:
src/app/index.coffee
|
2013-05-30 18:48:08 -04:00 |
|
Tyler Renelle
|
842ac45ab5
|
move fixCorruptUser to the client
|
2013-05-30 18:47:36 -04:00 |
|
Tyler Renelle
|
6e67207835
|
groups: fix leave button
|
2013-05-30 18:42:27 -04:00 |
|
Tyler Renelle
|
9180c9dfd4
|
challenges: add indexedPath() function & view helper, which lets us
look up array indices by object id, similar to reflist benefits. very
handy, using for challenges & challnege tasks
|
2013-05-30 17:10:35 -04:00 |
|
Tyler Renelle
|
3754ce141d
|
Merge branch 'master' into challenges
|
2013-05-30 14:58:54 -04:00 |
|
Tyler Renelle
|
9399ca1d98
|
remove console.log
|
2013-05-30 14:56:28 -04:00 |
|
Tyler Renelle
|
dae3ca635f
|
duplicate pets being pushed into stable, fixes #1086
|
2013-05-30 14:54:00 -04:00 |
|
Tyler Renelle
|
b4a5688cdd
|
return delta bug fix
|
2013-05-30 14:36:29 -04:00 |
|
Tyler Renelle
|
15d76d93f4
|
return delta bug fix
|
2013-05-30 14:35:07 -04:00 |
|
kubiku
|
65de360fa7
|
fixed typos, some polishing of Polish phrases
|
2013-05-30 14:24:11 +02:00 |
|
Tyler Renelle
|
91c5331a28
|
challenges: couple bug fixes
|
2013-05-30 08:41:07 +01:00 |
|
Tyler Renelle
|
9ec369ea7a
|
challenges: add in challenge prize, just for show-purposes for now
|
2013-05-29 23:40:13 +01:00 |
|
Tyler Renelle
|
ea8f245b84
|
challenges: edit challenge title & description
|
2013-05-29 23:33:47 +01:00 |
|
Tyler Renelle
|
b34caaabd6
|
challenges: view.fn bug fix
|
2013-05-29 23:23:17 +01:00 |
|
Tyler Renelle
|
64a99e734f
|
challenges: use bootstrap accordiong, much cleaner
|
2013-05-29 23:18:44 +01:00 |
|
Tyler Renelle
|
5de2269157
|
hotfix: getting a lot of "DERBY is not defined"
|
2013-05-29 23:07:01 +01:00 |
|
Tyler Renelle
|
48e3027638
|
hotfix: getting a lot of "DERBY is not defined"
|
2013-05-29 23:06:07 +01:00 |
|
Tyler Renelle
|
8ad2bf5687
|
groups: don't show websites twice when editing
|
2013-05-29 22:55:20 +01:00 |
|
Tyler Renelle
|
a213d6e997
|
groups: accordion information on left side, more edit options for
group information
|
2013-05-29 22:47:07 +01:00 |
|
Tyler Renelle
|
88ff245aec
|
challenges: add taskInChallenge() view helper and broken task.challenge link
|
2013-05-29 20:53:57 +01:00 |
|
zeroos
|
dbdb4911af
|
Breaking long words in task-text
Previously, if you inputted a long word in your task it overflew the box.
|
2013-05-29 20:00:17 +02:00 |
|
zeroos
|
838e81fd58
|
Fixed bug related to padding of addtask-field
The field was too wide and because of that the text from the end of the input
was below "+" button.
|
2013-05-29 19:47:57 +02:00 |
|
Tyler Renelle
|
cce03c8312
|
guilds: prettier group-creation
|
2013-05-29 18:19:38 +01:00 |
|
Tyler Renelle
|
1063a0e223
|
Merge branch 'develop' into challenges
Conflicts:
src/app/misc.coffee
src/app/party.coffee
|
2013-05-29 15:54:59 +01:00 |
|
Tyler Renelle
|
e9ac76cd81
|
merge character.coffee into profile.coffee, remove unecessary requires
|
2013-05-29 11:59:56 +01:00 |
|
Tyler Renelle
|
37ad6daf8b
|
Merge pull request #1087 from maggick/patch-1
minor corrections
|
2013-05-29 03:38:53 -07:00 |
|
Tyler Renelle
|
3cd23857ce
|
Merge branch 'develop' into challenges
Conflicts:
src/app/index.coffee
|
2013-05-29 11:27:25 +01:00 |
|
Tyler Renelle
|
4c684502f2
|
batch: add convenience batch.set / batch.get for updating paths simultaneously
|
2013-05-29 11:02:23 +01:00 |
|
Tyler Renelle
|
1745ae6205
|
update batchTxn to be a callback instead of object, put batch
operations back in for scoring & cron. hoping this will cut back on
the 4000ms issue, quite an emergency that
|
2013-05-29 10:23:23 +01:00 |
|
Matthieu Keller
|
6111d5ee2a
|
minor corrections
|
2013-05-29 09:55:29 +02:00 |
|
yangit
|
244842618b
|
recompiled sources for browser
|
2013-05-29 12:33:57 +08:00 |
|
Stan Lindsey
|
4eaa3e5997
|
Merge pull request #1081 from ilefotiv/translations
Translations into Italian
|
2013-05-28 11:18:26 -07:00 |
|
ilefotiv
|
eade98b438
|
minor fixes
|
2013-05-28 20:41:01 +03:00 |
|
Felix
|
4eeebb7837
|
Translations into Italian
First Version of translation, I'll surely rework "hatching potions"
namig.
|
2013-05-28 19:17:54 +02:00 |
|
Tyler Renelle
|
ac74cb0d74
|
challenges: new party invitation setup
|
2013-05-28 17:32:31 +01:00 |
|
Tyler Renelle
|
bd18667420
|
convert task-editing state to private path so we don't have
conflicting ids
|
2013-05-28 16:43:16 +01:00 |
|