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

18930 commits

This branch
This branch
All branches
Author SHA1 Message Date
Suraj Shetty
1c8fd3169e fix(permission): use .get to avoid key error (#7187) 
Port of https://github.com/frappe/frappe/pull/7184
 2019-04-01 18:22:17 +05:30
Faris Ansari
f853313a5a
fix: Update user activity using ORM (#7183) 2019-04-01 16:16:35 +05:30
Suraj Shetty
934adcd2e8
Merge pull request #7157 from netchampfaris/desktop-fixes 
fix: Desktop UX
 2019-04-01 11:43:57 +05:30
Suraj Shetty
ec6da7e7eb
Merge pull request #7171 from netchampfaris/datatable-column-resize-develop 
Datatable column resize develop
 2019-04-01 11:12:58 +05:30
Suraj Shetty
aff6f71c81
style: unindent chained .then 2019-04-01 11:09:08 +05:30
Faris Ansari
3415335423 fix: Add fast-deep-equal as a dependency 2019-04-01 10:42:40 +05:30
Faris Ansari
a70533158b
Merge branch 'develop' into datatable-column-resize-develop 2019-04-01 10:22:50 +05:30
Faris Ansari
0b574a34b5
Merge branch 'develop' into desktop-fixes 2019-04-01 10:18:57 +05:30
Faris Ansari
358f641d09
Merge pull request #7173 from surajshetty3416/energy-point-fixes 
feat: Energy point history UI
 2019-04-01 10:17:24 +05:30
Suraj Shetty
3f6183c087 fix: Alignment of points 2019-03-31 19:42:18 +05:30
Suraj Shetty
ecae61e35a feat: Add energy point history component 2019-03-31 19:42:18 +05:30
Suraj Shetty
b62b9b5db2 fix: Translate string 2019-03-31 19:42:18 +05:30
Suraj Shetty
1d7fa2bd40 refactor: Abstract get_points code 2019-03-31 19:42:18 +05:30
Suraj Shetty
91926a4698 feat: Add docperm to make Energy Point Log readable to all 2019-03-31 19:42:18 +05:30
Suraj Shetty
15ef216dcb feat: Update points realtime 2019-03-31 19:42:17 +05:30
Faris Ansari
f7408d4d1c fix: Revert Multiselect, add MultiSelectPills 
MultiSelect with pills doesn't work well in Report filters. So we
introduce another control which can be used wherever appropriate.
 2019-03-31 17:18:22 +05:30
Suraj Shetty
eae217eaa9 fix: Energy point UX (#7164) 
- Make user mandatory
- Allow data fieldtype for user_field
- Change fieldtype of user selection from select to autocomplete
- Put create_energy_points_log inside try catch to avoid document save failure
 2019-03-31 16:42:45 +05:30
Faris Ansari
6f4ef89fb7
fix: Over usage of space was not handled (#7124) 
- Show a message to buy space if space is overused
 2019-03-30 23:40:14 +05:30
Faris Ansari
1dc1801cfb fix: Disable linting on deep_equal util 2019-03-30 23:29:42 +05:30
Faris Ansari
5d195e4157 fix: Save column widths in Custom Reports 2019-03-30 23:22:49 +05:30
Faris Ansari
fd43685695 fix: Datatable fixes 
- Remove minWidth limit
- Double click to resize to perfect width
 2019-03-30 23:21:43 +05:30
Faris Ansari
b48755a9a1
fix: Handle row which can be dict while printing (#7163) 2019-03-29 23:03:42 +05:30
Faris Ansari
4bfec7ca19
fix: wrapper for '.__' (#7159) 2019-03-29 20:22:39 +05:30
Faris Ansari
a0e7f28438 wip 2019-03-29 20:17:37 +05:30
Nabin Hait
b0f9001c72
fix: Ignore symlinks during bench build (#7162) 2019-03-29 20:05:16 +05:30
Himanshu Warekar
7517a4ca0f fix: wrapper for '.__' 2019-03-29 19:05:05 +05:30
Faris Ansari
65484367bd fix: Desktop 
- Customize Shortcuts dialog
- Show / Hide cards dialog
- MultiSelect UI Pills
 2019-03-29 13:16:11 +05:30
Faris Ansari
9c2105dc39
Merge pull request #7139 from surajshetty3416/energy_point_new 
feat: Energy points system
 2019-03-29 12:32:35 +05:30
Suraj Shetty
17e424707c feat: Ability to directly give review points from settings 2019-03-29 11:04:14 +05:30
Suraj Shetty
c578df5347 feat: Link review log with the energy point log created during review 
- This will help us to track the reason for review point deduction
 2019-03-29 11:01:58 +05:30
Suraj Shetty
afceb1f99d test: Fix test for float multiplier 2019-03-29 10:58:04 +05:30
Suraj Shetty
fd9d1142c3 feat: Allow float multipliers 2019-03-29 10:57:26 +05:30
Suraj Shetty
c79ab1279d test: Add test for review 2019-03-29 09:28:37 +05:30
Suraj Shetty
bef48d4268 fix: Use as_dict of doc if exist 
- User can send doc instance instead of object
 2019-03-29 09:28:20 +05:30
Suraj Shetty
b385d91fb0 style: fix formatting 
- remove print statements
 2019-03-29 08:38:25 +05:30
Suraj Shetty
14a41936da fix: Remove unwanted code 
- Fixes "undefined pts" on user master
 2019-03-29 08:28:30 +05:30
Suraj Shetty
aaf046f23f fix: comment out caching code 2019-03-29 07:45:49 +05:30
Suraj Shetty
b968c207d1 Merge branch 'develop' of https://github.com/frappe/frappe into energy_point_new 2019-03-28 19:54:36 +05:30
Prssanna Desai
85fb946392 fix(Assigned To): fix "Assigned To" query for postgres (#7154) 2019-03-28 18:29:12 +05:30
Suraj Shetty
6958c46d6e chore: Add print statements to check the reason for test failure 2019-03-28 17:21:38 +05:30
Faris Ansari
c9fac081b8
Merge pull request #7128 from Mangesh-Khairnar/rating-control 
Feature: Rating control
 2019-03-28 14:16:12 +05:30
Rushabh Mehta
b9c01b4005
Merge pull request #7117 from prssanna/assigned-to-fixes 
fix: Improvements to "Assigned To" dropdown
 2019-03-28 14:04:00 +05:30
Sahil Khan
f085765abd Merge branch 'master' into develop 2019-03-28 13:44:14 +05:30
Sahil Khan
c2b4d28246 Merge branch 'hotfix' 2019-03-28 13:22:14 +05:30
Sahil Khan
bfb96d7639 bumped to version 11.1.17 2019-03-28 13:42:14 +05:50
Suraj Shetty
015ba0417c feat: Add leaderboard link to desktop 2019-03-28 12:37:48 +05:30
Mangesh-Khairnar
b5d1a3aa18 fix: pass fields as array in cypress dialog 2019-03-28 12:05:31 +05:30
Himanshu Mishra
4da80bae91 fix: doctype passed but not used (#7112) 2019-03-28 11:57:15 +05:30
Raffael Meyer
49b6b81a0f fix(integrations): complete file-api migration (#7132) 2019-03-28 11:48:57 +05:30
Suraj Shetty
73c1f531e8 fix: Set default only if the dependent field is set (#7130) 
Client side fix
https://github.com/frappe/frappe/pull/7004
 2019-03-28 11:46:51 +05:30