Commit graph

920 commits

Author SHA1 Message Date
Anand Doshi
ea77dd3a68 [fix] [minor] commit on web logout 2013-09-17 16:07:19 +05:30
Anand Doshi
ad5848d580 Merge branch 'master' of github.com:webnotes/wnframework into website-wip 2013-09-17 16:01:39 +05:30
Anand Doshi
0f5df7291e [fix] [minor] [website] 2013-09-17 15:28:58 +05:30
Anand Doshi
7e4e339512 [fix] [minor] [website] 2013-09-17 13:46:49 +05:30
Anand Doshi
ce28ccc657 Merge branch 'website-wip' of github.com:webnotes/wnframework into website-wip
Conflicts:
	core/doctype/profile/profile.py
	website/js/website.js
2013-09-16 19:34:28 +05:30
Anand Doshi
5f3fd5184d [fix] [minor] [website] 2013-09-16 19:28:06 +05:30
Rushabh Mehta
3eab31b9a9 [password] reset via link, added update page for portal user 2013-09-16 15:42:40 +05:30
Akhilesh Darjee
54f5269787 Merge branch 'master' of github.com:webnotes/wnframework 2013-09-13 17:38:15 +05:30
Rushabh Mehta
e831439d8b [minor] added ignore_links in data_import_tool 2013-09-13 15:29:21 +05:30
Rushabh Mehta
300848740c [minor] added ignore_links in data_import_tool 2013-09-13 15:20:20 +05:30
Rushabh Mehta
1b150683a6 merge 2013-09-13 13:16:45 +05:30
Rushabh Mehta
c4296eca23 minors 2013-09-13 13:02:48 +05:30
Anand Doshi
9e9e336224 Merge branch 'website-wip' of github.com:webnotes/wnframework into website-wip 2013-09-13 11:49:01 +05:30
Rushabh Mehta
4d55677114 [minor] [fix] [import] 2013-09-12 18:36:26 +05:30
Nabin Hait
9df394ca44 [fix] [minor] importing parent + children 2013-09-12 18:13:08 +05:30
Rushabh Mehta
f8f39958d8 [minor] check create permission separately 2013-09-12 17:09:17 +05:30
Anand Doshi
5d19c69e1c Merge branch 'master' of github.com:webnotes/wnframework into website-wip
Conflicts:
	core/page/data_import_tool/data_import_tool.py
2013-09-12 17:03:24 +05:30
Rushabh Mehta
f808bf4b42 Merge branch 'website-wip' of github.com:webnotes/wnframework into website-wip 2013-09-12 17:02:14 +05:30
Rushabh Mehta
467c36ef08 [minor] install fixes 2013-09-12 17:01:51 +05:30
Anand Doshi
37f1c27d4b [website] [minor] fixes after moving website module 2013-09-12 16:59:12 +05:30
Akhilesh Darjee
fe73e9ca04 Merge branch 'master' of github.com:webnotes/wnframework 2013-09-12 16:55:35 +05:30
Nabin Hait
ca54d30099 [fix] [minor] import parent + child data 2013-09-12 16:19:24 +05:30
Akhilesh Darjee
a4f273f75d [fix] [minor] company fetch from :Company 2013-09-12 14:00:27 +05:30
Anand Doshi
d9e075b2e4 [fix] [minor] reload test_module in test_runner 2013-09-12 11:53:54 +05:30
Anand Doshi
d3eebd5d0a [minor] [fix] [website] sitemap and rss 2013-09-12 11:52:27 +05:30
Rushabh Mehta
6501239a46 [minor] [install] added install fixtures 2013-09-11 19:36:46 +05:30
Rushabh Mehta
5302d1e8e8 [minor] [install] sync doctypes for app 2013-09-11 17:38:05 +05:30
Rushabh Mehta
940c52798c [minor] [merge] 2013-09-11 16:29:54 +05:30
Rushabh Mehta
224aa2442b [minor] changes to make new app friendly 2013-09-11 16:07:25 +05:30
Anand Doshi
1be588ca5f [website] [minor] moving to framework 2013-09-11 15:31:58 +05:30
Anand Doshi
21a63c41b7 Merge branch 'website-wip' of github.com:webnotes/wnframework into website-wip 2013-09-10 18:31:58 +05:30
Anand Doshi
5eed6ccbcc [website] [minor] moving to framework 2013-09-10 18:29:37 +05:30
Rushabh Mehta
652cc1e136 minor fixes 2013-09-10 17:56:05 +05:30
Rushabh Mehta
1560b1f3cd [website] [minor] moving to framework 2013-09-10 15:49:18 +05:30
Rushabh Mehta
9a117d4883 [finder] [minor] [fix] webnotes/erpnext#836 2013-09-10 15:35:09 +05:30
Rushabh Mehta
60fa2b3f3b [minor] webutils moved to lib 2013-09-10 14:39:37 +05:30
Rushabh Mehta
23b88a1815 [website] [minor] moving to framework 2013-09-10 12:51:52 +05:30
Rushabh Mehta
386cd883b3 [website] [minor] moving to framework 2013-09-10 12:18:57 +05:30
Rushabh Mehta
fb8c63b2bb [website] [minor] moving to framework 2013-09-09 17:31:18 +05:30
Rushabh Mehta
841bfc1c22 [website] [minor] moving to framework 2013-09-09 12:46:33 +05:30
Rushabh Mehta
7923f9de71 [website] [minor] moving to framework 2013-09-09 12:17:45 +05:30
Rushabh Mehta
eba431107b [notification] [minor] [fix] 2013-09-06 16:32:37 +05:30
Rushabh Mehta
7400665291 Merge branch 'master' of github.com:webnotes/wnframework 2013-09-06 16:25:48 +05:30
Rushabh Mehta
7da32bb438 [finder] New App for finding documents quickly. 2013-09-06 16:25:32 +05:30
Anand Doshi
f73ae8775f [fix] [minor] [receive] if no date in email, use current date 2013-09-06 15:48:08 +05:30
Rushabh Mehta
fcb73da022 Merge branch 'master' of github.com:webnotes/wnframework 2013-09-06 12:45:02 +05:30
Rushabh Mehta
f631ee015c [finder] [started] [wip] 2013-09-06 12:44:53 +05:30
Rushabh Mehta
67bacb735a [minor] moved developer mode to wn 2013-09-06 12:42:54 +05:30
Anand Doshi
27f29dac63 [fix] [minor] languages and scriptmanager trigger's callback 2013-09-05 21:10:24 +05:30
Rushabh Mehta
a66e0b09ed [lang] Added Greek (el) + cleanups relating to translate 2013-09-05 19:24:36 +05:30