Commit graph

10369 commits

Author SHA1 Message Date
Rushabh Mehta
42bbf48b6b [test] fix for get_url 2016-08-12 19:32:03 +05:30
Rushabh Mehta
5621576b3c [hot] get_url fix 2016-08-12 19:19:36 +05:30
Rushabh Mehta
8dd380baac [fix] file_manager.py decode filename while extracting from dataurl 2016-08-12 15:09:42 +05:30
Rushabh Mehta
05c9e21c0f [minor] breadcrumbs fixed for doctype in multiple modules 2016-08-12 15:09:42 +05:30
Rushabh Mehta
a7e57a9d5e Merge pull request #1962 from RobertSchouten/patch-44
Bugfix cropped email text
2016-08-12 14:07:18 +05:30
Rushabh Mehta
4fe086b7f5 Merge pull request #1965 from mbauskar/develop
[minor] fixed send_one for Email Queue
2016-08-12 13:56:08 +05:30
mbauskar
96150325a9 [minor] fixed send_one for Email Queue 2016-08-12 13:21:47 +05:30
Rushabh Mehta
41e8ee784e [fix] no breadcrumbs for single doctypes, fixes #1970 2016-08-12 12:27:26 +05:30
Rushabh Mehta
525efb3f2c Merge branch 'develop' 2016-08-12 11:52:32 +05:30
Rushabh Mehta
6bef936f2a bumped to version 7.0.20 2016-08-12 12:22:32 +06:00
Rushabh Mehta
3a211bf497 Merge pull request #1969 from frappe/hotfix
Hotfix
2016-08-12 11:39:20 +05:30
Rushabh Mehta
dac123a3d8 Merge pull request #1964 from rmehta/select-cols-in-import
[feature] select columns in data import tool
2016-08-12 11:35:00 +05:30
Rushabh Mehta
aa4891247f Merge pull request #1967 from rohitwaghchaure/rename_tool_issue
[Rename Tool] Fixed reading data from wrong file issue
2016-08-12 10:51:52 +05:30
Rohit Waghchaure
1fbc271b5d [Rename Tool] Fixed reading data from wrong file issue 2016-08-11 19:27:40 +05:30
Rushabh Mehta
de7e288875 [feature] select columns in data import tool 2016-08-11 15:57:59 +05:30
Rushabh Mehta
91a3a9ea9e Merge pull request #1960 from rmehta/multiple-user-sessions
[feature] allow multiple sessions per user
2016-08-11 13:24:42 +05:30
RobertSchouten
74667b2550 Update tools.js 2016-08-11 08:34:54 +08:00
Rushabh Mehta
f91977f7da [feature] allow multiple sessions per user 2016-08-10 17:31:29 +05:30
Rushabh Mehta
f5fedb0723 Merge pull request #1952 from netchampfaris/ui-fixes
[ui] fix thumbnail view for long images #1939
2016-08-10 17:18:41 +05:30
Faris Ansari
1106d27263 [ui] fix thumbnail view for long images 2016-08-10 14:49:53 +05:30
Rushabh Mehta
e25d9dd9ec Merge pull request #1959 from frappe/revert-1943-patch-40
Revert "minifiying doctype json's"
2016-08-10 14:30:46 +05:30
Rushabh Mehta
3fea731e62 Revert "minifiying doctype json's" 2016-08-10 14:30:29 +05:30
Rushabh Mehta
d2fb2a3867 Merge branch 'develop' 2016-08-10 14:28:01 +05:30
Rushabh Mehta
42aba9cf82 bumped to version 7.0.19 2016-08-10 14:58:01 +06:00
Rushabh Mehta
720032b053 Merge pull request #1951 from sbkolate/patch-3
Updated limits
2016-08-10 14:17:40 +05:30
Rushabh Mehta
b1c02ed7e1 Merge pull request #1943 from RobertSchouten/patch-40
minifiying doctype json's
2016-08-10 14:15:09 +05:30
Rushabh Mehta
37029c37f8 Merge pull request #1930 from rohitwaghchaure/grid_fixes
minor fix
2016-08-10 14:14:45 +05:30
Rushabh Mehta
c9eed0ad43 Merge pull request #1949 from rmehta/insert-many
[feature] [api] frappe.client.insert_many
2016-08-10 14:13:57 +05:30
Rushabh Mehta
8bdb37a541 Merge pull request #1950 from mbauskar/image-view
[Minor][UI] scale down the image
2016-08-10 14:13:46 +05:30
Rushabh Mehta
3b78110528 [fix] [tests] 2016-08-10 13:04:40 +05:30
Rushabh Mehta
7c7291b370 [fix] tags api, #1956 2016-08-10 12:48:25 +05:30
Rushabh Mehta
f590832f15 Merge pull request #1954 from vjFaLk/get-path-fix
[fix] gzip path
2016-08-09 18:33:26 +05:30
Valmik Jangla
d461f5cd27 [fix] gzip path 2016-08-09 18:31:39 +05:30
Rushabh Mehta
fca0cf5ddf [minor] allow button in list view for grid, and other minor fixes 2016-08-09 16:42:30 +05:30
Rushabh Mehta
d763435500 Merge pull request #1953 from jarsy/rest-error-fix
Fix issue: There is an error appear "ValueError: No JSON object could…
2016-08-09 16:18:45 +05:30
Yaroslav Hreshko
7f571798d9 Fix issue: There is an error appear "ValueError: No JSON object could be decoded" when data is sent from SAP to ERPNext in http request body.
Signed-off-by: Yaroslav <jarsyxx@gmail.com>
2016-08-09 13:38:11 +03:00
mbauskar
6c787bf079 [minor][UI] updated less 2016-08-09 12:11:51 +05:30
mbauskar
d8470e47a7 [UI][#1939] scale down the image 2016-08-09 11:43:37 +05:30
sbkolate
e297dcd9c1 Updated limits
Updated limits from following link
https://frappe.github.io/frappe/user/en/bench/guides/settings-limits
2016-08-09 11:33:03 +05:30
Rushabh Mehta
512fc3a5c2 [feature] [api] frappe.client.insert_many 2016-08-09 11:09:31 +05:30
Rushabh Mehta
a115df59dc Merge pull request #1946 from neilLasrado/develop
[ux improvement] Sort modules shown in user doctype
2016-08-08 18:15:24 +05:30
Neil Trini Lasrado
fd6f9bab7d [ux improvement] Sort modules shown in user doctype 2016-08-08 18:11:48 +05:30
Nabin Hait
7e75d69a5b Merge branch 'develop' 2016-08-08 16:57:10 +05:30
Nabin Hait
de282e2b39 bumped to version 7.0.18 2016-08-08 17:27:10 +06:00
Rushabh Mehta
2488c13dbc [hot] fix permlevel 2016-08-08 16:53:28 +05:30
Rushabh Mehta
f134370f7d [hot] fix permlevel 2016-08-08 16:51:35 +05:30
Nabin Hait
059d656a0b Merge branch 'develop' 2016-08-08 15:49:21 +05:30
Nabin Hait
b58be81e85 bumped to version 7.0.17 2016-08-08 16:19:20 +06:00
Nabin Hait
8a7684a445 Merge pull request #1944 from rmehta/permlevel-read-fix
[fix] apply read permlevel before sending doc to desk. Fixes #1904
2016-08-08 15:45:42 +05:30
Rushabh Mehta
171c69677f [fix] apply read permlevel before sending doc to desk. Fixes #1904 2016-08-08 14:07:38 +05:30