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

17271 commits

This branch
This branch
All branches
Author SHA1 Message Date
Frappe Bot
22f4433406 Merge branch 'staging' into develop 2018-11-13 11:02:24 +00:00
Frappe Bot
3dd32381d6 Merge branch 'staging-fixes' into staging 2018-11-13 11:02:24 +00:00
Frappe Bot
9f7346f323 bumped to version 11.0.3-beta.26 2018-11-13 11:02:24 +00:00
Frappe Bot
24758f75ac Merge branch 'master' into staging-fixes 2018-11-13 10:52:59 +00:00
Frappe Bot
229c7ef42f Merge branch 'hotfix' 2018-11-13 10:52:59 +00:00
Frappe Bot
48b6ed2993 bumped to version 10.1.61 2018-11-13 10:52:59 +00:00
Faris Ansari
c0cb56763d fix(Quill): Set HTML without triggering a focus (#6456) 2018-11-13 15:39:06 +05:30
Chinmay Pai
5f0dbecfed data-import: fix UnicodeEncodeError on data import in python2 (#6448) 
why is this not built into re by default?

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
 2018-11-13 10:35:27 +05:30
Zarrar
4f0081743b minor fix (#6443) 2018-11-13 10:33:11 +05:30
Frappe PR Bot
8b08d1d5c5 [Translation] Updated Translations (#6444) 2018-11-13 10:29:55 +05:30
Ameya Shenoy
0303444eb3
Merge pull request #6451 from codingCoffee/uperm 
fix: set is_patch flag before running patch
 2018-11-12 19:08:44 +05:30
Ameya Shenoy
7dd2ccd066
fix: set is_patch flag before running patch 
set frappe.flags.in_patch to True before running the
sync_user_permission_doctype_before_migrate patch via hooks
 2018-11-12 12:59:06 +00:00
Prateeksha Singh
ad0c0df737
Merge pull request #6442 from pratu16x7/setup-ui-fixes 
[fix][padding] setup wizard footer
 2018-11-12 11:21:59 +05:30
Prateeksha Singh
69869a2085 [fix][padding] setup wizard footer 2018-11-12 11:20:27 +05:30
Zarrar
ed0869522a [Enhance] Duplicate row below a selected row in grid Table (#6380) 
* button and onclick functionality added to duplicate row

* duplicate row and open newly created row
- re-used add_new_row function by extending it a little to copy data from passed row

* keep only 1 button to duplicate a row

* better readability for if
 2018-11-12 11:09:18 +05:30
rohitwaghchaure
30ee228b4a Code cleanup and fixed print permission error (#6377) 2018-11-12 11:08:18 +05:30
Deepesh Garg
57c11adc64 With group indentation checkbox while exporting reports in csv format (#6417) 2018-11-12 11:06:39 +05:30
Suraj Shetty
6f64ddcda4 Refactor frappe.db.insert (#6430) 
- Now use frappe.xcall for ajax which returns Promise object.
 2018-11-12 11:04:49 +05:30
Suraj Shetty
e647bdf80d Cache component using keep-alive tag (#6432) 
- Avoids redundant network calls
 2018-11-12 11:04:11 +05:30
Suraj Shetty
85a15d6045 [Social] Option to delete post (#6435) 
* Add PostDropdownMenu component

* Add post delete option

* Move delete option to the bottom

Delete option should be last in the option list
 2018-11-12 10:59:43 +05:30
Suraj Shetty
5add26e407 bench browse command to open site from terminal (#6438) 
* Add new bench browse command to open site from terminal

* Fix typo

* Support different variation of command
- Added support for 'bench --site site-name browse'
since we use --site option for site related commands

* Use click.echo instead of print
 2018-11-12 10:48:45 +05:30
Faris Ansari
bb9df9b128 fix(Quill Editor): Set HTML using Quill's API (#6433) 
To avoid doc changes when form is loaded
 2018-11-12 10:32:52 +05:30
rohitwaghchaure
8ebeb0b2a3
Merge pull request #6440 from rohitwaghchaure/date_format_not_showing_correct_in_report 
[Fix] Date format not shwoing properly in the prepared report
 2018-11-11 17:55:15 +05:30
Rohit Waghchaure
a5645fec64 [Fix] Date format not shwoing properly in the prepared report 2018-11-11 17:53:11 +05:30
Faris Ansari
ff6d934c66
Merge pull request #6428 from rohitwaghchaure/revert_filter_hidden_feature 
Revert feature, listView filter shows hidden field
 2018-11-10 20:37:10 +05:30
Faris Ansari
2a40378bc3
Merge pull request #6439 from rohitwaghchaure/hotfix_revert_filter_hidden_feature 
Revert feature, listView filter shows hidden field
 2018-11-10 18:26:50 +05:30
Rohit Waghchaure
4dd03618d6 Revert feature, listView filter shows hidden field 2018-11-10 17:03:24 +05:30
Faris Ansari
488f62bcb8
Merge pull request #6434 from codingCoffee/autodep 
fix: bench auto-deploy
 2018-11-09 19:58:58 +05:30
Ameya Shenoy
0ae86c12fa
fix: bench auto-deploy 
Co-authored-by: Faris Ansari <netchamp.faris@gmail.com>
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
 2018-11-09 19:50:45 +05:30
Frappe Bot
3c60cf1681 Merge branch 'staging' into develop 2018-11-09 11:33:30 +00:00
Frappe Bot
0bfc864a69 Merge branch 'staging-fixes' into staging 2018-11-09 11:33:29 +00:00
Frappe Bot
aa530dab24 bumped to version 11.0.3-beta.25 2018-11-09 11:33:29 +00:00
Faris Ansari
d7d86a15e7
Merge pull request #6421 from netchampfaris/misc-fixes-1 
Miscellaneous fixes
 2018-11-09 16:54:25 +05:30
Frappe Bot
f24949bb76 Merge branch 'staging' into develop 2018-11-09 10:41:20 +00:00
Frappe Bot
cc563b74e4 Merge branch 'staging-fixes' into staging 2018-11-09 10:41:19 +00:00
Frappe Bot
6953924ca7 bumped to version 11.0.3-beta.24 2018-11-09 10:41:19 +00:00
Ameya Shenoy
d4a8ad4533
Merge pull request #6431 from codingCoffee/dummy 
dummy commit
 2018-11-09 16:10:13 +05:30
Frappe Bot
bbd929212b dummy commit 2018-11-09 10:38:07 +00:00
Frappe Bot
478e60fdb1 Merge branch 'staging' into develop 2018-11-09 10:18:33 +00:00
Frappe Bot
cc9874e025 Merge branch 'staging-fixes' into staging 2018-11-09 10:13:51 +00:00
Frappe Bot
1a1be3852d bumped to version 11.0.3-beta.23 2018-11-09 10:13:51 +00:00
Frappe Bot
3be307169f Merge branch 'hotfix' 2018-11-09 10:08:19 +00:00
Frappe Bot
c373a172af Merge branch 'master' into staging-fixes 2018-11-09 10:08:19 +00:00
Frappe Bot
1800f9f70a bumped to version 10.1.60 2018-11-09 10:08:19 +00:00
Ameya Shenoy
dd1d94b1aa
Merge pull request #6429 from codingCoffee/emailcc 
fix(Email Queue): change fieldtype of shown_as_cc
 2018-11-09 14:57:08 +05:30
Ameya Shenoy
afb6a7166c
fix(Email Queue): change fieldtype of shown_as_cc 
This is done to allow more number of recipients to be CCed in
the email. The existing fieldtype was Data, which had a
restriction of 140 characters, thereby allowing only a few email
addresses to be CCed. It has now been changed to Small Text, to
incorporate more email addresses.

Co-authored-by: sahil28297 <37302950+sahil28297@users.noreply.github.com>
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
 2018-11-09 07:35:25 +00:00
Rohit Waghchaure
ac915c4257 Revert feature, listView filter shows hidden field 2018-11-09 12:59:28 +05:30
gshmu
a2642868a5 fix read_xlsx_file_from_attached_file when xlsx contain functions (#6400) 2018-11-09 10:53:03 +05:30
Navdeep Ghai
36c6552fe9 remove meta dependency when Link field options is [Select] (#6418) 2018-11-09 10:51:09 +05:30
Suraj Shetty
68172aff5f Remove anticipated exception by adding a check (#6424) 2018-11-09 10:50:06 +05:30