Commit graph

1795 commits

Author SHA1 Message Date
Sahil Khan
94bfc16bfb fix: declare site_config_backup_path variable before referencing 2020-06-29 19:30:43 +05:30
Revant Nandgaonkar
ec881a4977 fix: remove unused variable 2020-06-27 20:47:53 +05:30
Revant Nandgaonkar
1bfa56cd0c feat: backup and restore postgres site 2020-06-27 16:01:30 +05:30
Revant Nandgaonkar
86ee3bae1f fix: site_config backup file naming
naming matches other names
{time_stamp}-{site_slug}-{file_name}
2020-06-24 12:26:46 +05:30
mergify[bot]
c1dab6af4e
Merge pull request #10582 from deepeshgarg007/currency_precison_fix
fix: Incorrect currency precision
2020-06-24 03:40:12 +00:00
mergify[bot]
fe09b8f8f1
Merge pull request #10598 from surajshetty3416/fix-text-editor-issues
fix(text-editor): List UI
2020-06-24 03:27:46 +00:00
Suraj Shetty
bc728dc857
Merge branch 'develop' into currency_precison_fix 2020-06-24 08:56:05 +05:30
mergify[bot]
aacf9e32dc
Merge pull request #10765 from sahil28297/site_config_backup
feat: take site_config backup
2020-06-23 09:41:33 +00:00
Sahil Khan
912a811ac1 chore: consistent naming for site_config backups 2020-06-23 14:29:16 +05:30
Gavin D'souza
52ba5c9b79 fix: Handle progress updates if command not executed via terminal 2020-06-23 12:46:26 +05:30
mergify[bot]
e62ccbf93a
Merge pull request #10739 from gavindsouza/termianl-progress-updates
fix: update progress bar wrt terminal size
2020-06-23 04:14:27 +00:00
Chinmay Pai
3a6a03f4c9
chore: use common timestamp 2020-06-22 19:54:24 +05:30
Suraj Shetty
19e38502c1
Merge branch 'develop' into fix-text-editor-issues 2020-06-22 17:10:51 +05:30
Sahil Khan
2a303d0ffd feat: take site_config backup
Co-authored-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-06-22 17:00:03 +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
Gavin D'souza
064a0ae4e2 fix: update progress bar wrt terminal size 2020-06-19 12:00:45 +05:30
Suraj Shetty
6d833cf477
Merge branch 'develop' into replace-old-data-import 2020-06-16 20:46:56 +05:30
Shivam Mishra
68528ca23d
Merge pull request #10688 from scmmishra/dashboard-import
fix: handle import error explicitly
2020-06-16 13:30:42 +00:00
Emil
edcdb66b92
🎨 Change indetions to tabs
Signed-off-by: Emil <amionv99@gmail.com>
2020-06-15 12:30:44 +03:00
Shivam Mishra
970cf01eb0 fix: handle import error explicitly 2020-06-15 13:17:35 +05:30
Emil
8a9ba93119
🎨 change construction for not in
Signed-off-by: Emil <amionv99@gmail.com>
2020-06-14 14:31:17 +03:00
Emil
267d3119f1
🐛 Return way of checking path
Signed-off-by: Emil <amionv99@gmail.com>
2020-06-14 13:26:43 +03:00
Emil
3bc66bfea1
add another way to check path
Signed-off-by: Emil <amionv99@gmail.com>
2020-06-14 12:28:21 +03:00
Emil
d25b141451
Expand list with extensions for template rendering
Signed-off-by: Emil <amionv99@gmail.com>
2020-06-14 11:37:50 +03:00
Shivam Mishra
a4e4b8ba26 fix: catch all exception in get_config 2020-06-12 15:54:24 +05:30
Faris Ansari
0e5b3769e4 feat: Ability to import data from Google Sheets 2020-06-12 12:33:37 +05:30
Faris Ansari
5a1ce409b6 fix: Add method to import data from file
- Update import paths to use data_import module
- Data Import Beta -> Data Import
2020-06-11 18:02:25 +05:30
Faris Ansari
6f80a0b462 fix: Data Import -> Data Import Legacy 2020-06-11 18:02:25 +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
Suraj Shetty
8150d65084 fix: Remove linkify to retain spaces in text-editor 2020-06-06 10:49:31 +05:30
Gavin D'souza
fc6aeada2b Merge branch develop into page-builder-2020-05-17 2020-06-05 18:24:22 +05:30
Faris Ansari
f7158ad5f6 fix: Obey config for global search of web routes 2020-06-05 15:39:25 +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
Suraj Shetty
54be7076ee
Merge branch 'develop' into error-snapshot-fix 2020-06-02 12:40:07 +05:30
mergify[bot]
eabdb84947
Merge pull request #10528 from gavindsouza/migrate-to-new-feat
feat(migrate-to): switch Teams and restore existing Sites
2020-06-02 06:57:42 +00:00
mergify[bot]
e1f20594a4
Merge pull request #10463 from prssanna/date-filters
feat: Date filter improvements
2020-06-01 16:30:35 +00:00
Gavin D'souza
079da0b645 Merge branch 'develop' of github.com:frappe/frappe into no-site-specified 2020-06-01 12:23:16 +05:30
prssanna
b291e0aaa9 feat: add timespan option for today 2020-06-01 10:52:07 +05:30
prssanna
1b691c799d refactor: refactor get_date_range 2020-06-01 10:52:07 +05:30
prssanna
3a55ba0d58 fix: missing newline 2020-06-01 10:52:06 +05:30