codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-30 02:55:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
4113 commits 27 branches 0 tags 134 MiB
Commit graph

2959 commits

Author SHA1 Message Date
Scott Erickson
d74a778f67 Made creating components open to everyone! 2014-07-09 12:21:32 -07:00
Nick Winter
44e5c2826c Proper Treema node behavior for different code languages in default code, property documentation, and snippets. 2014-07-09 11:59:27 -07:00
Ruben Vereecken
ac95d775e6 Users can now be gotten by slug 2014-07-09 20:23:05 +02:00
Scott Erickson
3fbce8334d Fixed #1276 2014-07-09 10:47:02 -07:00
gosnat
4d50a6d76a Update play_view.coffee 
Added "Guide Everyone Home" level
 2014-07-09 08:02:58 -05:00
Nick Winter
928e4362ba Made some style tweaks to the employers page to move the filters into a sidebar when authorized. 2014-07-08 20:47:22 -07:00
Nick Winter
c19a31a58c Fixed some wizard positioning issues in multiplayer. 2014-07-08 18:51:10 -07:00
Nick Winter
31be904b03 Working on flippable tile highlight bounds marks. 2014-07-08 16:43:36 -07:00
Michael Schmatz
21d056ff01 Instant application of filters 2014-07-08 11:19:14 -07:00
Michael Schmatz
bbc793b003 Fixed modal popping up when logging out sometimes 2014-07-08 10:42:36 -07:00
Michael Schmatz
aa40257034 Table styling/ copy edit 2014-07-07 23:23:36 -07:00
Michael Schmatz
e71ca28f02 Implement candidate filter counts next to filters 2014-07-07 21:43:30 -07:00
Michael Schmatz
e294f344c4 Move featured candidates to top of sort 2014-07-07 21:29:48 -07:00
Michael Schmatz
08b9a8fdaa Various changes to education filter 2014-07-07 21:04:12 -07:00
Michael Schmatz
30745a25ca Consolidated iOS and Android into Mobile 2014-07-07 20:24:29 -07:00
Nick Winter
9381a4dec6 Merged in some Russian translations from a1ip and fixd a merge conflict in server.coffee style cleanups. 2014-07-07 20:16:00 -07:00
Nick Winter
d414ed64ec Merge pull request #1264 from kinez/patch-12 
Update hu.coffee
 2014-07-07 20:13:36 -07:00
Michael Schmatz
285c7ff049 Added school changes to schema 2014-07-07 20:05:28 -07:00
Michael Schmatz
cef8fe074a Add mobile developer to the schema 2014-07-07 20:03:02 -07:00
Michael Schmatz
9313541f9f Fixed targeting on employers CSS 2014-07-07 20:02:01 -07:00
Michael Schmatz
30671d82f6 Removed PM and Management from filters 2014-07-07 19:52:31 -07:00
Michael Schmatz
05560662dd Various fixes to employer page/profile view 2014-07-07 19:34:36 -07:00
Scott Erickson
fd564fa2d4 Merge pull request #1261 from Imperadeiro98/master 
Translated some more strings
 2014-07-07 18:50:20 -07:00
