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

17252 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Frappe PR Bot
8b08d1d5c5 [Translation] Updated Translations (#6444) 2018-11-13 10:29:55 +05:30
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
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
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
c373a172af Merge branch 'master' into staging-fixes 2018-11-09 10:08:19 +00:00
Frappe Bot
3be307169f Merge branch 'hotfix' 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
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
Faris Ansari
c0a0c7e94c fix: Remove duplicate declaration 2018-11-08 13:45:28 +05:30
Faris Ansari
a8b5fdd5ca fix(Query Report): Enable refresh button after report is errored 2018-11-08 13:45:21 +05:30
Faris Ansari
cc8743aab9 fix(security): Sanitize file names in upload dialog (#6419) 2018-11-08 12:45:29 +05:30
Ameya Shenoy
5ada7746db fix: develop version should be 12 (#6414) 2018-11-08 12:44:40 +05:30
Faris Ansari
8a8212c298
Merge pull request #6411 from netchampfaris/node-modules-symlink 
Symlink node_modules in app public
 2018-11-08 12:03:05 +05:30
Faris Ansari
fa9b8eaeb7
Merge pull request #6415 from netchampfaris/communication-list-view-fix 
fix: Override primary_action from list_settings
 2018-11-08 11:37:51 +05:30
Faris Ansari
12b39a6118
style: Ignore console statement 2018-11-07 18:33:41 +05:30
Faris Ansari
184a3f57bc
style: Missing semicolon 2018-11-07 18:32:29 +05:30
Faris Ansari
65e0fe19cc fix: Override primary_action from list_settings 
Show Email Composer as primary action in Communication List
 2018-11-07 16:35:41 +05:30
Faris Ansari
223fa9453f
Merge pull request #6412 from netchampfaris/email-reply-chain-fix 
fix: Email Reply Chain
 2018-11-07 14:06:58 +05:30
Faris Ansari
338c4c8794 fix: Email Reply Chain 
Previous email is appended to the next reply, but was not rendered by
splitting it with a hardcoded comment string. Since Quill does not
support comments, created a new HiddenBlock for it.
 2018-11-07 13:06:22 +05:30
Faris Ansari
56279471c0 fix(ace): Point assets path to node_modules 2018-11-07 11:33:32 +05:30
Faris Ansari
d3340ae5e9 fix(build): Symlink app node_modules in public folder 2018-11-07 11:32:20 +05:30
Faris Ansari
8f84cc4e2e
Merge pull request #6409 from netchampfaris/email-reply-fix 
fix: Dont append last email's content in reply
 2018-11-06 19:03:28 +05:30
Faris Ansari
58c0a1f75c fix: Dont append last email's content in reply 2018-11-06 19:03:23 +05:30
Ameya Shenoy
78ff13fc6e
Merge branch 'staging' into develop 2018-11-06 11:12:10 +00:00
Ameya Shenoy
93720a911d
Merge branch 'staging-fixes' into staging 2018-11-06 11:05:32 +00:00
Ameya Shenoy
aa26e39da0 bumped to version 11.0.3-beta.22 2018-11-06 11:05:32 +00:00
Ameya Shenoy
60e2090c3b
Merge pull request #6401 from frappe-pr-bot/translations-2018-11-05 
[Translation] Updated Translations
 2018-11-06 16:33:13 +05:30