Commit graph

14692 commits

Author SHA1 Message Date
Makarand Bauskar
d8ffec84ee Merge pull request #2813 from mbauskar/feedback
[minor] Feedback Rating should show a messages that 5 is highest
2017-03-07 10:43:32 +05:30
mbauskar
ce6270a023 [minor] Feedback Rating should show a messages that 5 is highest 2017-03-07 10:43:04 +05:30
Nabin Hait
1a66b744e4 Patch fixed 2017-03-07 08:48:49 +05:30
Faris Ansari
aab2a2f5ba enhance imageview grid 2017-03-06 20:57:22 +05:30
pratu16x7
4861e8a04a [minor] purge special characters in help results 2017-03-06 18:52:27 +05:30
Nabin Hait
e3d4e8b108 Merge pull request #2699 from rohitwaghchaure/role_based_reports
[Enhancement] Provision to add roles in the report
2017-03-06 18:34:39 +05:30
Rohit Waghchaure
4c357643db Fixed patch, travis 2017-03-06 18:26:22 +05:30
Nabin Hait
097fd22c5b Merge pull request #2804 from pratu16x7/more-search-fixes
Fix communication results title
2017-03-06 18:17:50 +05:30
Nabin Hait
b9d79fbb82 Minor fix 2017-03-06 17:33:49 +05:30
pratu16x7
d058ade821 [minor] set first field as title 2017-03-06 16:37:25 +05:30
Nabin Hait
9f1ae8a4c4 Merge pull request #2801 from robulik/develop
Name of timezone changed for Slovakia to match name of the capital city
2017-03-06 16:35:14 +05:30
Nabin Hait
9e42aaf364 Merge pull request #2806 from KanchanChauhan/listview-fix
[Minor] List view delete records issue fixed
2017-03-06 16:34:32 +05:30
Nabin Hait
c50f81cbc9 Merge pull request #2807 from netchampfaris/listview-fixes
imageview fix
2017-03-06 16:33:52 +05:30
Nabin Hait
392797d69a Merge pull request #2808 from pratu16x7/link-field-fix
[minor] fix link field decription match
2017-03-06 16:30:20 +05:30
pratu16x7
f380737327 [minor] fix link field decription match 2017-03-06 16:06:03 +05:30
Faris Ansari
a8a3ae532f [fix] image view for no item image 2017-03-06 15:44:48 +05:30
Kanchan Chauhan
e6c49f2ba6 [Minor] List view delete issue fixed 2017-03-06 15:40:12 +05:30
Rohit Waghchaure
ba3eca3369 rename doctype, change the css 2017-03-06 14:42:15 +05:30
Rohit Waghchaure
b63f4400f4 added roles in the report 2017-03-06 14:42:14 +05:30
Rohit Waghchaure
1644e273de minor fix 2017-03-06 14:42:14 +05:30
Rohit Waghchaure
f1c4e5a8d1 patch to delete userrole, event role 2017-03-06 14:42:14 +05:30
Rohit Waghchaure
8d90eff95d removed doctype event role and fix minor issue 2017-03-06 14:42:14 +05:30
Rohit Waghchaure
b424564ad4 shows roles on page and report for standard only 2017-03-06 14:42:14 +05:30
Rohit Waghchaure
1dc9dbe28f patches for migration of roles 2017-03-06 14:42:14 +05:30
Rohit Waghchaure
e996fd0c55 Changed tabUserRoel to tabHas Role 2017-03-06 14:42:14 +05:30
Rohit Waghchaure
8a2c83918b changed user_roles to roles 2017-03-06 14:42:13 +05:30
Rohit Waghchaure
1e8fd83e7b commonify role editor 2017-03-06 14:41:10 +05:30
Rohit Waghchaure
cc37c5fda8 rename page role to has role, added doctype custom role to set the roles, added screen to set roles to the page and report 2017-03-06 14:38:54 +05:30
Rohit Waghchaure
e57e9f170b [Enhancement] Provision to add roles in the report 2017-03-06 14:38:54 +05:30
Rushabh Mehta
bd74036e07 [minor] [patch] drop in_dialog column in DocType 2017-03-06 14:33:04 +05:30
Nabin Hait
2f3f17a09b Merge pull request #2778 from yshurrab/translations-passed-lang-fix
Translate the msg in _ function according to the passed lang, support…
2017-03-06 14:30:49 +05:30
pratu16x7
05be30ecef [fix] repeated recent lists, communication title 2017-03-06 13:49:12 +05:30
Faris Ansari
7a08311817 fix paging area, selected items (#2802) 2017-03-06 13:47:38 +05:30
Yaqin Shurrab
59637ae0a2 resove conflict 2017-03-06 10:06:26 +02:00
Yaqin Shurrab
0239b24ca0 making code simpler as @mmoksh suggessted 2017-03-06 10:03:28 +02:00
Yaqin Shurrab
337812e405 making code simpler as @mmoksh suggessted 2017-03-06 10:00:38 +02:00
Robert Kirschner
990892d53f Name of timezone changed for Slovakia to name of the capital city 2017-03-06 07:49:18 +01:00
Faris Ansari
1a76d64781 ListView refactor (#2715)
* [list_settings] save last_view, kanban_board, gantt_mode

* listview.js cleanup

* image_view refactor

* image_view done

* wip

* [photoswipe] wip

* show view for calendar, kanban even if no results

* [gantt_view] refactor into separate file

* [imageview] 3 column border fix

* [imageview] gallery working

* delete old libs

* indentation to tabs

* [gantt] update lib, custom popup html

* custom fontawesome checkbox

* reset gantt state when not permitted

* checkbox styling fix

* working commit

* image, calendar, gantt view working

* more refactoring, kanban view

* minor

* removed old files

* user settings improved

* filters and sort selector de-coupling

* wip

* [imageview] white pswp background

* kanban filters saving fixed

* fixed reportview

* minor

* removed listing.js

* minor fixes and cleanup

* patch for UserSettings table

* patch fix
2017-03-06 11:32:27 +05:30
Yaqin Shurrab
67f7706c7e reslove conflict 2017-03-05 14:01:39 +02:00
Yaqin Shurrab
81f11d12a2 resolve conflict 2017-03-05 13:59:57 +02:00
Yaqin Shurrab
ee692e0e07 resolve conflict 2017-03-05 13:39:10 +02:00
Yaqin Shurrab
ff85aa9319 Fix error in applied changes causes The Travis CI build fail 2017-03-05 13:37:28 +02:00
Yaqin Shurrab
6c40d4313b Fix error in applied changes causes The Travis CI build fail 2017-03-05 13:29:23 +02:00
Yaqin Shurrab
c6f3350bae resolve conflict, apply reviewer changes 2017-03-05 12:54:39 +02:00
Yaqin Shurrab
8d06587d49 Update as the reviewer asked for changes 2017-03-05 12:52:38 +02:00
Nabin Hait
4fecbd15af Merge pull request #2799 from AWDGroup/patch-1
Update country_info.json
2017-03-05 14:54:05 +05:30
Ardavan K
ebf82e8b6f Update country_info.json
added the missing comma
2017-03-05 11:51:10 +03:30
Rushabh Mehta
5001e92ff9 Update translate.py 2017-03-05 11:19:49 +05:30
Rushabh Mehta
e8dd3b0d84 Update __init__.py 2017-03-05 11:15:01 +05:30
Rushabh Mehta
6dff729d88 [enhance] Web View settings in DocType (#2798)
* [enhance] add web view settings doctype

* [enhance] add web view settings doctype

* [fix] default for checks (?)

* [fix] framework json

* [fix] missing return

* [fix] hooks for website_generators
2017-03-05 11:12:32 +05:30