vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
4644 commits 1 branch 0 tags 587 MiB
Commit graph

60 commits

Author SHA1 Message Date
Rushabh Mehta
b5d86f9cdf merge 2014-02-10 17:53:11 +05:30
Rushabh Mehta
c9b02586fc fixes to website 2014-02-10 17:51:08 +05:30
Anand Doshi
38d89edbb7 Email Styling when Print Format is part of the body 2014-02-10 17:40:44 +05:30
Rushabh Mehta
0f8bc6ba4d added setup (wip) and ui fixes 2014-02-07 18:14:38 +05:30
Rushabh Mehta
8c7b175ab0 ui fixes 2014-02-07 13:11:54 +05:30
Rushabh Mehta
1e5eeb79bc added application selection pages and some fixes to toolbar 2014-02-06 18:35:15 +05:30
Anand Doshi
b23f836abd Merge branch 'website-hierarchy' into 4.0.0-wip 
Conflicts:
	webnotes/auth.py
	webnotes/handler.py
	webnotes/model/bean.py
	webnotes/webutils.py
 2014-02-06 14:00:57 +05:30
Rushabh Mehta
21c3eeb52a added splash for frappe: 2014-02-06 11:03:28 +05:30
Anand Doshi
1e6f58daf2 Website Group rendering (#421) 2014-02-03 20:23:14 +05:30
Nabin Hait
bb7fcc30a3 Fxed conflict 2014-01-31 17:01:20 +05:30
Rushabh Mehta
5514364c27 bugfix in bulk mail 2014-01-31 14:49:36 +05:30
Rushabh Mehta
70167f795b updated boostrap to 3.1 2014-01-31 13:10:09 +05:30
Nabin Hait
6154712b85 Merge branch 'develop' of github.com:webnotes/wnframework into 4.0.0-wip 
Conflicts:
	config.json
	webnotes/build.py
	webnotes/translate.py
 2014-01-30 13:03:17 +05:30
Rushabh Mehta
25db487617 minfor fixes 2014-01-29 15:27:42 +05:30
Rushabh Mehta
87db982cb9 bugfix in delete and clicking link in list will filter it 2014-01-28 11:34:56 +05:30
Rushabh Mehta
9ef68c4fc7 added new button in calendar views webnotes/erpnext#1288: 2014-01-28 11:34:56 +05:30
Rushabh Mehta
c5cd2082f2 Merge pull request #415 from akhileshdarjee/4.0-hotfix 
small change in doclistview
 2014-01-26 21:18:25 -08:00
Anand Doshi
56720e6b2e Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip 
Conflicts:
	config.json
	webnotes/widgets/query_report.py
 2014-01-24 21:47:49 +05:30
Akhilesh Darjee
7717232142 minor changes 2014-01-24 20:01:55 +05:30
Rushabh Mehta
145943569b more fixes to todo 2014-01-24 18:39:54 +05:30
Rushabh Mehta
f78fb6d410 ux fixes #1344, #1210, #1163, #1284 2014-01-24 15:25:39 +05:30
Akhilesh Darjee
895dd3e16c Merge branch '4.0.0-wip' of github.com:webnotes/wnframework into 4.0-hotfix 2014-01-24 11:15:38 +05:30
Akhilesh Darjee
155bba09f7 small change in doclistview 2014-01-24 11:14:00 +05:30
Rushabh Mehta
563e70727e redesigned additional permissions via hooks and implemented in Event: 2014-01-23 16:26:44 +05:30
Rushabh Mehta
adc5bbd0fa added new restricted permission to force explict users 2014-01-22 17:54:14 +05:30
Rushabh Mehta
51b14f8684 updated bootstrap 2014-01-22 12:44:01 +05:30
Rushabh Mehta
ce38c4ea98 webnotes/wnframework#193 2014-01-21 16:21:42 +05:30
Rushabh Mehta
36be63afe1 filters are not autocompletes webnotes/erpnext#1306 2014-01-21 15:41:02 +05:30
Rushabh Mehta
a8cc46fd9e grid, reportview fix webnotes/wnframework#293 webnotes/erpnext#1300 2014-01-21 12:41:00 +05:30
Rushabh Mehta
e2fe0a989b started separate delete permissions 2014-01-20 17:37:00 +05:30
Nabin Hait
af041d7713 Fixed conflict while merging with develop branch 2014-01-20 17:01:01 +05:30
Rushabh Mehta
7fa4ef9593 return appropriate HTTP error code (api) #377 2014-01-20 15:30:39 +05:30
Anand Doshi
359cc30d6c Updated timepicker addon 2014-01-16 15:52:06 +05:30
Rushabh Mehta
78f7ff3649 profile fixes and ctrl+s issue in firefox 2014-01-15 12:24:10 +05:30
Anand Doshi
1be5479fab Fixed scheduler, webnotes scheduler events and delete doc 2014-01-13 21:23:16 +05:30
Anand Doshi
5989274342 Shifted prettyDate from datetime to pretty_date.js 2014-01-09 20:26:21 +05:30
Rushabh Mehta
d331be5f71 throw status code 403 for not permitted queries 2014-01-09 15:44:35 +05:30
Rushabh Mehta
03229d7bdb moved pretty_date to separte file and now can build from different apps 2014-01-07 15:29:11 +05:30
Rushabh Mehta
f655c7ff74 Rearranged DocFields and other fixes to script manager 2014-01-02 11:46:31 +05:30
Rushabh Mehta
35c1f6e85f Added new handler system for clientside form events and cleanups to test_runner 2014-01-02 11:46:31 +05:30
Nabin Hait
1e83f9e329 Merge pull request #384 from nabinhait/4.0.0-wip 
4.0.0 wip
 2013-12-31 21:14:23 -08:00
Anand Doshi
8e44eefade Verify Command, Website and some minor fixes 2013-12-31 17:42:42 +05:30
Nabin Hait
15f0aa3740 Fixed conflict while merging with master 2013-12-31 16:14:42 +05:30
Rushabh Mehta
c75591b410 Customize Form, fields are not sortable via UI 2013-12-30 17:24:12 +05:30
Anand Doshi
e332a26191 Data Import Tool - fixed can export/import 2013-12-30 16:15:08 +05:30
Rushabh Mehta
44916d7f23 Added app creation boiler plate, cleaned up website settings 2013-12-27 17:33:24 +05:30
Anand Doshi
24f2445065 Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 
Conflicts:
	webnotes/__init__.py
	webnotes/core/doctype/docfield/docfield.txt
	webnotes/core/page/data_import_tool/data_import_tool.js
	webnotes/defaults.py
	webnotes/install_lib/install.py
	webnotes/model/bean.py
	webnotes/model/code.py
	webnotes/sessions.py
	webnotes/tests/test_nested_set.py
	webnotes/widgets/page.py
 2013-12-26 19:12:35 +05:30
Pratik Vyas
81ac6eb7d4 update paths in fontawesome css 2013-12-26 17:03:36 +05:30
Rushabh Mehta
cf71e3725a Merged with develop 2013-12-26 10:36:37 +05:30
Rushabh Mehta
c6f95b5bb7 Read Only field fix and cache fix 2013-12-26 10:29:13 +05:30