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

15420 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Nabin Hait
654e33fc5b Merge branch 'hotfix' 2018-03-23 15:15:35 +05:30
Nabin Hait
fa20790ac9 bumped to version 10.1.7 2018-03-23 15:45:35 +06:00
Zarrar
577ce03fd8 [Hotfix] File upload fix (#5254) 
* append hash if same filename found while uploading through socketio

* pass file size

* upload after filename change
 2018-03-23 15:13:58 +05:30
Nabin Hait
d0f3b9b6e6
Dropbox settings UX fix (#5253) 
* Fixed dropbox UX issue

* Fixed typo
 2018-03-23 15:09:28 +05:30
Achilles Rasquinha
bc0a2acadf fix timedelta conversions for pymysq 2018-03-22 23:02:20 +05:30
Achilles Rasquinha
84e7f8ba67 fix timedelta conversions for pymysq 2018-03-22 22:52:20 +05:30
Faris Ansari
5debf79e5a
Query Report fixes (#5252) 
- normalize every data row into object
- onload event should fire after filters are set
 2018-03-22 15:09:07 +05:30
Nabin Hait
763360c68f minor fix in syncing after ajax 2018-03-22 12:55:42 +05:30
Nabin Hait
3dab3478db Minor fix in autonaming 2018-03-22 12:14:21 +05:30
Suraj Shetty
436d7a0d4e Data export tool (#5213) 
* Data export tool
New doctype to export data
Child table export option
Ability to add filter

* Filter view refactor
Separated filter css

* Moved exporter script from data import doctype to data export doctype

* some input validation

* removed unwanted file and some style fixes

* removed console log

* hide sidebar

* renamed export method

* added data export link in setup module page

* minor fix

* refactor exporter.py

* data export ui tweaks

* codacy and bug fix

* silly code fixes

* [minor] indentation fix
 2018-03-22 11:30:48 +05:30
rohitwaghchaure
13f0f19f75 [Fix] RTL for document print (#5244) 2018-03-22 11:15:01 +05:30
Faris Ansari
29baefefe3
IE11 fix - login (#5247) 
* Add Polyfill of Object.assign for IE11

fixes frappe/erpnext#12703

* fix codacy
 2018-03-22 11:11:20 +05:30
Achilles Rasquinha
7666a58c81
Merge pull request #5246 from shreyashah115/alert-sound 
Uncomment alert sound in hooks.py
 2018-03-22 09:10:22 +05:30
Shreya
b25716e681 uncomment alert sound 2018-03-21 23:21:53 +05:30
Faris Ansari
3df26a8059
Update frappe-datatable to 0.0.3 (#5243) 2018-03-21 17:42:10 +05:30
Achilles Rasquinha
d22dafe0fb
Merge pull request #5241 from achillesrasquinha/hotfix-user-image-fix 
[min] user image fix
 2018-03-21 15:45:57 +05:30
Faris Ansari
73aeb5ea96
fix test 2018-03-21 15:27:24 +05:30
Achilles Rasquinha
d00b20a610 user image fix 2018-03-21 12:37:04 +05:30
Faris Ansari
b383e2235f
DataTable in GridReport (#5234) 
* DataTable in GridReport

* Remove query_report_old

* Remove SlickGrid library 💃
 2018-03-21 12:36:55 +05:30
Faris Ansari
4cafe66a3a
Kanban Board Fixes (#5236) 
- fix frappe/erpnext#13153
- Add card title field in list fields
- Quick entry if atleast 1 mandatory field is Table
 2018-03-21 12:36:41 +05:30
Faris Ansari
2322010aa6
Remove !important rules so that custom css in Print Format can override (#5235) 2018-03-21 12:35:00 +05:30
Rushabh Mehta
b6936d4980 [minor] defensive fixes 2018-03-21 12:27:12 +05:30
Rushabh Mehta
317d756872 [ui] email not large 2018-03-20 22:56:57 +05:30
Achilles Rasquinha
5ca949cc2b
Merge pull request #5239 from achillesrasquinha/py3-test 
Fixed transaction_log test case
 2018-03-20 20:46:00 +05:30
Achilles Rasquinha
8670b9977a Fixed transaction_log test case 2018-03-20 20:08:00 +05:30
Achilles Rasquinha
be18c68bff
Merge pull request #5238 from achillesrasquinha/py3-test 
test_recurring for Python 3 Fix.
 2018-03-20 19:55:31 +05:30
Achilles Rasquinha
3affb397c2 Fixed Python 3 test 2018-03-20 19:54:28 +05:30
Zarrar
cca0b0afd4 order_by can be configured if need be (#5233) 2018-03-20 14:08:37 +05:30
Faris Ansari
9f5a129333
Rollup Fixes (#5232) 
- Use PostCSS instead of Less plugin
- Fixes CSS append problem
- Show which css file changed instead of rollup.manifest.css
- Minify CSS in production
- Cannot import less/css files in js files, put them in build.json
- Let's avoid major changes in Frappe Framework now :)
 2018-03-20 13:51:53 +05:30
Rushabh Mehta
ba5ec5bcc8
[fix] fix ajax call to update doc not replace (#5204) 2018-03-20 11:40:32 +05:30
Achilles Rasquinha
e18b6ef190
Update .travis.yml 2018-03-20 10:54:35 +05:30
Achilles Rasquinha
12769fef76
Merge pull request #5226 from mntechnique/oauth_ropcg 
OAuth 2.0 : Resource Owner Password Credentials Grant
 2018-03-20 09:58:23 +05:30
Achilles Rasquinha
347aece92f
Merge pull request #5228 from achillesrasquinha/py3-fixes 
fixed bytesio object generation for python 2 and 3 for excel
 2018-03-20 01:10:11 +05:30
Achilles Rasquinha
611a74445e fixed bytesio object generation for python 2 and 3 for excel, wtf email 2018-03-20 01:07:17 +05:30
Achilles Rasquinha
dde3b39c94
Merge pull request #5227 from achillesrasquinha/py3-fixes 
Convert Map Lambda to spread function
 2018-03-20 00:46:41 +05:30
Achilles Rasquinha
b5964b58a4 Fixed Python 3 2018-03-20 00:45:07 +05:30
Achilles Rasquinha
1537e566ea
Merge pull request #5198 from schilgod/hotfix 
[fix] Custom Field fieldname setting logic
 2018-03-20 00:09:37 +05:30
Revant Nandgaonkar
f4a254d0f7 py3-ready encode returns bytes 2018-03-19 23:11:46 +05:30
Revant Nandgaonkar
34e9c2c5ac OAuth 2.0 
Resource Owner Password Credentials Grant
 2018-03-19 22:27:22 +05:30
Achilles Rasquinha
48205d2cd4
Merge pull request #5225 from achillesrasquinha/dill 
removed dill, revert to cPickle
 2018-03-19 22:05:44 +05:30
Achilles Rasquinha
0bf3411391 removed dill, revert to cPickle 2018-03-19 19:23:14 +05:30