Commit graph

943 commits

Author SHA1 Message Date
Anand Doshi
8fad8f7aa8 [minor] mandatory error msg fix 2013-09-26 11:20:55 +05:30
Anand Doshi
ef6f1aafa6 [minor] [fix] hide no_cache pages in sitemap 2013-09-25 14:30:59 +05:30
Anand Doshi
510e2ead43 Merge branch 'master' of github.com:webnotes/wnframework 2013-09-25 13:07:59 +05:30
Anand Doshi
5d0f4bb910 [minor] [fix] exclude + from page_name, encode page_name in sitemap 2013-09-25 13:07:06 +05:30
Nabin Hait
697aa9af2d Merge branch 'perpetual' 2013-09-24 14:20:20 +05:30
Anand Doshi
c30a604ec7 [fix] [minor] clear website sitemap when deleting page cache 2013-09-23 12:44:06 +05:30
Anand Doshi
fabf6798d0 [fix] [minor] [file manager] pass utf-8 encoded strings to os.remove and os.path.exists 2013-09-20 11:44:20 +05:30
Anand Doshi
f1076d98a8 [fix] [minor] cint idx in prepare_for_save 2013-09-20 11:08:32 +05:30
Anand Doshi
278fc05cb9 [fix] [minor] [website] 2013-09-19 14:42:56 +05:30
Anand Doshi
2e9f7a43cb [fix] [minor] [website] 2013-09-19 14:31:45 +05:30
Anand Doshi
8b214c3cea [fix] [minor] [website] 2013-09-19 14:30:38 +05:30
Anand Doshi
9745b9785a [fix] [minor] [website] 2013-09-19 14:27:38 +05:30
Anand Doshi
df581ee060 [fix] [minor] [website] 2013-09-19 14:16:34 +05:30
Nabin Hait
20cc5a7372 Merge branch 'master' into perpetual 2013-09-18 15:22:02 +05:30
Anand Doshi
0f1ed64b60 [minor] removed webclient.py 2013-09-17 17:35:33 +05:30
Anand Doshi
60c8c79a25 [fix] [minor] get_url and fixes due to addition of create permission check 2013-09-17 16:51:40 +05:30
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
Nabin Hait
3f21b3ad23 Merge branch 'master' into perpetual 2013-09-17 10:23:29 +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