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

15486 commits

This branch
This branch
All branches
Author SHA1 Message Date
Achilles Rasquinha
8b5d24f89a fix minor variable call 2018-03-29 10:21:00 +05:30
Achilles Rasquinha
05ad109bcb cast singles fieldtype 2018-03-29 09:56:44 +05:30
Nabin Hait
3b51afae0c Added indexes for lft, rgt on File 2018-03-28 16:59:31 +05:30
Faris Ansari
bbf8aaa56a
body block overridable (#5304) 2018-03-28 16:43:47 +05:30
Achilles Rasquinha
806e0f18be
Update handler.py 2018-03-28 16:26:15 +05:30
Achilles Rasquinha
fa743468a0
Merge pull request #5301 from achillesrasquinha/fchat-fixes 
fix chat render for contacts
 2018-03-28 13:21:03 +05:30
Achilles Rasquinha
80d9a6f504 fix chat render for contacts 2018-03-28 13:18:55 +05:30
Achilles Rasquinha
d998b37a4e
Merge pull request #5300 from achillesrasquinha/fchat-fixes 
avoid re-rendering multiple chat rooms
 2018-03-28 12:57:52 +05:30
Achilles Rasquinha
1519e36a61 avoid re-rendering multiple chat rooms 2018-03-28 12:54:21 +05:30
Achilles Rasquinha
78a131aee7
Merge pull request #5299 from achillesrasquinha/fix-site-room 
fix site room broadcast
 2018-03-28 12:32:30 +05:30
Achilles Rasquinha
7011faf728 fix site room broadcast 2018-03-28 12:31:16 +05:30
Nabin Hait
ea0ce9b409 Merge branch 'master' into develop 2018-03-28 11:53:21 +05:30
Nabin Hait
a3783119fe Merge branch 'hotfix' 2018-03-28 11:53:20 +05:30
Nabin Hait
470e3ac0a5 bumped to version 10.1.15 2018-03-28 12:23:20 +06:00
Achilles Rasquinha
336f5ec05f
Merge pull request #5297 from achillesrasquinha/hf-redis-conn 
avoid multi-redis connections
 2018-03-28 11:50:25 +05:30
Achilles Rasquinha
6a79028f6e avoid multi-redis connections 2018-03-28 11:49:27 +05:30
Nabin Hait
b455d90631 Merge branch 'master' into develop 2018-03-28 08:43:50 +05:30
Nabin Hait
8d54ec6d31 Merge branch 'hotfix' 2018-03-28 08:43:50 +05:30
Nabin Hait
bc03a7eaec bumped to version 10.1.14 2018-03-28 09:13:49 +06:00
Rushabh Mehta
807a300fd8 [hotfix] dont allow API query for child table 2018-03-28 06:41:56 +05:30
Raghavendra Kamath
9c096a7496 Add image in metablock for blog (#5292) 2018-03-27 21:58:39 +05:30
Nabin Hait
1503ec70be Fixed merge conflict 2018-03-27 14:19:27 +05:30
Nabin Hait
eca3fa4d82 Merge branch 'hotfix' 2018-03-27 14:18:13 +05:30
Nabin Hait
dbaddfc187 bumped to version 10.1.13 2018-03-27 14:48:13 +06:00
Nabin Hait
33a3498c72
More syncjs fixes (#5287) 2018-03-27 14:17:29 +05:30
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