Commit graph

14692 commits

Author SHA1 Message Date
mbauskar
0e1825992c Merge branch 'master' into develop 2017-09-06 19:26:32 +05:30
mbauskar
518d9f742e Merge branch 'master' into hotfix 2017-09-06 19:26:32 +05:30
mbauskar
3d1027a79d Merge branch 'staging' 2017-09-06 19:26:31 +05:30
mbauskar
1c7e3a57ae bumped to version 8.10.1 2017-09-06 19:56:31 +06:00
Makarand Bauskar
41f03cd303 [hotfix] don't add trigger if the autoname field and fieldname is not same (#4074) 2017-09-06 19:25:30 +05:30
Makarand Bauskar
22036c363e Revert "[hotfix] don't add trigger if the autoname field and fieldname is not same (#4072)" (#4073)
This reverts commit a722b64eb1.
2017-09-06 19:04:05 +05:30
Makarand Bauskar
a722b64eb1 [hotfix] don't add trigger if the autoname field and fieldname is not same (#4072) 2017-09-06 18:57:47 +05:30
Revant Nandgaonkar
eae7257621 Merge branch 'develop' of frappe/frappe into FrappeOAuth2Client 2017-09-06 18:46:11 +05:30
Revant Nandgaonkar
eae44d1923 [Fix] Codacy Issue
https://www.codacy.com/app/frappe/frappe/pullRequest?prid=889323#new-file-issues-9785172778
2017-09-06 18:45:23 +05:30
Revant Nandgaonkar
b4d1ad2d9a [Fix] TestFrappeOAuth2Client 2017-09-06 18:34:07 +05:30
Rushabh Mehta
4bd7f409de Merge pull request #3975 from pratu16x7/document-get-doc-before-save
[minor] `_doc_before_save` wrapper
2017-09-06 18:20:26 +05:30
Makarand Bauskar
6e6fb684ec [hotfix] dont Patch Log, Module Def in Permission Manager (#4070) 2017-09-06 16:15:37 +05:30
Rushabh Mehta
2a5a6d6adc Merge pull request #4067 from gshmu/master
default value can't be true
2017-09-06 15:03:53 +05:30
Rushabh Mehta
9fa512e26f Update upload.js 2017-09-06 15:03:35 +05:30
Rushabh Mehta
98561b4f1b Update upload.js 2017-09-06 15:02:17 +05:30
Rushabh Mehta
b5a4c34131 Merge pull request #4069 from pratu16x7/setup-fixes
[fix] remove reload after setup
2017-09-06 14:59:54 +05:30
Revant Nandgaonkar
e8fc75b46b Test for FrappeOAuth2Client 2017-09-06 14:10:34 +05:30
Revant Nandgaonkar
6c2cce364d Merge branch 'develop' of frappe/frappe into FrappeOAuth2Client 2017-09-06 13:50:10 +05:30
pratu16x7
35c09a7688 [fix] styles 2017-09-06 12:33:17 +05:30
Faris Ansari
3df0659c87 [Print Format] Align labels to right (#4068) 2017-09-06 12:17:48 +05:30
pratu16x7
c87710f25b [fix] remove reload after setup 2017-09-06 12:06:32 +05:30
gshmu
aa6f9b1b24 default can't be true
after set `opts.is_private` false, is private still true.
2017-09-06 13:59:19 +08:00
Rushabh Mehta
3d855790ed Merge pull request #4033 from StrellaGroup/develop
[minor] Allow Mapped Doc without Source Document
2017-09-06 10:48:53 +05:30
Rushabh Mehta
31acf0df42 Update create_new.js 2017-09-06 10:48:44 +05:30
Rushabh Mehta
683bafef6b Merge pull request #4053 from rmehta/contact-us-settings
Contact Us Settings
2017-09-06 10:47:19 +05:30
Rushabh Mehta
44a7db75ca Merge pull request #4056 from mbauskar/boilerplate
[minor] create the test_doctype_name.py for single doctype
2017-09-06 10:46:59 +05:30
Rushabh Mehta
df3fbd082a Merge pull request #4057 from netchampfaris/file-thumbnail-crop
Add crop option to make_thumbnail
2017-09-06 10:46:34 +05:30
Rushabh Mehta
b8b4dd70d0 Merge pull request #4062 from netchampfaris/print-format
[Print Format] Align labels to right
2017-09-06 10:43:54 +05:30
Rushabh Mehta
9f1caa100e Merge pull request #4063 from achillesrasquinha/develop
Fixed Image URL render to container
2017-09-06 10:43:20 +05:30
Rushabh Mehta
2251d32e5d Merge pull request #4061 from pratu16x7/setup-fixes
[setup] fix keyboard nav
2017-09-06 10:41:25 +05:30
Rushabh Mehta
3861346035 Merge pull request #4060 from netchampfaris/kanban-color
Colors in Kanban and Gantt
2017-09-06 10:40:50 +05:30
mbauskar
8334d0ed1e Merge branch 'master' into develop 2017-09-05 20:42:01 +05:30
mbauskar
43f4485c54 Merge branch 'staging' 2017-09-05 20:42:01 +05:30
mbauskar
d4449c37d6 bumped to version 8.10.0 2017-09-05 21:12:00 +06:00
Achilles Rasquinha
4bef424292 fixed codacy lint 2017-09-05 15:08:07 +05:30
Achilles Rasquinha
833f235869 removed comments 2017-09-05 14:20:12 +05:30
Achilles Rasquinha
47ab1c1b03 [SETUP] Fixed file_url fetch for profile image 2017-09-05 14:18:38 +05:30
Faris Ansari
61b4dc3147 [Print Format] Align labels to right 2017-09-05 14:04:39 +05:30
Faris Ansari
02ab668c74 Add colors in Gantt view 2017-09-05 13:55:26 +05:30
pratu16x7
11709b31ec [setup] keyboard nav 2017-09-05 13:31:04 +05:30
Faris Ansari
857411f1f6 Don't show color field column in List View 2017-09-05 13:23:46 +05:30
Faris Ansari
d152beeb11 Show color in kanban card 2017-09-05 13:18:50 +05:30
Faris Ansari
84a3b7035f Add color field to ToDo 2017-09-05 13:18:35 +05:30
Rushabh Mehta
46eee356ff Merge pull request #4058 from pratu16x7/setup-fixes
[setup] suppress post-setup messages
2017-09-05 12:20:50 +05:30
pratu16x7
276f5b5631 [setup] suppress post-setup messages 2017-09-05 12:15:43 +05:30
Faris Ansari
bb981536dc Add crop option to make_thumbnail 2017-09-05 12:12:20 +05:30
Rushabh Mehta
5338f5c95d [minor] list 2017-09-05 12:09:42 +05:30
mbauskar
046a294ef9 [minor] create the test_doctype_name.py for single doctype 2017-09-05 11:03:44 +05:30
Rushabh Mehta
a3ff228dfd Merge pull request #4054 from rmehta/fix-switch-to-desk
[fix] [translation] switch to desk, #3328
2017-09-05 08:56:17 +05:30
Rushabh Mehta
f8415af434 Merge pull request #4052 from rmehta/remove-unload
remove unload
2017-09-05 08:55:49 +05:30