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

14820 commits

This branch
This branch
All branches
Author SHA1 Message Date
Achilles Rasquinha
1b7a6fe2a5
Merge pull request #4803 from lb-/patch-1 
[DOCS, MINOR] Fix line break before Jinja Templating
 2018-01-12 19:57:58 +05:30
Saurabh
c62ddaabaa Merge branch 'master' into develop 2018-01-12 16:50:19 +05:30
Saurabh
0cab11b67f Merge branch 'hotfix' 2018-01-12 16:50:18 +05:30
Saurabh
b43b4a559a bumped to version 10.0.9 2018-01-12 17:20:18 +06:00
Saurabh
410e6cadd7 [fix] pass language selected on email dialogue while enqueuing the function (#4808) 2018-01-12 16:43:26 +05:30
Prateeksha Singh
1454a3a282
Merge pull request #4809 from pratu16x7/file-query-fix 
[travis][fix] default for null folder sizes
 2018-01-11 16:47:06 +05:30
Prateeksha Singh
851e3aa393
Merge pull request #4811 from netchampfaris/hotfix-naming-escape 
Hotfix naming escape
 2018-01-11 16:43:08 +05:30
Prateeksha Singh
1164c2d8d2 [fix] default for null folder sizes 2018-01-11 16:28:38 +05:30
Prateeksha Singh
ac1a67f083
Merge pull request #4812 from codingCoffee/travis-fix 
mongodb removed from travis
 2018-01-11 15:26:50 +05:30
Ameya Shenoy
6359e635b8
mogodb removed from travis 2018-01-11 15:19:33 +05:30
Faris Ansari
9dc43f85ce minor 2018-01-11 15:02:19 +05:30
Faris Ansari
ad412de054 Escape name in sql query 2018-01-11 15:00:35 +05:30
Prateeksha Singh
4910b98d20
Merge pull request #4804 from netchampfaris/Routing-fix-for-special-chars 
Routing fix for special characters
 2018-01-11 14:02:21 +05:30
Prateeksha Singh
eb418d8fb6
Merge pull request #4795 from revant/fix_patch_refactor_social_login_key 
[Fix] Patch v10_0.refactor_social_login_keys
 2018-01-11 12:31:47 +05:30
Nabin Hait
f3e8446a82 Don't set window size in selenium tests 2018-01-11 12:05:40 +05:30
Nabin Hait
06e2e0fde2 Render children again after adding a child 2018-01-11 12:05:40 +05:30
Prateeksha Singh
5a4e01be79
Merge pull request #4805 from pratu16x7/tree-fixes 
[tree] refresh on rename
 2018-01-10 18:40:54 +05:30
Prateeksha Singh
c928865648 [tree] refresh on rename 2018-01-10 18:39:56 +05:30
Faris Ansari
aa4e293d3b Routing fix for special characters 2018-01-10 15:11:08 +05:30
LB (Ben Johnston)
4930985d70
Fix line break before Jinja Templating 
Rendered version was not showing correctly, the bullet point `Codecademy Tutorial for jQuery` was showing as a header.
 2018-01-10 18:44:41 +10:00
tundebabzy
4700782c0b
Merge pull request #4800 from frappe-pr-bot/translations-2018-01-09 
[Translation] Updated Translations
 2018-01-09 16:32:51 +01:00
frappe-pr-bot
3d095b40f0 [Translation] Updated Translations 2018-01-09 13:29:04 +02:00
Faris Ansari
d9483acbdd
Listview fixes returns (#4784) 
* Rename method update_data to prepare_data

* Fix duplicate row render

* [fix] Duplicate filters in listview

* Fix column layout issue in Firefox
 2018-01-09 15:45:10 +05:30
Harsh Patel
b1bbc16c99 Fixed ERPNext issue #12282 (#4754) 
* Proposed fix for issue #12282

* [Mod] Modified the get_value in test_customize_form.py for method "test_save_customization_field_property"

* [Fix] Does not allow changing the property of standard fields only.

* [Mod] Code documentation in test_customize_form.py
 2018-01-09 15:43:22 +05:30
Saurabh
6b99921d52 Merge branch 'hotfix' 2018-01-09 12:15:49 +05:30
Saurabh
11be75723b Merge branch 'master' into develop 2018-01-09 12:15:49 +05:30
Saurabh
77f6902078 bumped to version 10.0.8 2018-01-09 12:45:49 +06:00
Achilles Rasquinha
265cc38060
Merge pull request #4794 from achillesrasquinha/fixes-chat 
scroll to bottom of chat window
 2018-01-09 11:58:33 +05:30
Revant Nandgaonkar
f5e08ce041 [Fix] Patch v10_0.refactor_social_login_keys 2018-01-09 11:43:51 +05:30
rohitwaghchaure
7e7ecdb2ab [Fix] Submit option not visible in the role permisison manager (#4786) 2018-01-09 11:34:26 +05:30
Achilles Rasquinha
42b5fc0f87 scroll to bottom of chat window, always 2018-01-09 11:27:05 +05:30
Manas Solanki
f08836e8b4 change the data field into string if number is given (#4783) 2018-01-09 11:22:01 +05:30
Faris Ansari
ba508410d1 Fix Report route (#4789) 
* Fix Report route

* minor

* fix Report route in modules

* fix module_view test
 2018-01-09 11:16:21 +05:30
rohitwaghchaure
7e6da701a8 Show inclusive tax in print (#4769) 2018-01-09 11:14:37 +05:30
Shridhar Patil
56fa6e1cc8 Logout from all sessions on password change (#4542) 
* Logout from all sessions on password change

Add checkbox to logout from all sessions
If checked logout from all sessions

https://github.com/frappe/frappe/issues/4383

* Changed spaces to tabs

* Send logout_all_sessions as 0 or 1

Convert it to in on server side and pass to update_password

* changed logout_all_sessions from bolean to int

* Move checkbox inside form
 2018-01-09 10:57:42 +05:30
Faris Ansari
8cb0c9a0dd
Revert "fix standard filter - id (#4782)" (#4785) 
This reverts commit eeb65deba5.
 2018-01-09 10:55:29 +05:30
Achilles Rasquinha
853569d2d4
Merge pull request #4790 from achillesrasquinha/fixes-chat 
[frappe-chat] Scroll Fixes
 2018-01-08 23:57:02 +05:30
Achilles Rasquinha
ab51a2b827 removed unncessary code snippets 2018-01-08 23:14:56 +05:30
Achilles Rasquinha
30f35e96e1 moved files to .github folder 2018-01-08 22:53:50 +05:30
Achilles Rasquinha
b60b001fce Fixed Chat Scrolling Issues 2018-01-08 22:53:37 +05:30
Zarrar
eeb65deba5 fix standard filter - id (#4782) 2018-01-08 14:04:02 +05:30
Prateeksha Singh
b1ccc5d35a
Merge pull request #4671 from Zlash65/listdown-valid-doctype 
Listdown doman-activated doctype in Contacts & Address
 2018-01-08 12:53:41 +05:30
Prateeksha Singh
d3c65983f7
Merge pull request #4779 from Zlash65/fix-root-node-delete 
[Fix] Allow deletion of root node with no parent
 2018-01-08 12:51:18 +05:30
Prateeksha Singh
32ba5be6eb
Merge pull request #4765 from Zlash65/fix-tree-rename 
[Fix] Rename in treeview
 2018-01-08 12:18:20 +05:30
Manas Solanki
6640f4c07f
fix the route for the import button in the listview (#4780) 2018-01-08 12:12:34 +05:30
Achilles Rasquinha
8cce47ca64
Merge pull request #4750 from zerodhatech/chat 
chat message changed from bold to normal
 2018-01-08 12:10:15 +05:30
Faris Ansari
4416b1c16f
[fix] Listview column fields (#4770) 2018-01-08 12:02:40 +05:30
Zlash65
634e3f3dbb bypass root node validation if no parent found 2018-01-08 11:53:29 +05:30
Achilles Rasquinha
79305b8bbe
Merge pull request #4767 from achillesrasquinha/fix-dialog-camera 
Fixes Camera not Working
 2018-01-08 11:44:15 +05:30
Prateeksha Singh
a9107d5f28
Merge pull request #4778 from pratu16x7/hotfix 
[fix] dynamic link filter in list
 2018-01-08 10:27:02 +05:30