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

882 commits

Author SHA1 Message Date
Rushabh Mehta
d610ce9522 fix(tests): tests and linting 2019-02-13 16:50:34 +05:30
Rushabh Mehta
a1eb5bf9b3 fix: add tests 2019-02-09 15:22:21 +05:30
Rushabh Mehta
9a3bafdcfd fix(test): test and mandatory in blog post 2019-02-09 11:59:29 +05:30
Rushabh Mehta
ae097e5139 fix: tests, check for spam comments 2019-02-07 16:35:50 +05:30
Rushabh Mehta
41d90fa6d1 BREAKING CHANGE: Comments are now handled separately from Communication and Version 2019-02-07 16:35:50 +05:30
Rushabh Mehta
7ae4701aad chore(linting) 2019-02-06 15:50:57 +05:30
Rushabh Mehta
4d586c20aa fix(router.py): meta -> meta_tags 2019-02-06 15:50:57 +05:30
Rushabh Mehta
65d2167551 feat: various fixes to Web Form and content type selection for Web Page and Blog Post 2019-02-06 15:50:57 +05:30
Sagar Vora
89efa968d8 Merge branch 'master' into develop 2019-02-05 18:39:43 +05:30
Aditya Hase
57196a8bbe fix(website): Enable socketio on website (for file upload) (#6866) 2019-01-31 13:54:42 +05:30
Saurabh
76bd4e4f19 Merge branch 'master' into develop 2019-01-30 12:36:43 +05:30
gmplab
bcb121bd03
Update purifycss.py 
minor fix print_funciton->print_function
 2019-01-29 21:34:50 +08:00
Sagar Vora
ef82f39f99 Merge branch 'staging' into develop 2019-01-29 18:24:11 +05:30
Aditya Hase
928ec12d35 fix(import): Import print_function once 2019-01-28 14:54:55 +05:30
Rushabh Mehta
f537d75946
feat: Allow website templates to have different base templates (#6811) 
* feat: Allow website templates to have different base templates

* test: custom base template
 2019-01-27 20:46:23 +05:30
Aditya Hase
837bfc0995 fix(unicode): Import unicode_literals in every file (#6805) 
* fix(unicode): Import unicode_literals in every file

* fix(unicode): Test if safe_json_loads return unicode instead of bytes
 2019-01-25 11:56:27 +05:30
Aditya Hase
6b72faf44f style: Linting fixes (#6809) 
* style: Remove unused imports

* style: Remove unused local variables
 2019-01-23 16:39:55 +05:30
Saif
c7c82ff972 WebsiteGenerator call super class clear_cache (#6786) 2019-01-22 11:28:26 +05:30
Saurabh
d1bed88f3f Merge branch 'staging' into develop 2019-01-15 19:14:06 +05:30
Rushabh Mehta
258c59c218 fix(ui): default icon for Web Page 2019-01-11 12:11:29 +05:30
Rushabh Mehta
b66d233360 merge: staging-fixes for latest test fixes 2019-01-03 15:28:36 +05:30
Shivam Mishra
b86663490c [Base 64 Fix]: Added check for base64 image in abs_url (#6688) 
* [Base 64 Fix]: Added check for base64 image in abs_url

The abs_url filter used in website appends a '/' before every link.
This broke the website image display.

* fix(abs_url): add check for all image types

* Update utils.py
 2019-01-02 09:11:05 +05:30
Saurabh
d5fdc670f7 Merge branch 'staging' into develop 2019-01-01 14:26:16 +05:30
Chinmay Pai
825b0120fa fix(login): redirect user from login page if already logged in (#6689) 
* fix(login): redirect user from login page if already logged in

the user should not be able to access the login page if a user session already exists. closes #6500.

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>

* fix(test-website): fix website test

what is the point in writing tests if they don't really work/function as intended?

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>

* fix(regex): do not replace '\' in rules

that defeats the entire purpose of creating rules, wtf?

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>

* fix(test_website): change user using set_user()

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>

* redirect: prefix string with r to escape string literals

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
 2018-12-31 13:46:55 +05:30
Frappe Bot
0499b4a845 Merge branch 'staging' into develop 2018-12-26 12:03:03 +00:00
Suraj Shetty
45911faa23
Merge branch 'staging-fixes' into staging-fixes 2018-12-18 15:26:11 +05:30
Saurabh
2de5dfdbb3 Merge branch 'staging' into develop 2018-12-18 10:20:24 +05:30
Faris Ansari
d6833996d3 fix: Include meta_block in Web Page (#6627) 2018-12-17 13:55:32 +05:30
Suraj Shetty
9a0ff3bad0 Merge branch 'staging-fixes' of https://github.com/frappe/frappe into staging-fixes 2018-12-10 16:27:00 +05:30
Frappe Bot
b2779c617a Merge branch 'staging' into develop 2018-12-06 09:31:40 +00:00
Frappe Bot
b39bbe9baf Merge branch 'master' into staging-fixes 2018-12-06 09:09:06 +00:00
Saif
7610d6fb05 WebsiteGenerator call super class clear_cache (#6542) 2018-12-03 09:35:03 +05:30
Aditya Hase
e3ae0722c4 fix(security): Make Jinja tighter (#6564) 2018-11-29 17:24:46 +05:30
rohitwaghchaure
1cb64cf06e fix: Web form grid view for Text Editor showing toolbar (#6547) 2018-11-28 10:14:11 +05:30
Suraj Shetty
e79cfc531a Merge branch 'staging-fixes' of https://github.com/frappe/frappe into staging-fixes 2018-11-21 13:18:33 +05:30
Frappe Bot
4426a321e4 Merge branch 'staging' into develop 2018-11-15 09:16:23 +00:00
Aditya Hase
2858118f91 fix(chat): Setup and render chat on website pages as well 2018-11-13 12:48:26 +05:30
Ameya Shenoy
d0e7690ae2
Merge branch 'staging' into develop 2018-11-05 06:48:46 +00:00
Suraj Shetty
1d0037d9b1 Fix codacy 2018-11-05 10:39:28 +05:30
Suraj Shetty
4b0f78a6d5 Add test to check contextual user permission 2018-11-01 21:18:15 +05:30
Faris Ansari
10c2e8f262 fix: Only allow images in Attach Image 2018-11-01 19:38:07 +05:30
Nabin Hait
d37d111f61 Fixed merge conflict 2018-10-15 15:53:26 +05:30
Nabin Hait
b218a16dc3 fix(name): naming of workflow action based on hash 2018-10-15 14:21:40 +05:30
Zlash65
b3865174e4 add an option to route to success message for logged in user 2018-10-10 18:19:07 +05:30
agustincl
899b5d4d0f Update Web Form header buttons (#6190) 
The headers buttons needs to have absolute path in order to function, otherwise the pathname and the route is concatenated.
 2018-10-05 11:26:01 +05:30
Prateeksha Singh
bcef7b8ef3
Merge pull request #6089 from jodeq/view-attachments-in-web-form 
[Proposal] View attachments in Web Form
 2018-09-26 00:16:51 +05:30
Mohamed_Alsum
97fb641583 Fix webform error while loading (#6134) 
* remove dublicate error mgs on submit web_form

* show side-bar in RTL lang

* fix webfrom success msg
 2018-09-25 21:58:55 +05:30
Faris Ansari
171c650ddf
Merge pull request #6055 from Thunderbottom/file-api 
Streamlined File API based on ORM
 2018-09-25 17:38:04 +05:30
Govind S Menokee
e6d5a61186 [FIX] Slideshow images should be a list but instead map object is being passed (#6103) 
Files should be passed as a list. Here it is being passed as a map object.
 2018-09-24 12:45:55 +05:30
Chinmay Pai
6e84bbe80d
Merge branch 'develop' into file-api 2018-09-21 13:42:32 +05:30