Scott Erickson
c1f77e3f07 Merge branch 'supermodel_patch' of https://github.com/rubenvereecken/codecombat into rubenvereecken-supermodel_patch 2014-07-07 18:48:26 -07:00
Scott Erickson
5d00aedac7 Widened the click area on the wizard settings view for color config. 2014-07-07 18:13:19 -07:00
Scott Erickson
1263d4724a Fixed the title in the gold view to handle when goldEarned isn't available. 2014-07-07 16:56:47 -07:00
Scott Erickson
49c8360d5b Fixed me emitting 'me:synced' and anything listening for that. 2014-07-07 16:53:34 -07:00
Scott Erickson
908772d8fe Fixed an instance where a level loading callback was erroring if called before the surface was built. 2014-07-07 16:44:18 -07:00
Scott Erickson
61e6c8dfc3 Fixed the gold view not showing numbers until the first change. 2014-07-07 16:05:23 -07:00
Scott Erickson
2a309c149c Enabled submitting patches for thangs and articles. 2014-07-07 15:19:22 -07:00
Michael Schmatz
0305374580 Add featured field to curation 2014-07-07 10:42:16 -07:00
Michael Schmatz
b76239b4e9 Replaced candidate avatars on employer page 2014-07-07 10:29:35 -07:00
Scott Erickson
12543cf4dd Added the foundation of a component docs view. 2014-07-07 10:11:02 -07:00
Scott Erickson
86a3fbacd1 Made the CocoCollection more strict about setting the model property. 2014-07-07 10:11:02 -07:00
Michael Schmatz
3151db6fc5 Hide briefcase when no work history 2014-07-07 09:49:13 -07:00
Imperadeiro98
d9d1d25c3c Update pt-PT.coffee 2014-07-07 13:31:03 +01:00
Scott Erickson
aea1d0e8f2 Changed the angel logigng to use info instead of log, to more easily differentiate. 2014-07-06 15:01:39 -07:00
Scott Erickson
850712442d Added underscore.string to the worker. 2014-07-06 15:01:20 -07:00
Scott Erickson
a2740279bc Added styling for tables in the guide. 2014-07-06 15:00:51 -07:00
Ruben Vereecken
128008daa1 Hid the progress bar on load failed 2014-07-06 21:48:31 +02:00
Ruben Vereecken
1f02b99942 Refactored showNotFound into notFoundView 2014-07-06 20:01:47 +02:00
Scott Erickson
d640dac33a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-06 09:36:12 -07:00
Scott Erickson
37a28cf826 Tweaked the styling for guides to only center emphasized lines immediately after an image. Made the styling also show up on the level editor. 2014-07-06 09:35:28 -07:00
Inez KEMENES
cc0e818824 Update hu.coffee 2014-07-06 16:26:51 +02:00
Imperadeiro98
21c180e206 Update pt-PT.coffee 2014-07-06 11:11:44 +01:00
Imperadeiro98
e3bb93c4f5 Update pt-PT.coffee 2014-07-06 10:01:55 +01:00
Imperadeiro98
183b744d07 Update pt-PT.coffee 2014-07-05 22:10:21 +01:00
Scott Erickson
94a6e3961b Added a button in the level editor to choose which team to play when editing a ladder level. 2014-07-05 13:54:41 -07:00
Imperadeiro98
cc8fec9283 Update pt-PT.coffee 2014-07-05 19:11:58 +01:00
Imperadeiro98
b5ef1742f4 Update pt-PT.coffee 2014-07-05 19:11:06 +01:00
Tery Lim
a5476f90ed Minor cleanup for convention and readability 2014-07-05 18:48:08 +08:00
Scott Erickson
b635c4cf16 Fixes #1220. Passing in the raw attributes to the component settings treema would edit the data before the component's set method would get a snapshot of the original data for whatever was the first change in the data. 2014-07-04 20:45:42 -07:00
Scott Erickson
dc49499679 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-04 18:12:10 -07:00
Scott Erickson
41a8d21bfe Merged conflicts. 2014-07-04 18:11:50 -07:00
Scott Erickson
c76032b0af Merged conflicts. 2014-07-04 18:11:26 -07:00
Scott Erickson
92948e64b5 Merge pull request #1245 from greyhusky/patch-2 
new translations
 2014-07-04 18:09:02 -07:00
Scott Erickson
be3a428b50 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-04 18:02:12 -07:00
Scott Erickson
eed521fb8c Merged conflicts. 2014-07-04 17:54:30 -07:00
Scott Erickson
85a6b648a5 Merged conflicts. 2014-07-04 17:54:24 -07:00
Scott Erickson
81121faebf Merge pull request #1242 from differentmatt/master 
Fix Placement Agreement typo
 2014-07-04 17:39:38 -07:00
Scott Erickson
4e284d81b7 Handled conflicts, throwing out changes to ladder_tab.coffee. 2014-07-04 17:36:10 -07:00
Scott Erickson
1ce55e356c Making the ladder tab reload when social network friends load. See #1196. 2014-07-04 17:32:16 -07:00
Scott Erickson
ca8394621d Fixes #1223 2014-07-04 11:46:33 -07:00
Scott Erickson
f553a1c493 Merge pull request #1256 from rubenvereecken/patch_fix 
Patch fix: applyDelta now always called
 2014-07-04 11:45:22 -07:00
