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

13152 commits

This branch
This branch
All branches
Author SHA1 Message Date
mbauskar
52182a27f3 Merge branch 'hotfix' 2017-08-04 11:02:07 +05:30
mbauskar
edfed87e75 bumped to version 8.6.7 2017-08-04 11:32:07 +06:00
rohitwaghchaure
5925aada69 Added order by in_create for dynamic link query (#3849) 2017-08-04 10:55:38 +05:30
Nabin Hait
b524d892f7 Add where clause only if conditions exists (#3853) 2017-08-03 17:02:47 +05:30
Faris Ansari
76a12ca5b6 Handle error when _user_tags column is added on the fly (#3854) 2017-08-03 17:02:30 +05:30
mbauskar
286c92aef0 Merge branch 'staging' 2017-08-02 18:28:21 +05:30
mbauskar
aa8eabaa7e bumped to version 8.6.6 2017-08-02 18:58:20 +06:00
mbauskar
f646af1c33 resolved merge conflicts 2017-08-02 18:12:49 +05:30
mbauskar
01b75bf1c1 Merge branch 'hotfix' 2017-08-02 18:08:03 +05:30
mbauskar
3f854301e4 bumped to version 8.6.5 2017-08-02 18:38:03 +06:00
Rushabh Mehta
eb2c725dba [fix] stop action if trigger fails for validate and before_, fixes frappe/erpnext#10200 (#3842) 
* [fix] stop action if trigger fails for validate and before_, fixes frappe/erpnext#10200

* [fix] stop action if trigger fails for validate and before_, fixes frappe/erpnext#10200

* [fix] codacy

* [fix] add test to tests.txt
 2017-08-02 17:53:28 +05:30
bcornwellmott
1f46637cc2 Fix workflow override (#3824) 2017-08-02 16:56:56 +05:30
Makarand Bauskar
fc715efdbb [hotfix] fixes for AttributeError: 'NoneType' object has no attribute 'split' (#3840) 
* [hotfix] fixes for AttributeError: 'NoneType' object has no attribute 'split'

* [tests] added test cases for not in and in filters
 2017-08-02 12:47:10 +05:30
Makarand Bauskar
ecaf4f6cd1 merged hotfix branch into staging (#3821) 
* [hotfix] Linked with and List item click (#3803)

* [hotfix] Linked with and List item click

* Run a single test using Test Runner

* Add test for Linked With

* [minor] List view fixes

* bumped to version 8.6.3

* [Fix] Getting an error datetime.datetime is not iterable during importing purchase invoice data (#3818)

* Update quick_entry.js (#3815)

Fix typo

* bumped to version 8.6.4
 2017-08-01 11:05:22 +05:30
mbauskar
0e92ffc108 Merge branch 'hotfix' 2017-07-31 12:20:09 +05:30
mbauskar
99317b2f65 bumped to version 8.6.4 2017-07-31 12:50:09 +06:00
ci2014
c4292ac6a4 Update quick_entry.js (#3815) 
Fix typo
 2017-07-31 10:27:00 +05:30
rohitwaghchaure
4396cbd0cc [Fix] Getting an error datetime.datetime is not iterable during importing purchase invoice data (#3818) 2017-07-31 10:15:06 +05:30
mbauskar
e377e420a5 Merge branch 'hotfix' 2017-07-28 16:04:43 +05:30
mbauskar
04aa13fc9b bumped to version 8.6.3 2017-07-28 16:34:43 +06:00
Faris Ansari
67277507f0 [hotfix] Linked with and List item click (#3803) 
* [hotfix] Linked with and List item click

* Run a single test using Test Runner

* Add test for Linked With

* [minor] List view fixes
 2017-07-28 14:30:18 +05:30
Saurabh
0b2ad25420 Merge branch 'master' into staging 2017-07-27 17:59:19 +05:30
Saurabh
a7fd1691f8 Merge branch 'hotfix' 2017-07-27 17:59:18 +05:30
Saurabh
2389f46411 bumped to version 8.6.2 2017-07-27 18:29:18 +06:00
Rushabh Mehta
a0aa9a2079 [fix] callback for ajax (#3802) 
* [fix] callback for ajax

* [fix] ajaxSend instead of ajaxStart
 2017-07-27 17:49:01 +05:30
mbauskar
3c0e8b2ed3 Merge branch 'hotfix' 2017-07-27 12:17:21 +05:30
mbauskar
ac3e361ecf bumped to version 8.6.1 2017-07-27 12:47:20 +06:00
Makarand Bauskar
22475a046c [hotfix] encode the email message to utf8 before sending mail (#3785) 
* [hotfix] encode the email message to utf8 before sending mail

* [minor] review fixes
 2017-07-27 12:14:37 +05:30
Nabin Hait
ff248fd4fa Pass if unable to handle failed ajax response (#3797) 2017-07-27 11:21:15 +05:30
mbauskar
29c4622fa0 Merge branch 'develop' into staging 2017-07-26 18:00:00 +05:30
Prateeksha Singh
d94d992337 [fix][img-control] detach wrapper after inserting (#3794) 2017-07-26 17:50:49 +05:30
omkarghaisas
fad9c91cfe Added mobile number in edit user profile web form (#3766) 
updated mobile number is required to login using mobile number
 2017-07-26 11:52:21 +05:30
Prateeksha Singh
c2f18dd9e4 [fix] detach instead of emptying parent (#3783) 2017-07-26 11:50:22 +05:30
Saurabh
9174b245d8 Merge branch 'staging' 2017-07-25 16:39:57 +05:30
Saurabh
9b4d8ad8a8 Merge branch 'master' into develop 2017-07-25 16:39:57 +05:30
Saurabh
f26695cdba bumped to version 8.6.0 2017-07-25 17:09:56 +06:00
Saurabh
8eba852a13 Merge branch 'hotfix' 2017-07-25 15:58:28 +05:30
Saurabh
ae8d26760b Merge branch 'master' into develop 2017-07-25 15:58:28 +05:30
Saurabh
7429ad573f Merge branch 'master' into staging 2017-07-25 15:58:28 +05:30
Saurabh
2b48e5206a bumped to version 8.5.8 2017-07-25 16:28:28 +06:00
Manas Solanki
68c09b9a75 [hot] fix in the data import (#3780) 
* convert numbers to basestring for link field

* fix for link and dynamic link only
 2017-07-25 14:20:48 +05:30
Utkarsh Yadav
877f8e2a23 [UI Test] Kanban view (#3777) 
* added changes and one test for column

* changes in tests for new test runner

* codacy fixes
 2017-07-25 12:05:18 +05:30
Faris Ansari
1fde846272 Form Timeline styling (#3778) 
* Left align Indicator and corrected “Add to Knowledge Base” button misalignment.

* Left align Indicator and corrected “Add to Knowledge Base” button misalignment.

* Pushing title changes only, reverted timeline changes.

* Pushing title changes only, reverted timeline changes.

* Timelime tilte design update for small resolution.

* Review changes and added minified date

* Review changes for Timeline for smaller screen.

* Changes for tilte, delete icon change and removed duplicate date.

* Review changes

* Fixed Alignment for action buttons.

* Small resolution alignment changes.

* Class name changes.

* Timelime tilte design update for small resolution.

* Changes for tilte, delete icon change and removed duplicate date.
 2017-07-25 11:55:29 +05:30
Manas Solanki
6d35855a7b Fix for dropbox settings (#3749) 2017-07-25 11:25:28 +05:30
Frappe PR Bot
cbd257f0ba [Translation] Updated Translations (#3769) 2017-07-25 11:19:46 +05:30
bcornwellmott
23d073adb7 Added tag search (#3759) 
* Added tag search

* Added permissions check for document
 2017-07-25 11:19:22 +05:30
Manas Solanki
50bfdb74f8 [hotfix] convert number format to basestring before importing. (#3767) 
* convert numbers to basestring for link field

* Update importer.py
 2017-07-25 11:18:30 +05:30
Prateeksha Singh
05a542d7cc Set image control alignment via df (#3754) 
* image control alignment via df

* [wiz] remove application brand name
 2017-07-25 10:59:39 +05:30
Faris Ansari
3dfdbb4230 Set date according to system timezone (#3770) 
- Show timezone as description if different from
system timezone
- cleanup datetime.js
 2017-07-25 10:58:36 +05:30
Prateeksha Singh
e540eabdd0 [fix] notif translations fixes frappe/erpnext#10054 (#3773) 2017-07-25 10:55:28 +05:30