Commit graph

10045 commits

Author SHA1 Message Date
Anand Doshi
1a4966f949 [minor] sort get_sites 2016-07-04 21:56:33 +05:30
Anand Doshi
a36750d193 Merge branch 'master' into develop 2016-07-04 19:07:19 +05:30
Anand Doshi
d43b93c4d5 Merge branch 'hotfix' 2016-07-04 19:02:44 +05:30
Anand Doshi
552330d2af bumped to version 6.27.23 2016-07-04 19:32:44 +06:00
Anand Doshi
0e4bde0d34 Merge pull request #1846 from anandpdoshi/hotfix
[fix] index and for-update fix in bulk flush, and use only shortjob workers to monitor celery default queue
2016-07-04 19:01:36 +05:30
Anand Doshi
a86c22032e [fix] index and for-update fix in bulk flush, and use only shortjob workers to monitor celery default queue 2016-07-04 18:30:25 +05:30
Rushabh Mehta
9744c71399 [fix] ifnull in db_query 2016-07-04 17:07:38 +05:30
Rushabh Mehta
fa6f279398 Merge pull request #1837 from netchampfaris/remove-offcanvas
added dropdown, disabled offcanvas in portal
2016-07-04 16:14:33 +05:30
Rushabh Mehta
7e3fb26ac5 Merge pull request #1844 from ly0/patch-3
Forgot add self
2016-07-04 16:14:00 +05:30
latyas(懒)
58901e644b Forgot add self 2016-07-04 18:42:11 +08:00
Rushabh Mehta
db73d44897 Merge pull request #1842 from ly0/patch-2
self.route does not initiate
2016-07-04 16:05:09 +05:30
Faris Ansari
793d35e3a5 rebuild docs.css 2016-07-04 16:03:38 +05:30
latyas(懒)
9634688d17 self.route does not initiate
Or exception raises in `validate` method.
2016-07-04 18:32:20 +08:00
Faris Ansari
c05e139366 dropdown in portal fixed 2016-07-04 15:54:11 +05:30
Faris Ansari
27c82879a0 [minor] Don't show underline on hover in autosuggest 2016-07-04 15:54:11 +05:30
Faris Ansari
471e1aab8e [minor] indentation 2016-07-04 15:54:11 +05:30
Rushabh Mehta
645bfc8392 Merge pull request #1841 from shubham7saxena/frappe-multiple-comments
the user can now add multiple comments without refreshing the page
2016-07-04 15:52:33 +05:30
shubham7saxena
1feb30035a the user can now add multiple comments without refreshing the page on any doctype 2016-07-04 15:17:01 +05:30
Nabin Hait
bbb3391300 removed print statement 2016-07-04 11:40:32 +05:30
Rushabh Mehta
58caa7bbca [cleanup] [style] links cleanups and form-css 2016-07-04 11:38:31 +05:30
Rushabh Mehta
e42d401af4 Merge pull request #1839 from KanchanChauhan/ignore-child-tables-added-mappers
ignore child table parameter added to mapper.py
2016-07-04 10:53:51 +05:30
Anand Doshi
0de6c8b565 Merge pull request #1840 from anandpdoshi/fix/retry-job-on-deadlock
[fix] retry a job on deadlock or lock-wait-timeout
2016-07-04 00:42:33 +05:30
Anand Doshi
820a1e01a6 [fix] added set-limits, changed clear-limit to clear-limits 2016-07-04 00:32:32 +05:30
Anand Doshi
2c98f146c1 [fix] retry a job on deadlock or lock-wait-timeout 2016-07-03 16:14:50 +05:30
Anand Doshi
5b5d1fb026 [hotfix] check owner in prepare timeline item 2016-07-02 22:43:23 +05:30
Anand Doshi
cafd29ab70 [fix] Yandex port and tls 2016-07-02 21:58:04 +05:30
Anand Doshi
662b6d4694 [fix] Edit DocType in Single DocType Menu, render message fix 2016-07-02 20:50:05 +05:30
Kanchan Chauhan
e590e37f3d ignore child table parameter added to mapper.py 2016-07-02 18:43:21 +05:30
Anand Doshi
b01edff59a [minor] backup naming to use datetime_random_string_database.sql instead of date_random_number_database.sql 2016-07-01 15:34:28 +05:30
Rushabh Mehta
6697c3a156 Merge pull request #1836 from rohitwaghchaure/new_file_print_format
Moved download_multi_pdf, download_pdf, report_to_pdf to new file print_format.py
2016-07-01 14:37:52 +05:30
Rohit Waghchaure
e275f1a7cb Moved download_multi_pdf, download_pdf, report_to_pdf to new file print_format.py 2016-07-01 13:14:18 +05:30
Rushabh Mehta
0a5c6a3e79 [minor] [fixes
]
2016-06-30 17:02:23 +05:30
Rushabh Mehta
f0b8677295 Merge pull request #1831 from rohitwaghchaure/print_doc
Added doc in download_pdf method
2016-06-30 16:31:39 +05:30
Rohit Waghchaure
cf4e65e8f6 Added doc in download_pdf method 2016-06-30 16:29:44 +05:30
Rushabh Mehta
94e12105a9 Merge pull request #1830 from saurabh6790/treeview_enhance
[fix] consider route options while generating filters
2016-06-30 15:55:18 +05:30
Saurabh
aeb0cb4470 [fix] consider route options while generating filters 2016-06-30 13:26:54 +05:30
Rushabh Mehta
94521f66b0 Merge pull request #1827 from netchampfaris/portal-redesign
Portal redesign
2016-06-29 16:57:35 +05:30
Faris Ansari
c115b77f74 removed unnecessary viewport check 2016-06-29 16:54:13 +05:30
Faris Ansari
6397d1d250 [enhance] added back navigation to list view 2016-06-29 16:11:41 +05:30
Faris Ansari
16827f022d redesigned mobile view 2016-06-29 16:11:41 +05:30
Anand Doshi
b3e6eca6da [fix] [patch] re-route only if not a duplicate route, else ignore 2016-06-29 15:28:24 +05:30
Rushabh Mehta
daac918f29 Merge pull request #1826 from neilLasrado/develop
Make frappe.session_user available for web_forms
2016-06-29 14:53:25 +05:30
Neil Trini Lasrado
ec464b09c1 Make frappe.session_user available for web_forms 2016-06-29 14:52:06 +05:30
Anand Doshi
87da8abd6a [feature] robots.txt - uses Website Settings or frappe.local.conf.robots_txt (file path) 2016-06-29 13:25:43 +05:30
Anand Doshi
568b0380a1 [fix] strip html of title in listview 2016-06-29 12:57:23 +05:30
Anand Doshi
c9cd47b611 [fix] strip html of title 2016-06-29 12:54:53 +05:30
Anand Doshi
aaabd81329 [enhancement] auto-link URLs in Text Editor using bleach.linkify 2016-06-29 12:49:20 +05:30
Rushabh Mehta
1d21979e7d Merge pull request #1820 from KanchanChauhan/newsletter-moved-to-frappe
Newsletter moved to Frappe
2016-06-29 11:00:26 +05:30
Rushabh Mehta
a9ce86a725 Merge pull request #1825 from rohitwaghchaure/print_doc
[Enhancement] Print doc without get doc, pass self/doc in attach_print(doc=self) method
2016-06-29 10:59:38 +05:30
Rushabh Mehta
478f8766dc Merge pull request #1822 from shubham7saxena/frappe_sidebar
added sidebar title field
2016-06-29 10:57:31 +05:30