Mercurial
Mercurial
>
pub
>
hg
>
cubicweb
/ graph
summary
|
shortlog
|
changelog
| graph |
tags
|
bookmarks
|
branches
|
files
|
zip
|
gz
|
bz2
|
help
less
more
|
(0)
-3000
-1000
-240
+240
+1000
+3000
tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or
revset expression
.
The revision graph only works with JavaScript-enabled browsers.
cleanup
stable
2010-06-02, by Sylvain Thénault
[external storage] refactor to give session to storage's callback (needed by vcsfile storage)
stable
2010-06-02, by Sylvain Thénault
[navigation] use pageContent instead of paginated-content as default div id, paginated-content doesn't seems used anymore
stable
2010-06-02, by Sylvain Thénault
[test] update test to follow recent navigation/facets fixes
stable
2010-06-02, by Sylvain Thénault
[tableview] use pageContent instead of paginated-content as default div id, paginated-content doesn't seems used anymore
stable
2010-06-02, by Sylvain Thénault
[sparql] improve error reporting and fix one bug
stable
2010-06-01, by Nicolas Chauvat
[test] add missing __main__ as expected by apycot pyunit checker
stable
2010-06-01, by Sylvain Thénault
[tableview] don't fail with AttributeError when paginated as main content view
stable
2010-06-01, by Sylvain Thénault
[facet] we must add type restriction for attribute facets as well
stable
2010-06-01, by Sylvain Thénault
[tableview] support for json-paginated table if paginable
stable
2010-06-01, by Sylvain Thénault
[navigation] view may implements page_navigation_url to handle them self url generated for pagination
stable
2010-06-01, by Sylvain Thénault
[navigation] when there are to much results, use a <select> based page navigation
stable
2010-06-01, by Sylvain Thénault
[primary] add missing version number to deprecation warnings
stable
2010-06-01, by Sylvain Thénault
[sparql] fix type inference (test_dctitle_both_project_cwuser) and support for <http://www.w3.org/1999/02/22-rdf-syntax-ns#type tag (test_base_rdftype)
stable
2010-06-01, by Sylvain Thénault
[form] remove double property call
stable
2010-06-01, by Stephanie Marcu
cleanups
2010-06-01, by Sylvain Thénault
[sparql] add failing test for two entities with dc:title
stable
2010-05-30, by Nicolas Chauvat
[sparql] adding test for "rdf:type -> is"
stable
2010-05-30, by Nicolas Chauvat
proof read documentation
stable
2010-05-29, by Alexandre Fayolle
skip flymake junk when reloading
stable
2010-05-29, by Alexandre Fayolle
merge back to stable some changes made on site for a customer.
stable
2010-05-29, by Alexandre Fayolle
[win32 SQLServer] connection lost detection
stable
2010-05-29, by Alexandre Fayolle
ldap: reset cache when a user is deleted
stable
2010-05-29, by Alexandre Fayolle
ldap source logging
stable
2010-05-29, by Alexandre Fayolle
forbid looping tasks with an interval of 0
stable
2010-05-29, by Alexandre Fayolle
/siteinfo page: display information about the names of the running threads
stable
2010-05-29, by Alexandre Fayolle
[win32 service] activate logging to the configured file as soon as possible
stable
2010-05-29, by Alexandre Fayolle
[bfss] Rename filenames according to their metadata on entity update.
stable
2010-05-28, by Pierre-Yves David
[form] missing return...
stable
2010-05-26, by Sylvain Thénault
[adapters] fix NameError introduced by adapters refactoring
2010-05-26, by Sylvain Thénault
[security] fix security insertion on DISTINCT queries
stable
2010-05-26, by Sylvain Thénault
[adapters] fix bad copy and past....
2010-05-26, by Sylvain Thénault
backport stable
2010-05-26, by Sylvain Thénault
[rql2sql] properly compute scope for variable from temporary tables
stable
2010-05-26, by Sylvain Thénault
[form] fix bw compat issue introduced by 5588:377c9adfe81e
stable
2010-05-26, by Sylvain Thénault
[web] update to 3.9 Entity api
2010-05-26, by Sylvain Thénault
backport stable
2010-05-26, by Sylvain Thénault
[migration] force 3.8.3 migration, and fix it (same_as not necessarily there, missing group change for max-post-length)
stable
2010-05-26, by Sylvain Thénault
[forms] refactor action handling to ease overriding while keeping action overrideable by instance (closes #969167)
stable
2010-05-26, by Sylvain Thénault
[web] dont attempt to update last login time on ldap users, avoiding spurious tb in logs (closes #914464)
stable
2010-05-26, by Sylvain Thénault
[c-c] use logilab.database, not lgc.db
stable
2010-05-26, by Sylvain Thénault
[sqlite] fix crash on db-create with sqlite abd unexistent database due to missing paren in logical expression (closes #909604)
stable
2010-05-26, by Sylvain Thénault
[web] disallow authenticated users to access to the login form (closes #914873)
stable
2010-05-26, by Sylvain Thénault
[reledit] #894131: use "<`attribute` unset>" instead of generic "<not specified>" when an attribute or relation has no value
stable
2010-05-26, by Sylvain Thénault
[rql2sql] follow rql 0.26.1 changes: NOT nodes normalization, allowing simplification of sql generation, and fix #XXX
stable
2010-05-26, by Sylvain Thénault
[repo] ensure thread is alive before calling .join. Closes #963580
stable
2010-05-25, by Sylvain Thénault
[migration] add migration file commands to follow option group changes
stable
2010-05-25, by Sylvain Thénault
fix 978144: exception with view send-email if empty subject
stable
2010-05-25, by Sylvain Thénault
[test] fix test broken by introduction of adapters
2010-05-25, by Sylvain Thénault
[schema] fix same_as cardinality and bump Bookmark.path max length to approximative max url size
stable
2010-05-25, by Sylvain Thénault
[deprecation] fix 3.9 deprecation warning
2010-05-25, by Sylvain Thénault
no more Image type w/ cw 3.9
2010-05-25, by Sylvain Thénault
[fti] fix name conflict introduced by the new IFTIAdapter
2010-05-21, by Sylvain Thénault
[entity] clearing adapters cache in clear_relations_cache avoid weird caching issue, notably on repository session's user
2010-05-21, by Sylvain Thénault
[vreg] should raise exception on select ambiguity when running in test mode
2010-05-21, by Sylvain Thénault
[adapters compat] make implements_adapter_compat selector compatible with attributes
2010-05-21, by Sylvain Thénault
[test] no more Image type w/ cw 3.9
2010-05-21, by Sylvain Thénault
[adapters] refactoring fixes
2010-05-21, by Sylvain Thénault
[selectors] ensure selector return an int
2010-05-21, by Sylvain Thénault
[selectors] adaptable selector should not accept None in rset
2010-05-21, by Sylvain Thénault
[selectors] lltrace appobject_selectable selector
2010-05-21, by Sylvain Thénault
[selectors] allow to override `accept_none` value of EClassSelector / EntitySelector based selector by specifying a value in selection context
2010-05-21, by Sylvain Thénault
[selectors] move lltrace decorator and traced_selection cm to appobject module so we can apply lltrace to And/Or/Not selectors, fixing #662565
2010-05-21, by Sylvain Thénault
with cw 3.9, no more Image type
2010-05-21, by Sylvain Thénault
[vreg] on registration completed, don't crash if an object depends on an unexistant registry, simply kick the object out
2010-05-21, by Sylvain Thénault
[selectors] ensure adaptable('IDownloadable') takes precedence over implements('Any')
2010-05-21, by Sylvain Thénault
[primary view] fix name error on dispctrl w/ pre 3.5 box definition
stable
2010-05-21, by Sylvain Thénault
[entity] fix access to attribute which has been renamed two revisions ago
2010-05-21, by Sylvain Thénault
[schema migration] make some stuff to ease file 1.9 migration : we want to kill the Image entity so that existing image are turned into (existing entity type) File entities
2010-05-20, by Sylvain Thénault
[entity] continue cleanup of Entity/AnyEntity namespace
2010-05-20, by Sylvain Thénault
[entity] introduce a new 'adapters' registry
2010-05-20, by Sylvain Thénault
backport stable
2010-05-20, by Sylvain Thénault
[config] move web specific config to the web section of the configuration file
stable
2010-05-20, by Sylvain Thénault
* * *
stable
2010-05-20, by Sylvain Thénault
typo
stable
2010-05-20, by Sylvain Thénault
[migration] fix storage_change migraction to avoid exhausting the server's memory
stable
2010-05-20, by Sylvain Thénault
[repo] set log methods on the actually desired class
stable
2010-05-20, by Sylvain Thénault
[bfss] ensure base name doesn't contain path separator
stable
2010-05-20, by Sylvain Thénault
merge
stable
2010-05-20, by Nicolas Chauvat
[web] remove dead code
stable
2010-05-20, by Nicolas Chauvat
[forms] consider __action_xxx field if passed to JSonController.validate_form
stable
2010-05-20, by Adrien Di Mascio
backport stable
2010-05-18, by Sylvain Thénault
Added tag cubicweb-debian-version-3.8.2-1 for changeset 2b962bb9eee8
stable
2010-05-18, by Sylvain Thénault
Added tag cubicweb-version-3.8.2 for changeset ef2e37d34013
stable
cubicweb-debian-version-3.8.2-1
2010-05-18, by Sylvain Thénault
[test] absolute sqlite database names in source initialization, avoid pb when cwd is changed later
stable
2010-05-18, by Sylvain Thénault
clenup
stable
2010-05-18, by Sylvain Thénault
3.8.2
stable
cubicweb-version-3.8.2
2010-05-18, by Sylvain Thénault
[wdoc] update users changelog
stable
2010-05-18, by Sylvain Thénault
[integrity] keep ordering for schema integrity checks
stable
2010-05-18, by Sylvain Thénault
[i18ncube] do not crash if cube has nothing to translate
stable
2010-05-18, by Sylvain Thénault
[skel] enable wdoc support in new cubes
stable
2010-05-18, by Sylvain Thénault
[preferences] support dot (.) in registry id of configurable appobjects
stable
2010-05-18, by Sylvain Thénault
[i18ncube] we must load site_cubicweb file before calling set_schema, else we may miss some options or other initialization stuff necessary to appobject loading
stable
2010-05-18, by Sylvain Thénault
[dtd] add unselimg attribute use by widget for HasRelationFacet
stable
2010-05-18, by Sylvain Thénault
remove 3.7 deprecation warning
stable
2010-05-17, by Sylvain Thénault
catch unauthorized when executing rql to check an rql expression. Fix #968824
stable
2010-05-17, by Sylvain Thénault
[startup view] sort startup views by alphabetical order
stable
2010-05-17, by Sylvain Thénault
[table view] should use __regid__ instead of hard-coded 'table' view identifier
stable
2010-05-17, by Sylvain Thénault
cleanup
stable
2010-05-17, by Sylvain Thénault
backport stable
2010-05-17, by Sylvain Thénault
[facet] control i18nization of values on AttributeFacet
stable
2010-05-17, by Sylvain Thénault
[views] tab schema image renamed to schema diagram
stable
2010-05-16, by Nicolas Chauvat
[uicfg] fix handling of 'order' in the primaryview_display_ctrl rtag: consider by default only schema order, not order of appearance of rules
stable
2010-05-12, by Sylvain Thénault
[db-check] RQLConstraint is not a 'unique' constraint
stable
2010-05-12, by Sylvain Thénault
[entity] avoid getting w in cw_extra_kwargs when calling .view
stable
2010-05-12, by Sylvain Thénault
[actions box] enhance add related menu generation: don't propose to add relation of single cardinality where entity already have the relation set
stable
2010-05-12, by Sylvain Thénault
[primary view] allow new 'subvid' parameter in primaryview_display_ctrl
stable
2010-05-12, by Sylvain Thénault
[primary view] give dispctrl to side box views as for relations section
stable
2010-05-12, by Sylvain Thénault
[web] unify list views call arguments: use subvid to specify the view to use for each item
stable
2010-05-12, by Sylvain Thénault
[web] refactor side box to use autolimited view
stable
2010-05-12, by Sylvain Thénault
[req] avoid getting w in cw_extra_kwargs when calling .view
stable
2010-05-12, by Sylvain Thénault
[config] rename remaining inputlevel to level in option definitions, as expected by lgc >= 0.50
stable
2010-05-12, by Sylvain Thénault
[fti] simplify UpdateFTIHook code
stable
2010-05-11, by Sylvain Thénault
[twisted] we must set response code before starting to write the answer, else it's ignored
stable
2010-05-11, by Sylvain Thénault
cleanup
stable
2010-05-11, by Sylvain Thénault
[web data] remove files not used by the framework
2010-05-11, by Sylvain Thénault
[css] keep old css according to a configuration variable (true by default)
2010-05-10, by Sylvain Thénault
[3.8 execute] remove deprecation warnings
stable
2010-05-10, by Sylvain Thénault
backport stable
2010-05-10, by Sylvain Thénault
[dbapi] missing import
stable
2010-05-10, by Aurelien Campeas
[ajax] missing html heads processing in reloadComponent (sic\!)
stable
2010-05-10, by Sylvain Thénault
[deprecation] missing version number to old warning message
stable
2010-05-10, by Sylvain Thénault
[table view] we should call the cell view using the table rset, not one rebuilded for a specific entity
stable
2010-05-10, by Sylvain Thénault
[table view] take care to None label
stable
2010-05-10, by Sylvain Thénault
[selectors] new logged_user_in_rset selector
stable
2010-05-07, by Sylvain Thénault
merge
stable
2010-05-07, by Alexandre Fayolle
replaced hardcoded 'web/view' by os.path.join('web', 'view') so views path is also valid under windows
stable
2010-05-07, by egazoni
fixed bug of non-normalized path under Windows, that broke the reload mechanism
stable
2010-05-07, by egazoni
[c-c list] configuration pb cubes directly hold version number now, avoid crash when reporting errors
stable
2010-05-07, by Sylvain Thénault
Handle new way of reporting unmodified FileFields
stable
2010-05-06, by Alexandre Fayolle
merge
stable
2010-05-06, by Alexandre Fayolle
attempt to port windows service to 3.8.1
stable
2010-05-06, by Alexandre Fayolle
[web session] fix potential key error on logout (occurs once the session has been transparently reconnected, hence session.sessionid and session.cnx.sessionid differs)
stable
2010-05-06, by Sylvain Thénault
[css] update print css
2010-05-06, by Katia Saurfelt
[doc] cleanup
2010-05-06, by Katia Saurfelt
[python2.6] do not import simplejson directly
stable
2010-05-06, by Alexandre Fayolle
[selectors] fix no_cnx selector's prototype
stable
2010-05-06, by Sylvain Thénault
[web config] set default uiprops on web config class to avoid error on commands such as i18n instance
2010-05-06, by Sylvain Thénault
backport stable
stable
2010-05-06, by Sylvain Thénault
[migration] ask_confirm argument of show_diff doesn't contain an _
oldstable
2010-05-06, by Sylvain Thénault
backport stable
2010-05-05, by Sylvain Thénault
backport oldstable
stable
2010-05-05, by Sylvain Thénault
[upgrade] don't ask confirm to replace configuration file with -v0
oldstable
2010-05-05, by Sylvain Thénault
merge good/bad versions of imported patches...
2010-05-05, by Sylvain Thénault
[css] start using uiprops in cubicweb.css
2010-05-05, by Katia Saurfelt
[css] progressively fixing rhythm
2010-04-29, by Nicolas Chauvat
[css] introducing scale and rhythm composition
2010-04-29, by Nicolas Chauvat
[css] start using uiprops in cubicweb.css
2010-05-05, by Katia Saurfelt
[css] progressively fixing rhythm
2010-04-29, by Nicolas Chauvat
[css] introducing scale and rhythm composition
2010-04-29, by Nicolas Chauvat
[doc/book] a very simple example of entity form extension
stable
2010-05-05, by Aurelien Campeas
[doc/book] refresh a bit the edit controller section
stable
2010-05-05, by Aurelien Campeas
[doc/book] explain the form loop validation process
stable
2010-05-05, by Aurelien Campeas
backport stable
2010-05-05, by Sylvain Thénault
backport oldstable
stable
2010-05-05, by Sylvain Thénault
[c-c dev] fix i18ncubicweb command
2010-05-05, by Sylvain Thénault
[book] add generated js documentation to cw book
2010-05-05, by Sandrine Ribeau
[packaging] we should add schemas to include_dirs so sql extensions files are properly installed
oldstable
2010-05-05, by Sylvain Thénault
[web test] missing test data file
2010-05-05, by Sylvain Thénault
[https] fix resource urls in https version of a site: should use the https version as well to avoid warnings from the nrowser
2010-05-05, by Sylvain Thénault
[uiprops] test and fix reloading of modified css files; update c-c newcube; deprecates config.has_resource.
2010-05-05, by Sylvain Thénault
[doc/book] not anymore ...
stable
2010-05-04, by Aurelien Campeas
[doc/book] dissection of a form chapter
stable
2010-05-04, by Aurelien Campeas
[doc/book] move examples to a separate chapter, fix autoform module docstring
stable
2010-05-04, by Aurelien Campeas
[doc/book] copious choices example
stable
2010-05-04, by Aurelien Campeas
[css] fix schema css + d-t-w
stable
2010-05-04, by Aurelien Campeas
[web/schemaviewer] fix bad call
stable
2010-05-04, by Aurelien Campeas
[doc/book] regroup form/editcontroller stuff under an "edition control" chapter
stable
2010-05-04, by Aurelien Campeas
[doc/book] complete a bit the request api
stable
2010-05-04, by Aurelien Campeas
fixed unittest_wfobjs
stable
2010-05-04, by Alexandre Fayolle
merged back oldstable into stable
stable
2010-05-04, by Alexandre Fayolle
fix bad reading of options in ldapuser.py
oldstable
2010-05-04, by Alexandre Fayolle
[json-controller] - refactoring of js_component and js_view, it now uses _call_view
2010-05-03, by Sandrine Ribeau
[widget] kill buggy / unused (only in cmhn) AddComboBox widget
2010-05-03, by Sylvain Thénault
[doc] typos
2010-05-03, by Sylvain Thénault
ignore annoying warnings about pygments already being imported and stuff being added to python path
stable
2010-04-30, by Alexandre Fayolle
[hooks/integrity & tests/entities] fix test to check for sibling error (set_operations yields a different order for constraints)
stable
2010-04-30, by Aurelien Campeas
[hooks/...] fix previous commit
stable
2010-04-30, by Aurelien Campeas
[hooks/operations] use set_operations for three ops (huge gains for massive imports)
stable
2010-04-30, by Aurelien Campeas
[vreg repo] shouldn't call init_registration in on hook registry bootstrap, already done before
2010-04-30, by Sylvain Thénault
[vreg] we should now reset in init_registration since we don't do it in __init__
2010-04-30, by Sylvain Thénault
[web] use uiprops value to compile css transparently, handlig cache and reloading in debug mode
2010-04-30, by Sylvain Thénault
[webconfig] introduce property sheets. Use them to replace external_resources
2010-04-30, by Sylvain Thénault
[webconfig] cleanup base_url management
2010-04-29, by Sylvain Thénault
[webconfig] refactor/cleanup debug mode management on startup: simply use config.debugmode instead of debug argument everywhere...
2010-04-29, by Sylvain Thénault
Added tag cubicweb-debian-version-3.7.5-1 for changeset 2d0982252e8d
oldstable
2010-04-29, by Alexandre Fayolle
Added tag cubicweb-version-3.7.5 for changeset c476d106705e
oldstable
cubicweb-debian-version-3.7.5-1
2010-04-29, by Alexandre Fayolle
prepare 3.7.5 release
oldstable
cubicweb-version-3.7.5
2010-04-29, by Alexandre Fayolle
[css] avoid repeating reset css
2010-04-29, by Nicolas Chauvat
[css] use meyer's public domain reset css
2010-02-15, by Nicolas Chauvat
[c-c shell] make script arguments available as __args__ in the script namespace. Use scriptargs instead of args as process_script argument name.
2010-04-28, by Julien Jehannet
[management] fix vocab: use cube instead of package
2010-04-28, by Julien Jehannet
[sparql] bugfix
stable
2010-04-29, by Nicolas Chauvat
[xy] define standard prefixes
stable
2010-04-29, by Nicolas Chauvat
[doc] various small improvements
stable
2010-04-29, by Nicolas Chauvat
fix i18ncube for pegase where we do strange things by redefining relations
oldstable
2010-04-28, by Stephanie Marcu
[shell] #715938: support of script parameters (using standard '--' as arguments separator)
2010-04-28, by Julien Jehannet
[dbapi] more test and documentation of dbapi
stable
2010-04-28, by Sylvain Thénault
move rarely used (imo) settings to inputlevel3 in cwctl create
oldstable
2010-04-28, by Alexandre Fayolle
default is now forthcoming cw 3.9
2010-04-28, by Sylvain Thénault
backport oldstable changes
stable
2010-04-28, by Sylvain Thénault
backport default into stable: stable is now actually cw 3.8
stable
2010-04-28, by Sylvain Thénault
replace logilab-common by CubicWeb in disclaimer
oldstable
2010-04-28, by Sylvain Thénault
backport default into stable: stable is now cw 3.8
2010-04-28, by Sylvain Thénault
backport stable into oldstable: oldstable is now cw 3.7
oldstable
2010-04-28, by Sylvain Thénault
proper licensing information (LGPL-2.1). Hope I get it right this time.
stable
2010-04-28, by Sylvain Thénault
[ms] fix planning bug with rewritten constants: when removing some source for a const due to relation constraints, we should propagate this change to other constants coming from the same original variable
stable
2010-04-27, by Sylvain Thénault
[repo security] deal with rewriten constant nodes in check_read_access, necessary when repo is used as an external source
stable
2010-04-27, by Sylvain Thénault
[doc] reorganize for chapter structure
stable
2010-04-27, by Sylvain Thénault
[web auth] remove assertion, we may want to remove authentication info retreivers to disallow login from the web ui
stable
2010-04-27, by Sylvain Thénault
merge
stable
2010-04-27, by Alexandre Fayolle
ask pyro group config questions for all-in-one config site when pyro is enabled
stable
2010-04-27, by Alexandre Fayolle
enforce use of environment variables when running as a service
stable
2010-04-27, by Alexandre Fayolle
added db-extra-arguments to configuration parameters for native source
stable
2010-04-27, by Alexandre Fayolle
Added tag cubicweb-debian-version-3.8.1-1 for changeset eb972d125eef
2010-04-26, by Sylvain Thénault
Added tag cubicweb-version-3.8.1 for changeset 1e074c6150fe
cubicweb-debian-version-3.8.1-1
2010-04-26, by Sylvain Thénault
cubicweb-ctl create improvements
stable
2010-04-26, by Alexandre Fayolle
3.8.1
cubicweb-version-3.8.1
2010-04-26, by Sylvain Thénault
backport stable
2010-04-26, by Sylvain Thénault
disable CERT check
stable
2010-04-26, by Sylvain Thénault
proper copyright file
stable
2010-04-26, by Sylvain Thénault
[web/views] fix docstring
stable
2010-04-26, by Nicolas Chauvat
merge
stable
2010-04-26, by Alexandre Fayolle
cleanup debugging trace
stable
2010-04-23, by Alexandre Fayolle
[python2.6] careful: json-py provides a json package. We don't want that.
stable
2010-04-23, by Alexandre Fayolle
[testlib] move _cnxs initialization before setup_database so one can login in it
stable
2010-04-26, by Sylvain Thénault
[doc/book] various content fixes
stable
2010-04-23, by Aurelien Campeas
[cw-shell] Write ignored scripts warning on stderr instead of stdout.
stable
2010-04-23, by Pierre-Yves David
[repo] cleanup
2010-04-23, by Sylvain Thénault
[bfss] new storage_changed migration action to move an attribute to a custom storage. Closes #893941
2010-04-23, by Sylvain Thénault
[bfss] use set_operation for AddFileOp/DeleteFileOp
2010-04-23, by Sylvain Thénault
merge
stable
2010-04-23, by Aurelien Campeas
[doc/book] move devweb up from development, turn development into devrepo (much better structure)
stable
2010-04-23, by Aurelien Campeas
[doc/book] hide most XXXs
stable
2010-04-23, by Aurelien Campeas
[view] better control wether same etype view should display title or not
stable
2010-04-23, by Sylvain Thénault
[config] augment default value for short-line-size
stable
2010-04-23, by Sylvain Thénault
cleanup debugging trace
stable
2010-04-23, by Alexandre Fayolle
[python2.6] careful: json-py provides a json package. We don't want that.
stable
2010-04-23, by Alexandre Fayolle
[doc/book] rename images with non suffix dots to please latex
stable
2010-04-23, by Aurelien Campeas
[i18n] yams constraint messages updated
2010-04-23, by Sylvain Thénault
less
more
|
(0)
-3000
-1000
-240
+240
+1000
+3000
tip