Commit graph

10862 commits

Author SHA1 Message Date
Nabin Hait
1c617ad93c Merge pull request #2119 from netchampfaris/gantt
[gantt] fixes
2016-09-29 13:37:26 +05:30
Nabin Hait
1a8b31db6b Merge pull request #2120 from shreyasp/site-install-locks
[Fix] Prevent site creation failure in case installing.lock is not found
2016-09-29 13:35:53 +05:30
Nabin Hait
74dbeab1a7 Merge pull request #2121 from gaurav-naik/patch-1
Allow control over loading scripts in base.
2016-09-29 13:35:32 +05:30
gaurav-naik
7e57005894 Allow control over loading scripts in base.
Some control over how base scripts are loaded would be helpful. Faced issue while integrating summernote within web page.
https://github.com/summernote/summernote/issues/138

For now, we have overridden base.html in custom app.
2016-09-29 13:21:06 +05:30
Rushabh Mehta
04aaa92a75 [web-forms] style fixes 2016-09-29 12:53:40 +05:30
Rushabh Mehta
f1dd0c0bb8 [fix] web forms remove attachment 2016-09-29 12:38:46 +05:30
shreyas
5a7eb23190 [Fix] Prevent site creation failure in case installing.lock is not found 2016-09-29 12:06:42 +05:30
Faris Ansari
069e335daf [gantt] fix bar width 2016-09-29 11:47:31 +05:30
Rushabh Mehta
e091005b00 [logger] fix tests 2016-09-29 11:44:07 +05:30
Rushabh Mehta
527115ce07 [logger] log in logs/frappe.log 2016-09-29 11:40:00 +05:30
Nabin Hait
affa40db83 Merge pull request #2118 from neilLasrado/develop
Fix - add role to roles table if mentioned in hooks portal menu items
2016-09-29 11:37:52 +05:30
Neil Trini Lasrado
79a101df78 Fix - add role to roles table if mentioned in hooks portal menu items 2016-09-29 11:35:54 +05:30
Rushabh Mehta
ce88a60153 [logger] log in logs/frappe.log 2016-09-29 11:30:29 +05:30
Faris Ansari
fb1d5b3e63 [gantt] removed old ganttview.js 2016-09-29 11:07:17 +05:30
nick9822
ff5c38054c Update command for Reinstall with fresh database 2016-09-28 19:11:36 +05:30
Rushabh Mehta
5c110bd48f [fix] date parsing and formatting in web form 2016-09-28 18:19:19 +05:30
RobertSchouten
5806686186 [feature] print only what is expanded in reports extended for pdf's (#2106) 2016-09-28 17:07:07 +05:30
Nabin Hait
6c61d70854 Merge pull request #2094 from KanchanChauhan/custom-field-on-top
Custom field can be on top
2016-09-28 17:03:06 +05:30
Nabin Hait
11cafb5b93 Merge pull request #2103 from paurosello/gantt-build
Fix build error - Gantt
2016-09-28 17:02:30 +05:30
Nabin Hait
0ce97f11de Merge pull request #2107 from netchampfaris/gantt
[gantt] fix invalid date on Event
2016-09-28 17:00:00 +05:30
Nabin Hait
af86b15547 Merge pull request #2110 from douglasPinheiro/fix_sintax_error_on_docs
fix error
2016-09-28 16:59:31 +05:30
Nabin Hait
386fb02573 Merge pull request #2111 from mbauskar/develop
[minor] validated field name in autoname
2016-09-28 16:59:09 +05:30
Nabin Hait
e105a19a4d Merge pull request #2115 from netchampfaris/ui-fixes
[ui][fix] text editor field in child table
2016-09-28 16:57:43 +05:30
Nabin Hait
368f47ba70 Test case fixed 2016-09-28 16:55:11 +05:30
Faris Ansari
10657de10e [gantt] fix invalid date on Event 2016-09-28 16:07:27 +05:30
Rushabh Mehta
8176799873 [minor] add calendar, gantt views in awesome bar fixes frappe/erpnext#4479 2016-09-28 16:00:17 +05:30
Rushabh Mehta
bfa938ff17 [web-forms] mandatory fields must updated before payment, customize list for webform and other fixes 2016-09-28 15:08:10 +05:30
Faris Ansari
7b7740c4bf [ui][fix] text editor field in child table 2016-09-28 14:17:35 +05:30
Nabin Hait
ad219646c6 Merge pull request #2114 from netchampfaris/hotfix
fix pdf print format
2016-09-28 13:28:19 +05:30
Faris Ansari
67fbcfcac5 [fix] pdf print format 2016-09-28 13:23:16 +05:30
mbauskar
660012c55d [minor] validated field name in autoname 2016-09-28 12:46:34 +05:30
Nabin Hait
d97d13dc22 Fixed version conflict 2016-09-28 10:48:58 +05:30
Nabin Hait
a218f5d299 Merge branch 'hotfix' 2016-09-28 10:48:33 +05:30
Nabin Hait
ca70d0def0 bumped to version 7.0.36 2016-09-28 11:18:33 +06:00
root
254b418879 fix error 2016-09-27 23:42:07 -03:00
PAu
2d63228e87 fix build error 2016-09-26 18:58:30 +02:00
Douglas da Costa Pinheiro
aaf610647d fix sintax error (#2101) 2016-09-26 18:18:58 +05:30
KanchanChauhan
983796fbd4 Select only mandatory childtable fields on Select Mandatory (#2092) 2016-09-26 18:16:50 +05:30
Faris Ansari
f69fc526c6 notification fix and date selectable (frappe/erpnext#6423) (frappe/erpnext#6389) (#2088)
* [ui][fix] disable notification when 0

* [enhance] other month dates selectable
2016-09-26 18:16:12 +05:30
Makarand Bauskar
dc30e57b60 [minor] removed the desktop_backgroud from frappe hooks (#2085) 2016-09-26 18:15:47 +05:30
Shreyas Patil
0770b2a224 [Minor] Allow user to change files private to public and vice-versa (#2079)
* [Minor] Allow user to change files private to public and vice-versa

* [Fix] Using db_get instead of get_doc
2016-09-26 18:15:26 +05:30
Faris Ansari
1ee9ee886e Gantt #1932 (#2073)
* [wip] added frappe/gantt

* frappe/gantt

[gantt] added view modes

[gantt] added vertical grid, view modes fixed

[gantt] fix bar_onclick

[gantt] fix view_mode rendering

[gantt] drag, resize gantt bar

[gantt] fixed month view

[gantt] separate styling

[gantt] save on datechange, progress field added

[gantt] fixed drag to snap on week/month
2016-09-26 18:15:09 +05:30
Saurabh
1b71e34ae4 [fix] toolbar fix (#2102) 2016-09-26 18:13:37 +05:30
Rushabh Mehta
7f77139774 [fix] minor date-format 2016-09-26 17:56:38 +05:30
Rushabh Mehta
cd7b7ae35b [portal] enhancement to web form, introduced int, custom menu in portal settings etc 2016-09-26 17:03:55 +05:30
Rushabh Mehta
74bc80d982 [fix] pass_does_not_exist_error 2016-09-26 11:15:45 +05:30
Rushabh Mehta
515d952e16 [fix] signup 2016-09-24 17:50:09 +05:30
Rushabh Mehta
c285d3bb65 [fix] signup 2016-09-24 17:49:03 +05:30
Rushabh Mehta
b82808c51f [fix] web form 2016-09-24 17:45:06 +05:30
Rushabh Mehta
c9d1dc3590 [web forms] handle mandatory optional and other fixes 2016-09-24 17:33:23 +05:30