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

12790 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Faris Ansari
e841219d0a Fix mobile app error 
frappe/erpnext#9406
 2017-06-21 14:26:48 +05:30
mbauskar
023d55e3ae Merge branch 'hotfix' 2017-06-21 13:22:46 +05:30
mbauskar
61aa008182 bumped to version 8.0.70 2017-06-21 13:52:46 +06:00
Makarand Bauskar
7b4e390fd4 Merge pull request #3510 from netchampfaris/thumbnail 
Maintain aspect ratio in thumbnail
 2017-06-21 12:08:18 +05:30
Makarand Bauskar
79a6adf73e Merge pull request #3521 from frappe/bcornwellmott-patch-1 
Make upload files private by default
 2017-06-21 11:29:42 +05:30
Makarand Bauskar
214e9a194a Merge pull request #3515 from manassolanki/profit-loss-report 
Add the empty row in the excel report, fixes #9377
 2017-06-21 11:08:13 +05:30
bcornwellmott
264af6ad3d Make upload files private by default 
This unchecks the private box when uploading files by default. It's better to accidentally attach as private something that is meant to be public than to accidentally attach something as public which is meant to be private.
 2017-06-20 10:35:19 -07:00
Makarand Bauskar
5068fb7c3a Merge pull request #3517 from mbauskar/password-strength-fixes 
[fixes] fixed password strength, ignore password strength if password policy is disabled
 2017-06-20 21:42:16 +05:30
Makarand Bauskar
ffe53b0cd1 Merge pull request #3520 from saurabh6790/timeout_fix 
[fix] set queue timeout explicitly while enqueuing a job
 2017-06-20 20:06:26 +05:30
Saurabh
2510e4509a [fix] set queue timeout explicitly while enqueuing a job 2017-06-20 20:01:00 +05:30
Makarand Bauskar
de181b82d1 Merge pull request #3514 from rohitwaghchaure/auto_email_report_error 
[fix] Auto email report not working
 2017-06-20 19:02:39 +05:30
Makarand Bauskar
acba96bf2a minor fixes in auto email report 2017-06-20 19:02:10 +05:30
Saurabh
ee13f1bc93 [fix] bypass setup_dropbox page via rest api 2017-06-20 18:39:47 +05:30
Saurabh
ec16d11ae6 generate oauth2 access token from oauth1 access token 2017-06-20 18:39:47 +05:30
Saurabh
0c6b1c4481 [fix] fixes to oauth 2 token generation for frappe cloud users 2017-06-20 18:39:47 +05:30
Saurabh
eb2611dd83 [enhance] update dropbox backup to be compatible with Dropbox V2 api 2017-06-20 18:39:46 +05:30
Rushabh Mehta
0879ecf326 [minor] in create_custom_field, if you set "append" to insert_after, it till append to the last field 2017-06-20 18:29:42 +05:30
mbauskar
0d1ae7aac8 [fixes] fixed password strength, ignore password strength if password policy is disabled 2017-06-20 18:21:48 +05:30
Rushabh Mehta
2c2368de7b [fix] report view filters 2017-06-20 16:19:31 +05:30
Manas Solanki
2e81ebee5b Add the empty row in the excel report in order to preserve the visible row no, fixes #9377 2017-06-20 16:14:23 +05:30
Makarand Bauskar
a2e3356db3 Merge pull request #3513 from frappe-pr-bot/translations-2017-06-20 
[translation] translation update
 2017-06-20 15:59:53 +05:30
Rohit Waghchaure
99d39ea0a9 [fix] Auto email report not working 2017-06-20 15:00:15 +05:30
frappe-pr-bot
0173e4ef9d [translation] translation updates 2017-06-20 11:22:30 +02:00
Rushabh Mehta
0dbb26d6f7 [minor] ignore test_link_count in travis 2017-06-20 14:21:37 +05:30
Rushabh Mehta
ecadb8ab23 [fix] test_document.py 2017-06-20 13:14:18 +05:30
Faris Ansari
ef478ee883 Maintain aspect ratio in thumbnail 2017-06-20 13:07:43 +05:30
Rushabh Mehta
375236339a [fix] test_document.py 2017-06-20 12:58:40 +05:30
Rushabh Mehta
45cbb7facc [minor] cleanups and optimization fixes 2017-06-20 12:46:43 +05:30
Faris Ansari
03e5dd2eb6 Handle large duration tasks (#3509) 
frappe/erpnext#8724
 2017-06-20 09:23:35 +05:30
Dhaifallah Alwadani
e1deea0bcc Make reports LTR for RTL theme (#3506) 2017-06-20 09:23:23 +05:30
rohitwaghchaure
7637837d68 Invalid comparisison of password strenth score with minimum password score (#3503) 2017-06-19 18:01:07 +05:30
tundebabzy
323e70db33 New Document in search bar is case sensitive (#3504) 
* makes `get_creatables` change keywords to lowercase before comparison

* fixed codacy issues

* Update search_utils.js
 2017-06-19 18:00:28 +05:30
Faris Ansari
a9cf952505 UI Tests for Frappe (#3500) 
* init nightwatch.js

* add nightwatch to travis

typo

nightwatch fix

kill node

launch_url

run tests on local selenium

manually run sc

sc in bg with sleep

minor

minor

run test on chromedriver

simplify travis

minor

add chrome package

implicit chromedriver

nightwatch.global.js

path fix

console statement

enable screenshot

send screenshot to telegram

path

minor

remove chromium

add binary

screenshot

url

cleanup

increase timout

minor

minor

minor

* login test

add page_objects in config

Fix login test

* bench run-ui-tests

* update package.json

* update travis

* bench reinstall before running ui tests
 2017-06-19 17:58:45 +05:30
Rushabh Mehta
5e581a1b69 [fix] grid.js and control.js. cleanup datepicker formatting and parsing 2017-06-19 15:10:59 +05:30
Rushabh Mehta
19736308b6 [minor] fix meta.py 2017-06-19 12:24:27 +05:30
Revant Nandgaonkar
b06f987e55 Download files using REST API and OAuth 2 Token (#3499) 
* Download files using REST API and OAuth 2 Token

* Check permissions before file download via API

* Solves Codacy issues

https://www.codacy.com/app/netchampfaris/frappe/file/7377221800/issues/source?bid=4679759&fileBranchId=4768213#l364
 2017-06-19 09:11:31 +05:30
tundebabzy
bbde2ec4cf rewrite use of dict.iteritems (#3498) 
* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility
 2017-06-19 09:10:21 +05:30