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

15461 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nabin Hait
5bcfe14f67 Merge branch 'master' into develop 2018-03-27 11:35:20 +05:30
Nabin Hait
93064a3292 Merge branch 'hotfix' 2018-03-27 11:35:19 +05:30
Nabin Hait
0eca5db3b4 bumped to version 10.1.12 2018-03-27 12:05:18 +06:00
rohitwaghchaure
13a06c110e [Fix] Not able to delete row in modal table (#5262) 2018-03-27 10:59:51 +05:30
laughsuggestion
0484c02682 Adding sync_hook, and fixing notifications for 'for_module'. (#5194) 
* Moving after_install to occur after fixtures and customizations install

"after_install" was being called prior to fixtures that a module depends on gets installed, which makes after_install incapable of working with those doctypes. This is particularly frustrating because there is not an "after_install_with_fixtures_and_customizations" hook...

* fixing trailing whitespace

* Fix for notifications using "from_module".

Notifications using "from_module" designation previously did not work. There's two reasons for this. First, the calculation for summing notifications was exclusively choosing the notifications counts from doctype, and not using the total sum to include modules. Second, the default "_id" for a module was being automatically set to the "link" of a module. This is an issue because module links can actually contain JS (which allow them to open there pages in the same window, for example). Because of this, they do not make for good identifiers. This fix uses the toLowerCase of the module_name as the default module _id.

* fixing double declaration of count

* contending with "core is already defined" codacy error.

* Adding after_sync hook per @rmehta request.

* trying to force travis-CI to rebuild
 2018-03-27 10:58:58 +05:30
Suraj Shetty
32b6953107 set default value on field change (#5274) 
* set default value on field change
also if default value is not set, a value from options is used as default

* fix
since hide_toolbar was enabled there was no need to toggle footer view
 2018-03-27 10:57:01 +05:30
Prateeksha Singh
410db5b4e3
Merge pull request #5285 from pratu16x7/modules-select 
[desktop-icons] sort icon select options, fixes frappe/erpnext#10236
 2018-03-27 10:56:14 +05:30
Prateeksha Singh
73ccf9e68c [desktop-icons] sort icon select options, fixes frappe/erpnext#10236 2018-03-27 10:55:36 +05:30
Prateeksha Singh
747e012d59 [utils]load_image() to handle broken images, ReviewArea, remove old files (#5263) 
* [image] load_image() to handle broken images

* add reviewArea component

* remove frappe.ui.BaseList

* remove old build.js

* title in page and list
 2018-03-27 10:54:22 +05:30
Raghavendra Kamath
bc12dc57d4 remove padding from first item in blog roll list (#5282) 2018-03-27 10:43:15 +05:30
Nabin Hait
9f83d167aa Merge branch 'master' into develop 2018-03-26 19:29:37 +05:30
Nabin Hait
565e58d8cd Merge branch 'hotfix' 2018-03-26 19:29:36 +05:30
Nabin Hait
f529c4d6c4 bumped to version 10.1.11 2018-03-26 19:59:36 +06:00
Nabin Hait
a2596072d5
Ignore microseconds while making a form dirty based on time field's value (#5283) 
* Sync childtables data, handle submin/cancel fail and fixed incorrect form dirty

* minor fix

* Ignore microseconds while making a form dirty based on time field's value
 2018-03-26 19:27:25 +05:30
Achilles Rasquinha
3b92ac8ae0
Merge pull request #5281 from frappe-pr-bot/translations-2018-03-26 
[Translation] Updated Translations
 2018-03-26 17:22:29 +05:30
frappe-pr-bot
ffea35a1f2 [Translation] Updated Translations 2018-03-26 12:01:27 +02:00
Achilles Rasquinha
aca05e334d
Merge pull request #5279 from Zlash65/min-fix 
[Minor] Encode filename before hashing
 2018-03-26 15:02:26 +05:30
Zlash65
fae68f7d35 encode unicode objects 2018-03-26 14:59:41 +05:30
Nabin Hait
ebde14563d Merge branch 'master' into develop 2018-03-26 14:42:51 +05:30
Nabin Hait
d58c1c88e2 Merge branch 'hotfix' 2018-03-26 14:42:50 +05:30
Nabin Hait
6bf29f5025 bumped to version 10.1.10 2018-03-26 15:12:50 +06:00
Nabin Hait
ce7497bd18
Sync childtables data, handle submin/cancel fail and fixed incorrect form dirty (#5277) 
* Sync childtables data, handle submin/cancel fail and fixed incorrect form dirty

* minor fix
 2018-03-26 14:41:52 +05:30
Achilles Rasquinha
20052f093b
Merge pull request #5273 from achillesrasquinha/fix-fmanager 
fix content hash for attachment uploads
 2018-03-26 10:16:05 +05:30
Achilles Rasquinha
6d8658decd fix content hash 2018-03-26 10:14:45 +05:30
Achilles Rasquinha
2091ee2c2a
Merge pull request #5271 from achillesrasquinha/fixes 
placeholder fix
 2018-03-26 00:19:07 +05:30
Achilles Rasquinha
e6c3d81df8 placeholder fix 2018-03-26 00:18:26 +05:30
Achilles Rasquinha
c827a51c71
Merge pull request #5269 from achillesrasquinha/fix-ldap 
check if ldap settings exists within context
 2018-03-25 23:39:16 +05:30
Achilles Rasquinha
b9bbcc35ce
Merge pull request #5270 from achillesrasquinha/py3-returns 
fix classType
 2018-03-25 23:11:54 +05:30
Achilles Rasquinha
faf9f6c233 fix classType 2018-03-25 23:11:23 +05:30
Achilles Rasquinha
bab4968a28 check if ldap settings exists within context 2018-03-25 22:40:04 +05:30
Achilles Rasquinha
8b4ca5cb66
Merge pull request #5268 from achillesrasquinha/socket-cleanup 
socketio.js cleanup
 2018-03-25 22:36:42 +05:30
Achilles Rasquinha
0cff49c460 socketio.js cleanup 2018-03-25 22:35:46 +05:30
Nabin Hait
c2d5155138 Merge branch 'master' into develop 2018-03-24 16:17:25 +05:30
Nabin Hait
2506077f2a Merge branch 'hotfix' 2018-03-24 16:17:24 +05:30
Nabin Hait
c943d34405 bumped to version 10.1.9 2018-03-24 16:47:24 +06:00
Rushabh Mehta
d3521b182a [fix] [sync.js] delete extra rows from locals 2018-03-24 15:54:33 +05:30
Nabin Hait
ab57b16993 Merge branch 'master' into develop 2018-03-24 15:37:11 +05:30
Nabin Hait
1c90b872c2 Merge branch 'hotfix' 2018-03-24 15:37:10 +05:30
Nabin Hait
7a871230bb bumped to version 10.1.8 2018-03-24 16:07:10 +06:00
Rushabh Mehta
ec90395606 [hotfix] mapper (#5267) 2018-03-24 15:31:01 +05:30
Faris Ansari
d158a51df5 Query Report fixes (#5258) 
* Query Report fixes

- User saved columns working
- Print and PDF fix
- Print filters frappe/erpnext#12783

* minor
 2018-03-24 12:08:00 +05:30
Revant Nandgaonkar
9e2f161f3e OAuth 2 ROPC Grant test (#5237) 2018-03-24 12:07:48 +05:30
Faris Ansari
ed8a8dabd3 List view fixes (#5260) 
* Listview fixes

- fix search icon in standard filter frappe/erpnext#12555
- show skeleton while loading list rows

* Optimize remove_script_and_style
 2018-03-24 12:06:38 +05:30
Achilles Rasquinha
42d737c030
Merge pull request #5265 from achillesrasquinha/py3-tests 
unicode hash test fix
 2018-03-23 17:59:59 +05:30
Achilles Rasquinha
3c8dbaf138 fix py3 test case 2018-03-23 17:33:24 +05:30
Achilles Rasquinha
b2e7bd284e
Merge pull request #5255 from achillesrasquinha/py3-fixes 
fix timedelta conversions
 2018-03-23 16:11:33 +05:30
Achilles Rasquinha
b956f279cd
Merge pull request #5261 from achillesrasquinha/test-fix 
fix test case
 2018-03-23 15:59:17 +05:30
Achilles Rasquinha
4581077cb8 fix test case 2018-03-23 15:37:09 +05:30
Achilles Rasquinha
c6be3cbdd7 fix test case 2018-03-23 15:34:46 +05:30
Nabin Hait
3f3d9e52c8 Fixed merge conflict 2018-03-23 15:16:18 +05:30