Nabin Hait fe8db590a1 Fixed conflict while merging with develop

2014-01-30 12:32:47 +05:30

..

accounts

Fixed conflict while merging with develop

2014-01-30 12:32:47 +05:30

buying

Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip

2014-01-24 21:44:36 +05:30

controllers

Fix in testcases

2014-01-23 16:45:22 +05:30

home

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

2013-12-26 19:12:51 +05:30

hr

merge conflict fixed

2014-01-27 15:42:02 +05:30

manufacturing

BugFix: Production Planning Tool - get_raw_materials

2014-01-24 21:47:01 +05:30

patches

Fixed conflict while merging with develop

2014-01-30 12:32:47 +05:30

projects

added title_fields for Task, Newsletter

2014-01-24 15:33:42 +05:30

public

Fixed conflict while merging with develop

2014-01-30 12:32:47 +05:30

selling

Fixed conflict while merging with develop

2014-01-30 12:32:47 +05:30

setup

merge conflict fixed

2014-01-27 15:42:02 +05:30

startup

Fixed conflict while merging with develop brnach

2014-01-20 16:48:49 +05:30

stock

Fixed conflict while merging with develop

2014-01-30 12:32:47 +05:30

support

merge conflict fixed

2014-01-27 15:42:02 +05:30

templates

Moved Portal and Shopping Cart to Shopping Cart app, and some minor fixes

2013-12-31 17:38:21 +05:30

translations

fixed languages, moved framework strings to framework

2013-12-26 14:44:08 +05:30

utilities

Fixed conflict while merging with develop

2014-01-30 12:32:47 +05:30

__init__.py

added setup.py

2013-12-11 11:32:21 +05:30

desktop.json

Added Applications page and fixed issues in translations and hooks

2013-12-23 16:09:00 +05:30

hooks.txt

Auto closing of tickets through schedulers

2014-01-20 17:46:37 +05:30

modules.txt

step 0: install

2013-12-11 15:32:14 +05:30

patches.txt

merge conflict fixed

2014-01-27 15:42:02 +05:30