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

457 commits

Author SHA1 Message Date
Suraj Shetty
e4bdbed414 Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui 2021-01-21 11:20:18 +05:30
Suraj Shetty
e2c763c989 feat: Add avatar macro 2021-01-21 11:14:04 +05:30
prssanna
e54a1262b4 Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui 2021-01-20 17:57:46 +05:30
prssanna
f363863b8c fix: website fixes 
-move modal and icon styles to common

primary navbar theme
 2021-01-20 17:56:05 +05:30
Suraj Shetty
b94d5778a8 Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui 2021-01-19 10:36:50 +05:30
Sagar Vora
54f9b894ed fix: add yesterday and tomorrow to timespan; optimise get_timespan_date_range 2021-01-07 21:24:23 +05:30
Rushabh Mehta
b2686e0623 fix(routing): removed /space from routing 2021-01-01 12:30:35 +05:30
Rushabh Mehta
90363f4ba9 fix(routes): minor fixes to route, favion, setup-wizard 2020-12-18 13:17:28 +05:30
Suraj Shetty
25dc9ee222 Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui 2020-12-11 13:02:36 +05:30
Faris Ansari
6289d7dd59
Merge pull request #12056 from anupamvs/date-format 
feat: added data format support DD-Mon-YY
 2020-12-10 11:17:38 +05:30
Shivam Mishra
c5d0830553 fix: cint seconds before operations 2020-12-10 10:37:29 +05:30
Anupam
e197a6fd7f feat: added data format support DD-Mon-YY 2020-12-08 17:07:32 +05:30
Rushabh Mehta
ff71329b03 fix(merge): develop 2020-12-02 10:54:10 +05:30
Rushabh Mehta
75fe8a615a feat(app): move /desk to /app 2020-11-11 16:31:47 +05:30
prssanna
7f43169c4a refactor: reorganise date functions indashboard_chart.py 2020-10-28 00:11:43 +05:30
prssanna
969aa86e68 fix: calculate chart data from beginning of period 
- show period as label
 2020-10-27 17:59:56 +05:30
Rucha Mahabal
175c2fdb65
Merge branch 'develop' into fix-duration-control-import-export 2020-09-23 09:39:32 +05:30
Rushabh Mehta
70baf49c6e fix(data): dont try casting if doctype is missing 2020-09-21 10:28:11 +05:30
Rushabh Mehta
334ae82e52 fix(naming): added multiple rules for naming series 2020-09-21 10:28:11 +05:30
Faris Ansari
bbdbc0d947 Merge remote-tracking branch 'upstream/develop' into aaaa-website-enhancements-for-redesign 2020-09-18 16:17:15 +05:30
Rucha Mahabal
29fc0a8c0c fix: validate duration value while converting to seconds 2020-09-17 11:47:39 +05:30
Faris Ansari
627aff4bb8 fix: Handle jpe files in image_to_base64 2020-09-14 15:21:22 +00:00
Faris Ansari
cc9fdd690a fix: Check if file exists before generating base64 2020-09-11 19:22:34 +05:30
Faris Ansari
4a58f2224c fix: Ignore SVG images 2020-09-10 15:33:57 +05:30
Aditya Hase
3349c9f942
fix(minor): Prevent path traversal 2020-09-04 16:31:10 +05:30
Rushabh Mehta
8c8f7313f4
fix(minor): make utils explicit in safe_globals (#11408) 
* fix(minor): make utils explicit in safe_globals

* fix(minor): import subprocess

* fix(minor): fix globals in safe_eval;

* fix(minor): import subprocess

* fix(minor): add test

* fix(minor): webhook.py

* fix(minor): document_type_mapping.py
 2020-09-03 14:26:01 +05:30
Rushabh Mehta
9eb9030381 fix(minor): move get_source_value to data_migration_mapper 2020-09-03 08:42:42 +05:30
Rucha Mahabal
c0b4532ea5 fix: Handle duration fieldtype for Data Import 2020-09-02 15:58:08 +05:30
Suraj Shetty
1ff9bdca9a
Merge branch 'develop' into invalid-date-filter 2020-08-12 16:47:59 +05:30
Saqib Ansari
2076a81d29 fix: catch only expected error 2020-08-10 17:52:26 +05:30
Shivam Mishra
34c3d57767
feat: validate json when saving desk page (#11095) 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-08-06 00:01:11 +05:30
Saqib Ansari
af8771d5dc fix: throw message for invalid date filter 2020-07-27 15:51:44 +05:30
Faris Ansari
4eb4563de5 fix: remove unused variables 2020-07-09 13:57:09 +05:30
Faris Ansari
89d2c064a9 fix: Guess more date formats 
Can guess the following formats now:
- 7 May 2020
- 1 Jan 2020
 2020-07-09 13:49:49 +05:30
Suraj Shetty
bc728dc857
Merge branch 'develop' into currency_precison_fix 2020-06-24 08:56:05 +05:30
Rucha Mahabal
39979c0d2d fix: sider issue 2020-06-20 20:20:28 +05:30
Rucha Mahabal
32afd414ab fix: check date string is exactly equal to None 2020-06-20 20:07:19 +05:30
Faris Ansari
2ec31e3f01 Merge branch 'develop' of https://github.com/frappe/frappe into dib-fixes-2020-05-18 2020-06-10 21:26:54 +05:30
Deepesh Garg
db5888e2f9 fix: Consider fraction units for precision 2020-06-10 14:36:31 +05:30
mergify[bot]
6135dece3d
Merge pull request #10576 from ruchamahabal/fix-duration-options 
fix: Change 'show' to 'hide' in Duration field properties
 2020-06-10 05:59:59 +00:00
Suraj Shetty
e389dcf6fe
Merge branch 'develop' into dib-fixes-2020-05-18 2020-06-09 15:26:46 +05:30
Faris Ansari
b7acd312ad
Merge pull request #10586 from scmmishra/image-grid 2020-06-08 17:01:43 +05:30
Faris Ansari
19660367bd
Merge pull request #10571 from frappe/page-builder-2020-05-17 2020-06-08 15:49:02 +05:30
Suraj Shetty
60649122db
Merge branch 'develop' into fix-duration-options 2020-06-07 21:14:54 +05:30
Suraj Shetty
dde11a50e9
fix: Handle invalid date parsing (#10614) 2020-06-07 20:25:11 +05:30
Gavin D'souza
fc6aeada2b Merge branch develop into page-builder-2020-05-17 2020-06-05 18:24:22 +05:30
Shivam Mishra
56019241ac fix: KeyError['JPG'] 2020-06-04 16:54:38 +05:30
Deepesh Garg
cae267723f fix: Incorrect currency precision 2020-06-04 13:40:28 +05:30
Rucha Mahabal
3a0aa88f4b fix: change 'show' duration options to 'hide' for consistency 2020-06-02 22:06:37 +05:30
prssanna
b291e0aaa9 feat: add timespan option for today 2020-06-01 10:52:07 +05:30