pratu16x7
|
e112c71b86
|
allow for cloning other children
|
2017-06-27 14:05:41 +05:30 |
|
Makarand Bauskar
|
f04502632c
|
Merge pull request #3568 from frappe-pr-bot/translations-2017-06-27
[translation] translation update
|
2017-06-27 13:31:56 +05:30 |
|
rohitwaghchaure
|
c4e08a8e87
|
Merge pull request #3569 from rmehta/filter-ignore-validate
[minor] ignore link validation for reports
|
2017-06-27 13:23:00 +05:30 |
|
Rushabh Mehta
|
90d905c809
|
[minor] ignore link validation for reports
|
2017-06-27 13:06:54 +05:30 |
|
frappe-pr-bot
|
a6f053389e
|
[translation] translation updates
|
2017-06-27 08:34:50 +02:00 |
|
Makarand Bauskar
|
760ab551bb
|
Merge pull request #3547 from rmehta/fixes-for-gst
Permissions and other minor fixes for GST
|
2017-06-27 11:19:08 +05:30 |
|
Suyash Phadtare
|
17a43a4748
|
[Feature] Enable overriding Quick Entry in custom app (#3519)
* [Feature] Override Quick Entry Class in custom app
* [minor] remove var from if block
* [minor] Rename QuickEntryController to QuickEntryForm
* [fixes] indentation & syntax fixes
* [fix] indentation fix
|
2017-06-26 12:10:04 +05:30 |
|
Saurabh
|
1410bb4452
|
Merge branch 'develop'
|
2017-06-26 10:58:37 +05:30 |
|
Saurabh
|
f32f199586
|
bumped to version 8.1.2
|
2017-06-26 11:28:37 +06:00 |
|
Rushabh Mehta
|
ba2f800a8d
|
[fix] query report filters
|
2017-06-26 10:50:29 +05:30 |
|
Vishal Dhayagude
|
42100a15bc
|
[fix]syntax error on file list (#3559)
* [fix]syntax error on file list
* [fix]Linked with file bug
|
2017-06-25 10:58:27 +05:30 |
|
Sophat Vathana
|
7074d0cfe1
|
Update requirements.txt (#3522)
|
2017-06-23 18:01:25 +05:30 |
|
Prateeksha Singh
|
283f67d752
|
commonify parse_validate_and_set_in_modal, onchange in df (#3540)
|
2017-06-23 18:00:57 +05:30 |
|
Manas Solanki
|
64262dc635
|
error in the reports while downloading in the mobile app (#3551)
|
2017-06-23 17:53:42 +05:30 |
|
almeidapaulopt
|
615f135311
|
file list error + codacy (#3552)
|
2017-06-23 17:44:59 +05:30 |
|
Charles-Henri Decultot
|
ef3b892a5e
|
New avatar-xl css class (#3543)
|
2017-06-23 17:43:54 +05:30 |
|
Rushabh Mehta
|
834ee797ca
|
[wip] add inline images in frappe.sendmail (#3528)
|
2017-06-23 17:23:29 +05:30 |
|
Faris Ansari
|
fd082ea9f0
|
Fallback calendar color to blue (#3542)
|
2017-06-22 22:50:41 +05:30 |
|
Charles-Henri Decultot
|
fb85e91ed6
|
Bug in contact.js (#3546)
|
2017-06-22 22:50:16 +05:30 |
|
Rushabh Mehta
|
0c19319788
|
[minor] correct flag setting
|
2017-06-22 18:21:48 +05:30 |
|
Rushabh Mehta
|
6a725d6c95
|
[cleanups]
|
2017-06-22 18:21:48 +05:30 |
|
Rushabh Mehta
|
1c87ab5172
|
[fix] test_report.py
|
2017-06-22 18:21:48 +05:30 |
|
Rushabh Mehta
|
9435f93481
|
[minor] move todo report to correct module, desk
|
2017-06-22 18:21:48 +05:30 |
|
Rushabh Mehta
|
d12adda22f
|
[minor] move todo report to correct module, desk
|
2017-06-22 18:21:48 +05:30 |
|
Rushabh Mehta
|
e2d51c8589
|
[multiple] frappe.permissions.add_permission, cleanup address and contact html
|
2017-06-22 18:21:48 +05:30 |
|
Sagar Vora
|
3dbe747292
|
[ci] use deprecated trusty build for now (#3544)
|
2017-06-22 17:05:23 +05:30 |
|
mbauskar
|
69adb000b0
|
Merge branch 'develop'
|
2017-06-22 17:01:02 +05:30 |
|
mbauskar
|
35bb6566e9
|
bumped to version 8.1.1
|
2017-06-22 17:31:02 +06:00 |
|
Makarand Bauskar
|
d07d9a72dd
|
Merge pull request #3545 from mbauskar/dropbox
[minor] updated requirement for dropbox
|
2017-06-22 16:52:22 +05:30 |
|
mbauskar
|
49ac5cc9e5
|
[minor] updated requirement for dropbox
|
2017-06-22 16:14:25 +05:30 |
|
mbauskar
|
7a06746992
|
Merge branch 'develop'
|
2017-06-22 13:09:47 +05:30 |
|
mbauskar
|
9ace9205ed
|
bumped to version 8.1.0
|
2017-06-22 13:39:46 +06:00 |
|
mbauskar
|
d8ed23e854
|
Merge branch 'hotfix'
|
2017-06-22 10:57:21 +05:30 |
|
mbauskar
|
ed99879c2b
|
Merge branch 'master' into develop
|
2017-06-22 10:57:21 +05:30 |
|
mbauskar
|
00344848ec
|
bumped to version 8.0.71
|
2017-06-22 11:27:21 +06:00 |
|
Saurabh
|
9aeb393bf0
|
Merge pull request #3536 from mbauskar/password-strength-fixes
[hotfix] return {} if enable_password_policy and minimum_password_score is not set in System settings
|
2017-06-22 10:53:15 +05:30 |
|
Makarand Bauskar
|
b98ebddbac
|
Merge pull request #3535 from manassolanki/web-forms
Fix for success message and redirect url in webforms
|
2017-06-21 21:08:25 +05:30 |
|
mbauskar
|
162557cc31
|
[hotfix] return {} if enable_password_policy and minimum_password_score is not set in System settings
|
2017-06-21 19:53:07 +05:30 |
|
Makarand Bauskar
|
677ac31fe0
|
Merge pull request #3532 from mbauskar/develop
Merge branch 'britlog-welcome_email' into develop
|
2017-06-21 19:13:14 +05:30 |
|
Makarand Bauskar
|
7fbad251d2
|
Merge pull request #3518 from saurabh6790/dropbox_v2_updates_1_access_token
[Update] dropbox backup mechanism to support Dropbox's V2 api and generate access token via centralized redirect url
|
2017-06-21 19:11:28 +05:30 |
|
Manas Solanki
|
bb7cfda345
|
Success message and redirect url should also work for 'login require' types webforms
fixes https://github.com/frappe/erpnext/issues/9073
|
2017-06-21 18:37:52 +05:30 |
|
Makarand Bauskar
|
501c19b505
|
Merge pull request #3533 from sagarvora/frappe-docs
[docs] Changes in homepage and before.md
|
2017-06-21 18:15:55 +05:30 |
|
Sagar Vora
|
b919aa4b74
|
Organisation, adding more resources and language changes
|
2017-06-21 18:07:37 +05:30 |
|
mbauskar
|
a4293dbace
|
Merge branch 'britlog-welcome_email' into develop
|
2017-06-21 18:01:53 +05:30 |
|
mbauskar
|
87d5ee2650
|
[minor] get company name from get_site_info hook for welcome email
|
2017-06-21 17:50:35 +05:30 |
|
britlog
|
d5fecab620
|
Change welcome email subject and delete username regex
|
2017-06-21 17:50:35 +05:30 |
|
Makarand Bauskar
|
b9788a31c2
|
Merge pull request #3523 from netchampfaris/mobile-app-error
Fix mobile app error
|
2017-06-21 16:51:52 +05:30 |
|
Makarand Bauskar
|
921a37eaeb
|
Merge pull request #3525 from mbauskar/develop
merged hotfix branch to develop
|
2017-06-21 16:42:08 +05:30 |
|
Sagar Vora
|
dc51c4c439
|
minor spelling and grammar fixes
|
2017-06-21 15:39:46 +05:30 |
|
mbauskar
|
bd88d09040
|
resolved merge conflicts
|
2017-06-21 14:37:18 +05:30 |
|