Michael Schmatz
|
07cc01332d
|
Merge branch 'pr/1383'
Conflicts:
app/views/play/level/tome/SpellListTabEntryView.coffee
|
2014-07-23 14:44:15 -07:00 |
|
Ruben Vereecken
|
cde87e4fe5
|
Covered general patches with tests
|
2014-07-23 20:00:28 +02:00 |
|
Nick Winter
|
26ac94367e
|
Fixed #1372. Minor fixes.
|
2014-07-23 08:59:42 -07:00 |
|
Dominik Kundel
|
5477a5b84a
|
fixed broken build from #1380
|
2014-07-23 17:52:15 +02:00 |
|
Dominik Kundel
|
5279b01483
|
fixed showing pinned popover
|
2014-07-23 17:39:16 +02:00 |
|
Scott Erickson
|
beef508e76
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-07-23 07:09:12 -07:00 |
|
Scott Erickson
|
65375aa5fc
|
Renamed problem and spell to their new, capitalized names.
|
2014-07-23 07:09:05 -07:00 |
|
Scott Erickson
|
1c3404d03e
|
Refactored views. View file names now match view class names. Router lists routes explicitly rather than routing automagically. Hacking my way to renaming problem, spell.
|
2014-07-23 07:02:45 -07:00 |
|
Dominik Kundel
|
4f6ca5335f
|
fixed spell palette sliding behind HUD
|
2014-07-23 15:50:47 +02:00 |
|
Dominik Kundel
|
72c1bb28b3
|
fixed artefact
|
2014-07-23 15:26:22 +02:00 |
|
Ruben Vereecken
|
2394bd8129
|
Added the recalculation script for a couple of statistics
|
2014-07-23 15:22:53 +02:00 |
|
Dominik Kundel
|
9cb704a843
|
last fix for dimming the editor
|
2014-07-23 15:09:15 +02:00 |
|
Dominik Kundel
|
be50927fb6
|
disabled editor works again
|
2014-07-23 14:38:12 +02:00 |
|
Ruben Vereecken
|
ebfe1fc1c0
|
Proofed admin endpoint some more, no more dangling connections
|
2014-07-23 13:06:51 +02:00 |
|
Melondonut
|
cb3f547b9e
|
Update ko.coffee
|
2014-07-23 14:32:11 +09:00 |
|
Melondonut
|
dbb3d92b81
|
Update ko.coffee
|
2014-07-23 13:56:18 +09:00 |
|
Michael Schmatz
|
572a3bf37e
|
Merge pull request #1380 from dkundel/master
updated zatanna version
|
2014-07-22 14:43:14 -07:00 |
|
Ruben Vereecken
|
8969311d82
|
Butons on profile page now nicer
|
2014-07-22 21:52:52 +02:00 |
|
Dominik Kundel
|
5db634d6a8
|
fullscreen on keyboard shortcut
|
2014-07-22 21:47:36 +02:00 |
|
Dominik Kundel
|
a377e6c05d
|
updated zatanna version
|
2014-07-22 21:20:59 +02:00 |
|
Ruben Vereecken
|
19d59ac8ff
|
Refactored Users and Level Sessions to have private properties:
|
2014-07-22 20:07:00 +02:00 |
|
George Saines
|
8982c7ea5b
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-07-22 09:11:30 -07:00 |
|
George Saines
|
574252df32
|
subbing in Pavel's better tiny programming language icons
|
2014-07-22 09:11:25 -07:00 |
|
Michael Schmatz
|
22fabe13ea
|
Increased scoring task timeout to 10 minutes
Temporary increase until we can increase it only for Brawlwood
|
2014-07-22 06:59:47 -07:00 |
|
greyhusky
|
a313c3ab27
|
More translations
Translated the "about" page and parts of "legal" page as well as some other stuff
|
2014-07-22 15:01:47 +02:00 |
|
Ruben Vereecken
|
411bb87985
|
Added contributor categories to user profile page
|
2014-07-22 12:50:56 +02:00 |
|
Melondonut
|
8476aa33f9
|
Update ko.coffee
|
2014-07-22 18:21:00 +09:00 |
|
Melondonut
|
e266f403ff
|
Update ko.coffee
|
2014-07-22 10:13:24 +09:00 |
|
Michael Schmatz
|
283108da1e
|
Added login message for anonymous users on job profile
|
2014-07-21 16:59:42 -07:00 |
|
Michael Schmatz
|
f100c4ebbe
|
Add filter alerts to employer page
|
2014-07-21 16:10:02 -07:00 |
|
Michael Schmatz
|
e8ffb8980f
|
Removed filterActive from filter alerts
|
2014-07-21 14:47:44 -07:00 |
|
Ruben Vereecken
|
ebdbc0f891
|
Basis for user view is finished
|
2014-07-21 22:02:08 +02:00 |
|
Ruben Vereecken
|
972d231ff5
|
Refactored router and views to anticipate the renameViews feature
|
2014-07-21 19:49:16 +02:00 |
|
Ruben Vereecken
|
0d87209fa8
|
Recently played is now shown on account page
|
2014-07-21 19:06:22 +02:00 |
|
Michael Schmatz
|
735a7082ee
|
Correction to filter schema
|
2014-07-21 10:01:49 -07:00 |
|
Michael Schmatz
|
6bc436aec2
|
Added saved employer filter alerts to schema
|
2014-07-21 09:44:40 -07:00 |
|
Michael Schmatz
|
984be9980e
|
Put minimum candidates available before employer email
|
2014-07-21 08:32:44 -07:00 |
|
Michael Schmatz
|
ab4424c7ac
|
Changed employer reminder to send every 14 days
|
2014-07-21 08:13:09 -07:00 |
|
Michael Schmatz
|
37b8790b58
|
Added task text and candidate name to task emails
|
2014-07-21 08:02:53 -07:00 |
|
Ruben Vereecken
|
1c6da9711b
|
Added the Recently Played collection and endpoint
|
2014-07-21 14:36:10 +02:00 |
|
Ruben Vereecken
|
023a7adc81
|
Half the account page is there
|
2014-07-21 13:40:11 +02:00 |
|
Nick Winter
|
ac7e663418
|
Merge pull request #1359 from Melondonut/patch-2
translation Update ko.coffee
|
2014-07-20 22:44:05 -07:00 |
|
Melondonut
|
fed5f3bce0
|
uncommented line 485
|
2014-07-21 14:11:17 +09:00 |
|
Darredevil
|
61ebc4d15b
|
Docs tab
|
2014-07-21 03:52:34 +03:00 |
|
Nick Winter
|
20df6b4ebe
|
Merge pull request #1360 from Darredevil/master
Docs page enhancement
|
2014-07-20 17:00:37 -07:00 |
|
Darredevil
|
e43afcc0a9
|
Docs page enhancement
|
2014-07-21 02:23:01 +03:00 |
|
Nick Winter
|
99e1a8b30a
|
Merge pull request #1357 from TheSecretSquad/issue#1213crosshair
Changed point marker to crosshair, made it bigger, and changed color to white
|
2014-07-20 16:04:29 -07:00 |
|
Nick Winter
|
a7905db316
|
Inferring and documenting cooldown, action/spell name, damage, range, radius, and duration when possible.
|
2014-07-20 15:51:48 -07:00 |
|
Melondonut
|
f5ac5423f8
|
Update ko.coffee
I translated a bit more. I corrected some of word spacing, too. Please let me know if there is anything wrong.
|
2014-07-21 06:03:53 +09:00 |
|
Darredevil
|
f8cc64dc4c
|
fix for no user logged
|
2014-07-20 22:14:33 +03:00 |
|