Commit graph

9863 commits

Author SHA1 Message Date
Anand Doshi
8d8b58d5ee [fix] doc.flags.ignore_validate_constants 2016-06-09 16:08:51 +05:30
Rushabh Mehta
ad10a4bb99 [fix] [style] listview 2016-06-09 14:20:08 +05:30
Rushabh Mehta
e3e835c061 Merge pull request #1788 from mbauskar/image-view
[minor] added small button on image hover for full-size image
2016-06-09 13:13:54 +05:30
mbauskar
652bbf5353 [minor] added small button on image hover for full-size image 2016-06-08 19:05:25 +05:30
Rushabh Mehta
dea30f830a [fix] [style] document flow 2016-06-08 17:20:02 +05:30
Rushabh Mehta
f59e6be0f4 [fix] dropbox backup can be changed if setup, fixes frappe/erpnext#5260 2016-06-08 16:54:28 +05:30
Rushabh Mehta
8092f4a031 [minor] style fixes for image view 2016-06-08 16:26:59 +05:30
Rushabh Mehta
4ad2bc9a64 Merge pull request #1767 from mbauskar/image-view
[Feature] Image view
2016-06-08 16:03:18 +05:30
Rushabh Mehta
620b2f82b3 [minor] get_gravatar in templates to not query and show 2016-06-08 16:03:56 +05:30
Rushabh Mehta
9e008ce1ca [fix] add communication in comments, fixes frappe/erpnext#5450 2016-06-08 15:29:00 +05:30
Rushabh Mehta
b349c435b3 [fix] default font in email template 2016-06-08 13:28:40 +05:30
mbauskar
5a53b0fa34 [minor] removed unnecessary css, js files, commonified template for checkbox and comment section 2016-06-08 13:19:37 +05:30
Rushabh Mehta
090446fc82 Merge pull request #1786 from rohitwaghchaure/upload_attendence_error
[Fix] Attendence upload, system not throwing an exception for wrong input.
2016-06-08 13:18:07 +05:30
Rushabh Mehta
534ef217e3 [fix] provide document_flow 2016-06-08 13:17:33 +05:30
Rohit Waghchaure
1f99bfbd34 [Fix] Attendence upload, system not throwing an exception for wrong input. 2016-06-08 13:06:13 +05:30
Rushabh Mehta
cf99a33f53 [minor] quick-entry for user 2016-06-08 12:58:24 +05:30
mbauskar
4184f6a3ce [minor-fix] Filtered the image files from other types of files 2016-06-08 12:57:04 +05:30
mbauskar
15af292b69 [fixes] minor fixes, loaded gallery js files on demand 2016-06-08 12:57:04 +05:30
mbauskar
e86a409ee5 [Image View] added gallery plugin to display full image on image-view image click 2016-06-08 12:57:04 +05:30
mbauskar
927e2bb796 [Image View] added flag on Customize Form to switch from List to Image view 2016-06-08 12:57:04 +05:30
Rushabh Mehta
423cdc643d [minor] css for upload.js 2016-06-08 12:46:18 +05:30
Rushabh Mehta
4347fac6a1 [fix] document_flow.js 2016-06-08 11:43:12 +05:30
Rushabh Mehta
f609654e82 [fix] document_flow.js 2016-06-08 11:30:48 +05:30
Rushabh Mehta
f39dd3bef4 [fix] setup wizard 2016-06-08 11:08:06 +05:30
Anand Doshi
a6ddb00254 Merge branch 'saurabh6790-module_flow' into develop 2016-06-07 18:55:45 +05:30
Anand Doshi
c8e0384ce1 [cleanup] document flow 2016-06-07 18:55:15 +05:30
Saurabh
2fae88e1d4 [fixes] css fixes 2016-06-07 16:30:55 +05:30
Saurabh
55ebe2f63c [fix] css 2016-06-07 16:30:55 +05:30
Saurabh
672225363d [fixes] 2016-06-07 16:30:55 +05:30
Saurabh
4e55c1770c [fixes] get only selected doctype linkings 2016-06-07 16:30:55 +05:30
Saurabh
aaa64ab347 [fixes] added css for module flow 2016-06-07 16:30:55 +05:30
Saurabh
5736a9819f [enhance] show module flow on top of doctype 2016-06-07 16:30:55 +05:30
Rushabh Mehta
d718e8369e Merge pull request #1783 from RobertSchouten/patch-17
[enhancement] added all permissions to permitted_documents_for_user
2016-06-07 14:07:49 +05:30
RobertSchouten
02353e882b Update permitted_documents_for_user.py 2016-06-07 16:18:47 +08:00
RobertSchouten
cc8c5625ce Update permitted_documents_for_user.js 2016-06-07 16:16:09 +08:00
Rushabh Mehta
1210dda852 Merge pull request #1779 from wenzhixue/patch-1
fix bug for "duplicate key name" when db init
2016-06-07 10:55:21 +05:30
Rushabh Mehta
4db3e3ff52 Merge pull request #1782 from neilLasrado/develop
Fixed issue in link field
2016-06-06 20:48:15 +05:30
Neil Trini Lasrado
39bc69b0af Fixed issue in link field 2016-06-06 18:55:03 +05:30
Anand Doshi
c7e551809b [fix] socketio request.query 2016-06-06 15:43:01 +05:30
Rushabh Mehta
84fbd57b8e [minor] new-app title by default 2016-06-06 09:34:12 +05:30
Rushabh Mehta
ce884882a2 [minor] fixes #1780 2016-06-06 09:18:49 +05:30
Rushabh Mehta
4550b16053 Merge pull request #1778 from strixaluco/develop
Update bench-commands-cheatsheet.md
2016-06-03 16:58:34 +05:30
Rushabh Mehta
c5be48802b [fix] route for customize from list 2016-06-03 16:03:35 +05:30
Rushabh Mehta
4548cfbaa0 [minor] link-control to open in a new tab 2016-06-03 16:01:13 +05:30
Rushabh Mehta
b6214715e5 [ux] email alert - show tasks for today, fix for multiple address selection in email, fixes frappe/erpnext#5436 2016-06-03 15:57:18 +05:30
Rushabh Mehta
b22106b513 [fix] fixes #5437 2016-06-03 15:00:28 +05:30
Nick
e1bded65a2 fix bug for "duplicate key name" when db init
During the first init process for creating tables, if one field marked True for both "unique" and "search_index" , table creation will be failed. 

for example :

create table `tabItem Barcode` (
            name varchar(140) not null primary key,
            creation datetime(6),
            modified datetime(6),
            modified_by varchar(140),
            owner varchar(140),
            docstatus int(1) not null default '0',
            parent varchar(140),
            parentfield varchar(140),
            parenttype varchar(140),
            idx int(8) not null default '0',
            `item_barcode` varchar(140) unique,
`sku_id` varchar(140),
`unit_qty` varchar(140),
`_comments` text,
`_assign` text,
`_liked_by` text,
`store` varchar(140),
`retail_price` varchar(140),
`_user_tags` text,
`uom` varchar(140),
index `item_barcode`(`item_barcode`),
index parent(parent))
            ENGINE=InnoDB
            ROW_FORMAT=COMPRESSED
            CHARACTER SET=utf8mb4
            COLLATE=utf8mb4_unicode_ci
2016-06-03 16:34:28 +08:00
Nabin Hait
78f6282925 Merge branch 'master' into develop 2016-06-03 11:49:00 +05:30
Nabin Hait
7899fc9f6e Merge branch 'hotfix' 2016-06-03 11:49:00 +05:30
Nabin Hait
6704fef89d bumped to version 6.27.21 2016-06-03 12:19:00 +06:00