Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,830 Commits 3 Branches 0 Tags 1 GiB
8621869d24
Commit Graph

127 Commits

Author SHA1 Message Date
Ameya Shenoy
7658bdc00a
Merge branch 'staging' into develop 2018-10-23 08:06:15 +00:00
Rohit Waghchaure
55416e08f1 [Fix] Marketplace setting permission error 2018-10-23 11:52:06 +05:30
Chinmay Pai
905c0ff978 File api (#15637) 
* file-api: major refactor

migrate from file_manager.py to file.py

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

* file-api: migrate to file-api

remove file_manager stuff and migrate to file-api

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
 2018-10-15 10:38:53 +05:30
Faris Ansari
31e5431fe0 fix(urljoin): 2 and 3 compatible (#15401) 2018-09-14 15:31:35 +05:30
Nabin Hait
5be3968544 fix(add_file): added missing init file 2018-09-12 18:56:15 +05:30
Saurabh
393dd4286a [resolved] merge-conflicts 2018-09-12 14:48:30 +05:30
Prateeksha Singh
62f5cd2dee [hub] add Item Manager permission to Hub Tracked Item 2018-09-10 11:39:48 +05:30
Prateeksha Singh
df327f2974 [remove-hub] delete hub module 2018-09-06 13:34:47 +05:30
Prateeksha Singh
3ccbb8f8b7 [remove-hub] delete hub_settings and hub_category 2018-09-06 13:28:47 +05:30
Prateeksha Singh
8a160684b7 [fix] filter() result in list 2018-09-04 10:59:20 +05:30
Faris Ansari
49ccdd6f07 fix: Move image saving code to hub server 2018-09-03 17:24:17 +05:30
Faris Ansari
ad0be6aaa2 fix: Messages 
- update messages according to new doctype
- sync logo in seller registration
- hub.is_seller_registered() and hub.is_user_registered() api
- Add Users dialog
 2018-09-03 15:43:09 +05:30
Prateeksha Singh
47cc30da85 [hub] ask company description in dialog 2018-09-03 13:11:23 +05:30
Prateeksha Singh
85563ddfd3 [hub] update publish hub api 2018-09-03 02:44:27 +05:30
Prateeksha Singh
a094c0f3f1 [fix] encrypted password in Hub User child record by frappe/frappe#6048 
- use save() instead of insert()
 2018-09-02 19:45:56 +05:30
Faris Ansari
68129df74c feat: Add add_user dialog and methods 
- wip
 2018-09-02 18:29:00 +05:30
Prateeksha Singh
b2b745fc7a [hub] simplify marketplace settings, remove company fields 
- Company attributes will be fetched/calculated to send to server
- removed them as fields in settings
- Added description in company, with existing logo field
- TODO: for things like logo and description, ask user to set in master
 2018-09-01 17:20:08 +05:30
Faris Ansari
255dd0e03d feat: Add new registration flow 2018-09-01 14:30:46 +05:30
Prateeksha Singh
4e1fd0b417 [hub] register_seller -> register_marketplace 
- resgister_seller will be for subsequent users
- make username and password readonly
- check if password present before trying to create connection
 2018-09-01 09:55:43 +05:30
Prateeksha Singh
810ae01832 [hub] make client connection for first registered user 
- remove usage of Hub Connector
 2018-09-01 01:14:29 +05:30
Prateeksha Singh
1801cc8962 [fix] hub_url -> marketplace_url 2018-09-01 00:39:08 +05:30
Prateeksha Singh
747c464248 [fix] save() -> insert() for single doc, use doc.append in child table 2018-09-01 00:12:17 +05:30
Prateeksha Singh
a8065ff725 [hub] move register_seller to api, remove old code 2018-08-31 22:41:26 +05:30
Prateeksha Singh
c726fce4b1 [hub] set first user's password in marketplace users 2018-08-31 20:42:48 +05:30
Prateeksha Singh
ea2b9cbd1c [hub] add user selection in register 2018-08-31 17:56:50 +05:30
Faris Ansari
dc1a2e2a37 fix: Allow read permission to everyone on Marketplace Settings 2018-08-31 17:31:22 +05:30
Faris Ansari
c05bf262f1
Merge pull request #15279 from netchampfaris/marketplace-fixes-3 
- feat: Add disable marketplace option in Hub Settings
- fix: Rename Hub Settings -> Marketplace Settings
 2018-08-31 16:52:26 +05:30
Faris Ansari
f9a66c1c36 fix: Rename Hub Settings -> Marketplace Settings 2018-08-31 16:30:34 +05:30
Faris Ansari
25f509ebd3 feat: Add disable marketplace option in Hub Settings 2018-08-31 15:35:32 +05:30
Faris Ansari
00f6aef947 fix(publish items): Filter out disabled items (#15268) 2018-08-30 18:54:28 +05:30
Prateeksha Singh
5797565dd0 Merge with upstream 2018-08-30 16:15:27 +05:30
Prateeksha Singh
a4c24bda65 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-30 12:01:39 +05:30
Prateeksha Singh
b20c4e3184 [hub] remove client hub_settings scripts 
- multiline to single line messages to translate
 2018-08-30 12:01:04 +05:30
Faris Ansari
d32e7f8d02 fix: Administrator cannot register on marketplace 2018-08-30 11:53:46 +05:30
Faris Ansari
95e4141bf2 fix: Remove unused imports 2018-08-30 11:46:14 +05:30
Prateeksha Singh
89ed2d9b34 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-30 02:33:28 +05:30
Prateeksha Singh
a6f184bcb7 [hub] remove old post and preprocess, log with minimal info 2018-08-30 02:30:40 +05:30
Faris Ansari
114d595de9 fix: Set hub_url in Hub Settings 
- add patch to set the value
 2018-08-29 18:24:49 +05:30
Faris Ansari
e4c7729089 fix(Hub Settings): Set site_name before seller registration 2018-08-29 17:13:43 +05:30
Faris Ansari
b7126c23f7 fix(Hub Settings): Remove unused fields 2018-08-29 17:13:16 +05:30
Faris Ansari
458cf6fcc5 style: remove trailing spaces 2018-08-29 16:19:39 +05:30
Faris Ansari
8683bd82ed fix: Base64 extraction 
- use requests to fetch the image without storing it anywhere
- only read local files
 2018-08-29 16:18:36 +05:30
Faris Ansari
ff8f1c6120 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-29 15:02:47 +05:30
Faris Ansari
64202ad416 fix: Only a System Manager can register as a seller 
- every other user has read only access
 2018-08-29 15:02:39 +05:30
Prateeksha Singh
02c176c0e6 [hub] fix code lint issues, styles 2018-08-29 14:27:47 +05:30
Nabin Hait
a804d6d487 Fixed merge conflict 2018-08-29 13:34:58 +05:30
Faris Ansari
811a2deb0f fix: Load and save base64 image in publish 2018-08-28 17:17:29 +05:30
Prateeksha Singh
40f7c4663a [hub][vue] Publish Page 2018-08-24 16:38:34 +05:30
Faris Ansari
c4e38ffd4d Remove hub page (#15195) 2018-08-23 11:09:31 +05:30
Suraj Shetty
f9e4cca334 Throw error if hub_url is not present in site_config 2018-08-22 11:32:49 +05:30