Ruben Vereecken
08030dc785 Cleaned up patch rendering logic 2014-07-04 20:18:26 +02:00
Ruben Vereecken
44c84b3689 proofed the SearchView's runSearch 2014-07-04 19:36:55 +02:00
Ruben Vereecken
6e4170012f Made sure applyDelta is called in all cases 2014-07-04 18:38:15 +02:00
Tery Lim
9090ce7714 Merge master into branch 2014-07-04 22:37:16 +08:00
Tery Lim
329f0e7e22 Clean up for coffeescript convention 2014-07-04 22:23:47 +08:00
Scott Erickson
2855d2a402 Made the deltas lib conflict identifying library able to handle many-to-many conflicts. 
Made conflict finding a bit more liberal, in that any messing with arrays (adding, removing or moving things inside) will conflict with any other such change.
 2014-07-03 17:41:58 -07:00
Michael Schmatz
cc917162a7 Fixed doober alignment 2014-07-03 17:01:09 -07:00
Michael Schmatz
6a33ca0892 Removed autoscrolling 2014-07-03 16:40:00 -07:00
Michael Schmatz
d3cc9ae179 10 pixel margin on photos 2014-07-03 16:33:10 -07:00
Michael Schmatz
45e3da0945 Hover on logout button 2014-07-03 16:32:20 -07:00
Michael Schmatz
615303395c Various fixes for recruiting page 2014-07-03 16:30:27 -07:00
Michael Schmatz
6c31f08853 Unchecked all by default 2014-07-03 15:48:50 -07:00
George Saines
4d12aff35e removing the counselor from the contribute page and all other links 2014-07-03 15:42:24 -07:00
George Saines
6d438319ab Merge branch 'employer-redesign' of https://github.com/codecombat/codecombat into employer-redesign 2014-07-03 15:17:41 -07:00
George Saines
88b0a0a97b making changes to the employer page icon dimensions 2014-07-03 15:17:38 -07:00
Michael Schmatz
52ddb8db62 Add login link and rounded corners for pics 2014-07-03 15:10:09 -07:00
Michael Schmatz
3f1547488c Added login button and fixed bg color 2014-07-03 14:40:39 -07:00
Michael Schmatz
538344094b Fixed filter behavior 2014-07-03 13:59:10 -07:00
Michael Schmatz
ae63461ef3 Filter functional 2014-07-03 11:39:44 -07:00
Michael Schmatz
b58f2c49eb Fix description 2014-07-03 10:22:50 -07:00
Michael Schmatz
49e4dd71ae Merge branch 'master' into employer-redesign 
Conflicts:
	app/schemas/models/user.coffee
 2014-07-03 10:15:31 -07:00
Michael Schmatz
ed30d3292a Filter button 2014-07-03 10:14:32 -07:00
Michael Schmatz
e54b190918 Added shortDescription 2014-07-03 10:02:42 -07:00
Imperadeiro98
dbdd8c672c Update pt-PT.coffee 2014-07-03 14:11:30 +01:00
Imperadeiro98
3b04343034 Update pt-PT.coffee 2014-07-03 14:06:40 +01:00
Imperadeiro98
08a9b4f05b Update pt-PT.coffee 2014-07-03 13:55:50 +01:00
Michael Schmatz
397140d9b0 Basic filtering 
Only visas work
 2014-07-02 16:47:02 -07:00
Michael Schmatz
fe328a766b Basic filtering functionality 
Still has a few bugs
 2014-07-02 15:48:26 -07:00
Dominik Kundel
484749400e Merge remote-tracking branch 'upstream/master' 2014-07-02 20:54:46 +02:00
Dominik Kundel
004a14ae3c fixed autocomplete issue related to switching the programming language 2014-07-02 20:52:16 +02:00
Michael Schmatz
1adefbb3b6 Update user schema (to avoid cherry picking) 2014-07-02 11:50:44 -07:00
Michael Schmatz
c6cc28b976 Various fixes to enable employers page to function correctly 2014-07-02 11:45:00 -07:00
Michael Schmatz
7eeb964d3e Restyled employers page 2014-07-02 11:44:45 -07:00
Michael Schmatz
8e6807ab60 Redesigned layout of employers page 2014-07-02 11:44:33 -07:00
Michael Schmatz
fe08fdb2b0 Made new recruitment base styles 2014-07-02 11:43:39 -07:00
Michael Schmatz
5da1db8f6e Made new recruitment base layout 2014-07-02 11:43:26 -07:00
Michael Schmatz
ebc79668ef Added image assets for recruitment page 2014-07-02 11:42:02 -07:00
Michael Schmatz
f756a16aa4 Added curated section to user schema 2014-07-02 11:41:14 -07:00
greyhusky
467b9adf74 new translations 
i translated some parts, will translate more later
 2014-07-02 11:33:19 +02:00
