Jacob 2b188f1a8d Merge branch 'master' into feature-custom-buffs ...

# Conflicts:
#	rpg-docs/client/views/character/inventory/itemDialog/itemDialog.html
#	rpg-docs/client/views/character/spells/spellDialog/spellDialog.html

2017-08-09 15:03:54 +01:00

..

.meteor

Merge branch 'testing_dg' into misc-enhancements

2017-07-18 19:56:26 +01:00

client

Merge branch 'master' into feature-custom-buffs

2017-08-09 15:03:54 +01:00

lib

Merge branch 'master' into feature-custom-buffs

2017-08-09 15:03:54 +01:00

Model

Merge branch 'master' into feature-custom-buffs

2017-08-09 15:03:54 +01:00

private/changeLogs

Bumped version

2017-03-09 08:40:21 +02:00

public

Fixed tooltip suffix icons and moved textarea icons outside of textarea

2017-07-21 11:02:02 +02:00

Routes

Stopped characters with poor names from having failed URL's

2017-07-13 17:16:23 +02:00

server

Added a schema/collection pair for CustomBuffs

2017-08-09 10:06:11 +01:00

tests/mocha/server

Implemented a javascript code style

2015-04-22 12:44:25 +02:00

.bowerrc

Implemented Features and Items granting effects, actions, attacks and spells

2015-01-06 12:25:58 +00:00

.gitignore

Moved back to differential:vulcanize for imports

2017-01-31 15:26:05 +02:00

bower.json

Added resolution for webcomponentsjs

2017-02-21 09:37:32 +02:00

config.vulcanize

Improved item library dialog UI

2017-05-04 14:19:47 +02:00

package.json

Finished implementing basic item library

2017-04-24 14:15:17 +02:00