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

14946 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Prateeksha Singh
354c8bf878 [fix] dynamic link filter in list 2018-01-08 10:23:30 +05:30
shridhar
751355f109 chat message changed from bold to normal 2018-01-07 12:28:17 +05:30
Achilles Rasquinha
42dbd65e3f Merge branch 'fix-dialog-camera' of https://github.com/achillesrasquinha/frappe into fix-dialog-camera 2018-01-05 20:24:20 +05:30
Achilles Rasquinha
78f096b495 Merge branch develop to fix-dialog-camera 2018-01-05 20:22:48 +05:30
Achilles Rasquinha
fafa6c3e96
Merge branch 'develop' into fix-dialog-camera 2018-01-05 20:10:41 +05:30
Achilles Rasquinha
b9599366d1
Merge pull request #4766 from achillesrasquinha/chat-fixes 
[MIN] Fixes Message Timestamp for Chat
 2018-01-05 20:07:21 +05:30
Achilles Rasquinha
88c67219d9 extended _ to utils 2018-01-05 15:54:55 +05:30
Achilles Rasquinha
67ddf79747 added the squash method to utils 2018-01-05 14:31:50 +05:30
Achilles Rasquinha
d0e01d4309 Fixed namespacing for utils 2018-01-05 13:59:56 +05:30
Achilles Rasquinha
abbbac5f9b fix this.action.primary being empty 2018-01-05 13:49:56 +05:30
Achilles Rasquinha
5a3e817413 fix this.action.primary being empty 2018-01-05 13:48:56 +05:30
Achilles Rasquinha
5e705983c9 [MIN] Fix datetime creation 2018-01-05 13:36:18 +05:30
Achilles Rasquinha
a110444d1b [MIN] Fix datetime creation 2018-01-05 13:35:21 +05:30
Nabin Hait
648af86501 Merge branch 'hotfix' 2018-01-05 13:16:03 +05:30
Nabin Hait
161b423417 Merge branch 'master' into develop 2018-01-05 13:16:03 +05:30
Nabin Hait
566e25f1b3 bumped to version 10.0.7 2018-01-05 13:46:03 +06:00
Zlash65
d9472b4730 check in meta if allow_rename is enabled 2018-01-05 13:05:05 +05:30
Faris Ansari
69ca51fe35 Include dependent currency field with Currency fields (#4747) 
* Include dependent currency field with Currency fields

* Escape HTML instead of encode

* Fix for LTR
 2018-01-05 13:03:45 +05:30
Achilles Rasquinha
6c6c47109c Fix Social Login Patch Break (#4762) 2018-01-05 13:02:03 +05:30
Prateeksha Singh
b0c28d9280
Merge pull request #4761 from ci2014/patch-20 
Fix indentation which causes error on restore
 2018-01-05 11:57:01 +05:30
ci2014
eb8f38301a
Fix indentation which causes error on restore 
Fixes error message, that document with a specific number already exists, even if it doesn't.
 2018-01-04 22:15:01 +01:00
Achilles Rasquinha
337746b4a1
Merge pull request #4760 from achillesrasquinha/new-emoji 
Load Emojis Async Using frappe.chat.emoji
 2018-01-04 23:42:48 +05:30
Achilles Rasquinha
3b82f3cc13 Fix Codacy 2018-01-04 21:07:46 +05:30
Achilles Rasquinha
04c9d3e8be removed emoji.json from build.json 2018-01-04 19:57:32 +05:30