Dominik Kundel
3f57644b0b Merge remote-tracking branch 'upstream/master' 2014-07-01 19:58:01 +02:00
Tery Lim
618ade4946 Clean up mixed quotes 2014-07-01 12:23:22 +08:00
Michael Schmatz
2dd4ba6203 Increased max skills from 30 to 40 2014-06-30 16:43:31 -07:00
Matt Lott
ffdd73a503 Fix Placement Agreement typo 2014-06-30 16:01:00 -07:00
Dominik Kundel
568e334f13 Merge remote-tracking branch 'upstream/master' 2014-06-28 12:53:20 +02:00
Dominik Kundel
6ea2f1c76d added title for tab trigger 2014-06-28 12:53:09 +02:00
Nick Winter
66da53f8f9 Launching the language selector on the front page. 2014-06-27 10:21:38 -07:00
Nick Winter
58bf85d234 Simulator handles when there are no Greed matches to randomly simulate. 2014-06-27 08:50:04 -07:00
Nick Winter
802d43651e Exposing Vector z property. Getting ready to use new builtin property documentation. 2014-06-27 00:36:18 -07:00
Philippe Rigovanov
dd6209cd99 Update ru.coffee 
With @M-r-A fixes
 2014-06-27 04:33:05 +04:00
Philippe Rigovanov
e138d2eed6 Update ru.coffee 
With fixes from [M-r-A](https://github.com/M-r-A)
 2014-06-27 04:11:46 +04:00
Michael Schmatz
28bb28cf85 Fixed employer view for manually created candidates 2014-06-26 17:07:17 -07:00
George Saines
a94053fd1d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-06-26 10:38:18 -07:00
George Saines
e294133bcf adding the files I forgot 2014-06-26 10:38:13 -07:00
Nick Winter
d360ecac94 Merged in the language-war branch. 2014-06-25 23:00:03 -07:00
Nick Winter
aee95ac5c0 Improved per-language spell palette and tab documentation. 2014-06-25 22:56:39 -07:00
Nick Winter
4cebf1f434 Merge pull request #1232 from Darredevil/patch-11 
Added new tip tag
 2014-06-25 21:23:41 -07:00
Darredevil
c6f19f7d3a Added new tip tag 2014-06-26 06:23:36 +03:00
Nick Winter
8c6ee66684 Better handling of alternate spell palette documentation syntax for other code languages. 2014-06-25 20:19:11 -07:00
Darredevil
a127cb7a5b Added a joke tip 2014-06-26 02:11:15 +03:00
Philippe Rigovanov
f2898e3bc0 Update diplomat.jade 
added myself to diplomats
 2014-06-26 00:56:41 +04:00
Inez KEMENES
96f74183a5 Update hu.coffee 2014-06-25 17:28:13 +02:00
Nick Winter
04976a7b14 Working on the Tome displaying the proper syntax for the selected programming language. Fixed #1225. 2014-06-24 21:08:01 -07:00
Nick Winter
512e287b6a Merge pull request #1184 from greyhusky/patch-1 
Update de-CH.coffee
 2014-06-24 17:41:32 -07:00
George Saines
b5ec38f811 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-06-24 16:43:32 -07:00
George Saines
68d7b3997a modifying the employer page to be more explanatory 2014-06-24 16:43:27 -07:00
Nick Winter
dd9b8a0018 Migrating from tileGroupNumber to tileGroupLetter. 2014-06-24 16:32:44 -07:00
Nick Winter
580d002a98 Messing with marks. 2014-06-24 15:45:33 -07:00
Michael Schmatz
e3a87156a2 Send BCC email to employer when contacting candidates 2014-06-24 14:35:30 -07:00
Scott Erickson
9b873cfab4 Patch modal handles invalid patches. 2014-06-24 17:25:01 -04:00
Scott Erickson
ee0b14eb61 Changed the versions history modal to show name and date. 2014-06-24 16:41:55 -04:00
Scott Erickson
327d273cbe Fixed gplus login. 2014-06-24 14:44:37 -04:00
Michael Schmatz
988ad6ffda Attempting to fix G+ 2014-06-24 11:29:43 -07:00
Scott Erickson
0363166736 Some tweaks to the guide for the benefit of the criss-cross docs, and hopefully others as well. 2014-06-24 13:23:31 -04:00
Nick Winter
6a31e0bcd3 Fixed bug showing spell palette for languages missing any code snippets. 2014-06-24 10:17:38 -07:00
Nick Winter
8719b80663 Showing expired profiles to admins. 2014-06-24 10:15:38 -07:00
Nick Winter
abcc75a6f2 A bit of error logging for #1220. 2014-06-24 09:43:20 -07:00
Nick Winter
3862bd2376 Clearing backups of old models when saving new versions of versioned models. 2014-06-24 09:43:20 -07:00
Scott Erickson
dde43d5df3 Fixed a case where the supermodel was overriding what a previous supermodel had set for saveBackups. 2014-06-23 16:57:54 -04:00
Nick Winter
815ef88e78 Fixed bugs with camera bobbing with bobbing units and gold views showing up when empty. 2014-06-23 10:36:42 -07:00
Michael Schmatz
27774cdf0f Fix #1207 2014-06-23 09:46:39 -07:00
Darredevil
4ca1d2bfeb Added new level "K-means++ Cluster Wars" 
Added new level "K-means++ Cluster Wars"
 2014-06-23 03:43:54 +03:00
Nick Winter
a267933f0b Merge pull request #1200 from Airunedz/patch-1 
Improve Spanish (Spain) translations
 2014-06-22 15:39:43 -07:00
Philippe Rigovanov
f7ec30a586 Update ru.coffee 2014-06-23 01:55:45 +04:00
Nick Winter
105d22c802 Merge pull request #1202 from kumabotz/minor-cleanup 
Minor cleanup
 2014-06-22 07:56:15 -07:00
Nick Winter
8698589625 Applying Scott's fix for #1198. 2014-06-22 07:55:29 -07:00
Tery Lim
f03f8da50a Remove extra spaces 2014-06-22 16:42:06 +08:00
Tery Lim
32868b565d Fix typo 2014-06-22 16:39:51 +08:00
Tery Lim
88c84911b7 Remove trailing comma 2014-06-22 16:39:07 +08:00
Nick Winter
81f8334f37 Some fixes for CocoSprite alphas. 2014-06-21 22:31:10 -07:00
Airunedz
dfff43d66a Improve Spanish (Spain) translations 
Changes: Add some translations to Spanish (I'm from Spanin)
 2014-06-22 01:07:05 +02:00
Nick Winter
1f29a923cf Fixed playing multiplayer levels without an opponent, against the AI. 2014-06-21 12:24:14 -07:00
Nick Winter
6813279871 Fixed an infinite loop timeout issue. 2014-06-21 10:56:55 -07:00
Nick Winter
a8f4baebbc Restricted some more analytics. 2014-06-21 09:47:48 -07:00
Nick Winter
564c463431 Stop tracking Simulator events to Mixpanel. 2014-06-21 09:17:56 -07:00
Nick Winter
52b2e756ef Merge pull request #1195 from thanosme/patch-1 
Update el.coffee
 2014-06-21 08:44:43 -07:00
Thanasis Manousos
5e2dececb5 Update el.coffee 2014-06-21 18:31:26 +03:00
Nick Winter
dde71485bf A bit of cleanup. 2014-06-20 20:52:50 -07:00
Nick Winter
17366af245 Merge pull request #1188 from a1ip/master 
Update ru.coffee
 2014-06-20 20:49:19 -07:00
Nick Winter
d8e1fa880c Merge pull request #1181 from djsmith85/patch-1 
Update de.coffee
 2014-06-20 20:45:27 -07:00
Nick Winter
d3d9908ef2 Merge pull request #1180 from djsmith85/patch-2 
Update de-DE.coffee
 2014-06-20 20:45:02 -07:00
Nick Winter
ac0f6e74aa Merged. 2014-06-20 20:41:34 -07:00
Nick Winter
60ca6e46d3 Ooops, that's a function. 2014-06-20 18:45:57 -07:00
Nick Winter
c9dcc290cb Fixed some bugs where Aether wasn't getting the proper submittedCodeLanguage or functionParameters sometimes. 2014-06-20 17:19:18 -07:00
Fergus Leen
88aa8d234c Facebook friends patch 2014-06-20 02:18:40 +01:00
Nick Winter
bb8b9b2e93 bid -> makeBid. 2014-06-19 17:27:41 -07:00
Michael Schmatz
34f5377754 Increased infinite loop timeout 2014-06-19 17:16:08 -07:00
Michael Schmatz
40fd1674ad Temporary fix for bid function in hover debugger 2014-06-19 17:09:45 -07:00
Nick Winter
7b59c42f5d Added stupid method argument compilation info for bid(blockNumber) to various Aether compilation steps. 2014-06-19 15:41:35 -07:00
thanosme
625750614a Update el.coffee 
Added some tranlations with minor corrections
 2014-06-20 01:14:30 +03:00
Nick Winter
1e9b403ce5 More zazz for home page code language selection. 2014-06-19 14:55:16 -07:00
Nick Winter
cf57411b5c Added another logging message for more easily seeing when transpiled code might be misfiring. 2014-06-19 13:42:38 -07:00
Nick Winter
666c020389 Switching code language based on selection now. 2014-06-19 13:42:25 -07:00
Scott Erickson
20589db6be Fixed a bug with logging missing documentation. 2014-06-19 16:15:38 -04:00
Nick Winter
a58f3e0fb6 More styling work on code language selector. 2014-06-19 12:31:56 -07:00
Michael Schmatz
51923459e0 Changed autocomplete to on by default 2014-06-19 10:44:44 -07:00
Michael Schmatz
2559a73244 Merge pull request #1186 from dkundel/master 
Initial Autocomplete Version
 2014-06-19 10:10:26 -07:00
Michael Schmatz
a1b7025730 Emergency linkedin hot fix 2014-06-19 08:36:22 -07:00
Nick Winter
2e850dba78 Working on home language selection. 2014-06-19 08:06:34 -07:00
Philippe Rigovanov
ebaeac7e80 Some translations 2014-06-19 05:42:15 +04:00
Dominik Kundel
7e8845332e updated Ace minified 2014-06-18 23:27:05 +02:00
Dominik Kundel
69959b6b05 updated Ace 2014-06-18 23:18:58 +02:00
Michael Schmatz
548eaefae1 Add debug variable inspection progress bar 2014-06-18 13:43:04 -07:00
Dominik Kundel
33d68fab6e Merge remote-tracking branch 'upstream/master' 2014-06-18 21:50:55 +02:00
Nick Winter
ac6c7292c8 Fixed Gridmancer session linking on profile view. 2014-06-18 12:05:40 -07:00
Scott Erickson
50fea7e937 Added a method for returning all requests in mock-ajax. 2014-06-18 12:04:39 -04:00
Scott Erickson
d651885524 Maybe fixing the toggleModal system once and for all. 2014-06-18 12:04:38 -04:00
Dominik Kundel
d3e0299465 merge conflict solved 2014-06-18 17:59:26 +02:00
Dominik Kundel
f6355b034b integrated autocomplete 2014-06-18 17:57:42 +02:00
greyhusky
6fe9623244 Update de-CH.coffee 
Hoi zeme, i übersetze mega gern und wieni gseh ha isches no es reechts Stück wo z übersetze isch. Ha mol agfange, i hoff ihr findeds guet. :)
 2014-06-18 11:09:10 +02:00
Nick Winter
59654da24b Starting more work on integrating additional languages. Improved Component code editing performance with a trusty debounce. 2014-06-17 22:17:44 -07:00
Nick Winter
4bd02ba6dc ModelModal now grants real ultimate power. 2014-06-17 15:17:25 -07:00
djsmith85
2fff271200 Update de-DE.coffee 
Updated a few translations in the German locale file.
 2014-06-17 23:52:57 +02:00
djsmith85
5a90a7c880 Update de.coffee 
Updated a few translations in the German locale file and merged the translations from de-DE.coffee
 2014-06-17 23:52:54 +02:00
Nick Winter
0b8a0c8f6f Added UserRemarks. 2014-06-17 13:03:13 -07:00
Scott Erickson
3e24b2f86e Fixed tests running in karma. 2014-06-16 11:40:09 -07:00
Scott Erickson
d6bb7ffe81 Fixing tests. Somehow segmentio loading was making the jasmine test runner load properly in WebKit browsers. No idea why. 2014-06-16 11:40:09 -07:00