+23 −0

models_Folder.js

CliClient/tests/models_Folder.js

+38 −0

models_Tag.js

CliClient/tests/models_Tag.js

+8 −0

app.js

ElectronClient/app/app.js

+14 −4

SideBar.jsx

ElectronClient/app/gui/SideBar.jsx

+5 −1

BaseApplication.js

ReactNativeClient/lib/BaseApplication.js

+5 −1

reduxSharedMiddleware.js

...lient/lib/components/shared/reduxSharedMiddleware.js

+4 −0

folders-screen-utils.js

ReactNativeClient/lib/folders-screen-utils.js

+11 −1

joplin-database.js

ReactNativeClient/lib/joplin-database.js

+22 −0

Folder.js

ReactNativeClient/lib/models/Folder.js

+1 −0

Setting.js

ReactNativeClient/lib/models/Setting.js

+8 −7

Tag.js

ReactNativeClient/lib/models/Tag.js