Mercurial
Mercurial
>
pub
>
hg
>
cubicweb
/ graph
summary
|
shortlog
|
changelog
| graph |
tags
|
bookmarks
|
branches
|
files
|
zip
|
gz
|
bz2
|
help
less
more
|
(0)
-10000
-3000
-1000
-240
+240
+1000
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.
[web] set Vary response header to "Accept-Language" when using content negotiation
2014-07-29, by Julien Cristau
[web/cors] don't overwrite other Vary headers
2014-07-29, by Julien Cristau
[web] add support for HttpOnly cookie flag
2014-07-15, by Julien Cristau
merge 3.19.5 into 3.20 branch
2014-10-17, by Julien Cristau
Added tag cubicweb-version-3.19.5, cubicweb-debian-version-3.19.5-1, cubicweb-centos-version-3.19.5-1 for changeset 3ac86df519af
2014-10-07, by Julien Cristau
i18n update
3.19.5
centos/3.19.5-1
cubicweb-centos-version-3.19.5-1
cubicweb-debian-version-3.19.5-1
cubicweb-version-3.19.5
debian/3.19.5-1
2014-10-06, by Julien Cristau
[pkg] 3.19.5
2014-10-06, by Julien Cristau
[server] hold connection to the db in tx_actions
2014-09-15, by Julien Cristau
[wsgi] If multipart cannot parse the POST content, let it pass.
2014-09-15, by Christophe de Vienne
[devtools] Fix JS tests' HTML code
2014-09-01, by Rémi Cardona
[devtools] "Keep" some temporary files/dirs around to help with debugging
2014-09-01, by Rémi Cardona
[devtools] Fix Firefox launcher in QUnitTestCase (closes #4294727)
2014-08-01, by Rémi Cardona
[devtools] allow cross-origin requests for qunit
2014-09-25, by Rémi Cardona
merge 3.19.4 in 3.20 branch
2014-09-25, by Julien Cristau
[cors] Fix CORS headers generators
2014-09-15, by Christophe de Vienne
[wsgi] Fix posted files filename reading
2014-09-09, by Christophe de Vienne
[pkg] Depend on Pillow instead of PIL
2014-09-23, by Christophe de Vienne
Added tag cubicweb-version-3.19.4, cubicweb-debian-version-3.19.4-1, cubicweb-centos-version-3.19.4-1 for changeset c4e740e50fc7
2014-09-25, by Julien Cristau
[pkg] 3.19.4
3.19.4
centos/3.19.4-1
cubicweb-centos-version-3.19.4-1
cubicweb-debian-version-3.19.4-1
cubicweb-version-3.19.4
debian/3.19.4-1
2014-09-25, by Julien Cristau
merge 3.18.6 into 3.19
2014-09-24, by Julien Cristau
Added tag cubicweb-version-3.18.6, cubicweb-debian-version-3.18.6-1, cubicweb-centos-version-3.18.6-1 for changeset d91501356742
stable
2014-09-24, by Julien Cristau
[pkg] 3.18.6
stable
cubicweb-centos-version-3.18.6-1
cubicweb-debian-version-3.18.6-1
cubicweb-version-3.18.6
2014-09-24, by Julien Cristau
[hooks/security] allow edition of attributes with permissive permissions
stable
2014-01-28, by Aurelien Campeas
Almost backout afcd46716d6a which breaks _select_best raising an ambiguity exception in debug mode.
stable
2014-07-29, by Aurelien Campeas
[server] fix anonymous_user predicate in tests
2014-09-12, by Julien Cristau
[entities] cw_rest_attr_info() should only consider required attributes (closes #3766717)
2014-07-28, by Rémi Cardona
[views] csvexport accept an empty rset (closes #4236928)
2014-08-08, by Damien Garaud
[views] Display attributes in entity creation form based on "add" permission
2014-09-11, by Denis Laxalde
[datafeed] Commit after all deletions in datafeed parser
2014-09-18, by Denis Laxalde
[schema] CWComputedRType is a schema type
2014-09-23, by Julien Cristau
[doc] proofreading CWEP002 section
2014-09-23, by Julien Cristau
[CWEP002] document computed relations and attributes
2014-02-10, by Anthony Truchet
[CWEP002 migration] support sync_schema_props_perms for computed attribute
2014-08-28, by Sylvain Thénault
[CWEP002 migration] support drop_relation_type/drop_relation_definition/drop_attribute for computed attributes
2014-07-22, by Sylvain Thénault
[CWEP002 migration] support add_relation_type/add_attribute for computed attributes
2014-08-28, by Sylvain Thénault
[CWEP002] properly handle serialization of computed attributes
2014-09-16, by Lea Capgen
[CWEP002] Add support for computed attribute synchronization
2014-09-16, by Sylvain Thénault
[CWEP002] Add schema finalization checks for computed attributes
2014-04-28, by Laura Médioni
[CWEP002] Account for attribute formula in schema bootstrap
2014-06-16, by Denis Laxalde
[CWEP002 migration] support sync_schema_props_perms for computed relations
2014-08-28, by Sylvain Thénault
[CWEP002 migration] support add_relation_type for computed relations
2014-08-28, by Laura Médioni
[CWEP002 migration] support drop_relation_type for computed relations
2014-08-28, by Laura Médioni
[CWEP002 migration] properly raise exception on (add|drop)_relation_definition for computed relation
2014-08-28, by Laura Médioni
[hooks] do not abuse of inheritance for CWRType hooks
2014-06-27, by Laura Médioni
[schema serial] add some comments
2014-06-16, by Laura Médioni
[schema] define full_rql on RQLExpression class
2014-06-16, by Laura Médioni
[schema] properly raise BadSchemaDefinition
2014-08-29, by Laura Médioni
[CWEP002] properly handle serialization of computed relations
2014-08-28, by Lea Capgen
[CWEP002] Plug the computed relation rewriter in the querier
2014-06-27, by Denis Laxalde
[CWEP002] refactor rql read security checking
2014-02-13, by Sylvain Thénault
[CWEP002] introduce RQLRelationRewriter
2014-06-16, by Sylvain Thénault
[CWEP002] Add schema finalization checks for computed relations (rules)
2014-09-12, by Lea Capgen
[schema] add utility function to build a CubicWebSchema from a namespace
2014-09-12, by Rémi Cardona
Fix test migration crash waiting to happen due to inferred relations
2014-08-28, by Sylvain Thénault
fix typo in syncschema hooks
2014-08-28, by Sylvain Thénault
[test] Make test_undo_api less random
2014-09-16, by Julien Cristau
merge 3.17.17 into 3.18 branch
stable
2014-09-17, by Julien Cristau
[wsgi] Fix unicode decoding in POST
2014-09-10, by Christophe de Vienne
[wsgi] add the --debug / -D option to the wsgi command
2014-08-21, by Christophe de Vienne
[wsgi] Fix multiple variables reading in params
2014-09-08, by Christophe de Vienne
[wsgi] Set self.vreg
2014-09-02, by Christophe de Vienne
[wsgi] Add missing import
2014-09-02, by Christophe de Vienne
[wsgi] Fix https detection
2014-09-02, by Christophe de Vienne
[wsgi] Re-set the request content after calling the inherited constructor.
2014-07-24, by Christophe de Vienne
[wsgi] Honor the 'CONTENT_TYPE' wsgi variable
2014-07-24, by Christophe de Vienne
Added tag cubicweb-version-3.17.17, cubicweb-debian-version-3.17.17-1, cubicweb-centos-version-3.17.17-1 for changeset 57e9d1c70512
stable
2014-09-17, by Aurelien Campeas
[pkg] prepare 3.17.17
stable
cubicweb-centos-version-3.17.17-1
cubicweb-debian-version-3.17.17-1
cubicweb-version-3.17.17
2014-09-16, by Aurelien Campeas
[web/headers] don't list a request header twice in "Vary"
2014-07-29, by Julien Cristau
[test] silence a few more deprecation warnings in unittest_hooks
2014-07-28, by Julien Cristau
[session] call rollback in Connection.__exit__
2014-07-25, by Julien Cristau
[devtools] pre_setup_database takes a Connection, not a Session
2014-07-24, by Julien Cristau
[source/native] cPickle is available in all supported pythons
2014-06-03, by Aurelien Campeas
devtools: deprecate .req_from_url
2014-07-22, by Aurelien Campeas
[tests] Add a webtest based TestCase class
2014-06-17, by Christophe de Vienne
[tests] Move 'anonymous_allowed' property from CubicWebServerTC to CubicWebTC
2014-06-17, by Christophe de Vienne
[compat] Remove imports of "any" and "all" from lgc (closes #4306044)
stable
2014-09-02, by David Douard
[css] Remove the `div` tag specification of the pendingDelete css rule
stable
2014-08-26, by Florent Cayré
[cwvreg] cleanup the event manager when reloading modules
stable
2014-05-21, by Alain Leufroy
[test] Add missing attribute 'add' permission in test schema
stable
2014-06-12, by Julien Cristau
[facet html] Add surrounding div with "facetBody" class to "has_text" facet.
stable
2014-05-01, by Florent Cayré
[cwctl] don't prompt for cube options in automatic mode
stable
2014-06-13, by Julien Cristau
[serverctl] fix default value for db-init config-level
stable
2014-06-13, by Julien Cristau
[web] Return useful error messages when exceptions arise in ajax controllers (closes #3932503)
stable
2014-06-05, by Rémi Cardona
[test] Fix test breakage uncovered by previous changeset
stable
2014-07-23, by Julien Cristau
[etwist] use more specific REQUEST_ENTITY_TOO_LARGE instead of BAD_REQUEST
2014-07-08, by Julien Cristau
[entities, view] delete dead code
2014-07-08, by Julien Cristau
[book] stop talking about the hg `forest` extension
2014-07-04, by Julien Cristau
[book] update sections about dependencies
2014-07-04, by Julien Cristau
[web/component] move unicode() call around
2014-07-23, by Julien Cristau
[web/js] replace callAddOrDeleteThenReload with more generic callAjaxFuncThenReload
2014-07-23, by Julien Cristau
[hooks/syncsession] try to remove cnx vs session confusion
2014-07-22, by Julien Cristau
Fix Binary.__eq__ (closes #4172701)
stable
2014-07-22, by Julien Cristau
[dataimport] stop ignoring errors on flush
2014-07-09, by Julien Cristau
[dataimport] don't commit on flush
2014-07-09, by Julien Cristau
[test] Add test for dataimport's RQLObjectStore
2014-07-09, by Julien Cristau
[dataimport] Stop swallowing errors from commit/flush
2014-07-09, by Julien Cristau
[dataimport] Update RQLObjectStore to Connection API
2014-07-09, by Julien Cristau
[dataimport] remove _rql heresy
2014-07-09, by Julien Cristau
[dataimport] remove dead code
2014-07-09, by Julien Cristau
[dataimport] do not use sys.exit() to raise missing argument error
2014-06-03, by Alain Leufroy
[dataimport] _create_copyfrom_buffer: add the tests
2014-06-02, by Alain Leufroy
[dataimport] _create_copyfrom_buffer: do not ignore columns if data is a list
2014-06-02, by Alain Leufroy
[dataimport] _create_copyfrom_buffer: fix datetime converter + add time converter
2014-06-02, by Alain Leufroy
[dataimport] _create_copyfrom_buffer: raise ValueError if conversion cannot be performed
2014-06-02, by Alain Leufroy
[dataimport] _create_copyfrom_buffer: fix separator check in string converter
2014-06-02, by Alain Leufroy
[dataimport] _create_copyfrom_buffer: put converters into a list
2014-06-02, by Alain Leufroy
merge 3.19.3 into 3.20 branch
2014-07-18, by Julien Cristau
Added tag cubicweb-version-3.19.3, cubicweb-debian-version-3.19.3-1, cubicweb-centos-version-3.19.3-1 for changeset 37f7c60f89f1
2014-07-18, by Julien Cristau
[pkg] prepare 3.19.3
3.19.3
centos/3.19.3-1
cubicweb-centos-version-3.19.3-1
cubicweb-debian-version-3.19.3-1
cubicweb-version-3.19.3
debian/3.19.3-1
2014-07-18, by Julien Cristau
merge from 3.18 branch
2014-07-18, by Julien Cristau
merge 3.17.16 into 3.18 branch
stable
2014-07-18, by Julien Cristau
Remove uses of logilab.common.compat.{all,any}
2014-07-17, by Rémi Cardona
remove references to global environment variable APYCOT_ROOT
2014-07-09, by Aurelien Campeas
Add warning messages when enabling remote pickle-based repository access
2014-07-02, by Julien Cristau
[web] Fix expiry of anonymous sessions (closes #4154479)
2014-07-18, by Julien Cristau
[hooks/syncschema] avoid altering a dropped table
2014-07-16, by Julien Cristau
[js] fix name error
2014-06-12, by Florent Cayré
[devtools] improve error message when postgresql tools are missing
2014-06-03, by Alain Leufroy
[server] Replace non portable strftime formatter (closes #4132161)
2014-07-11, by Rémi Cardona
[web/request] use a picklable Counter object for tab index counters
2014-06-12, by Aurelien Campeas
[web/auth] The auth retriever's authenticated() callback takes a session, not a cnx
2014-07-15, by Julien Cristau
[test] Fix the query-log-file test
2014-07-11, by Julien Cristau
[doc/book] spelling fixes in security tutorial
2014-07-11, by Julien Cristau
[doc/book] spelling fixes in "testing" chapter
2014-07-11, by Julien Cristau
[datafeed sources] finish the session -> cnx switch
2014-06-11, by Aurelien Campeas
[doc/book] update examples, using the new connection api
2014-06-06, by Aurelien Campeas
[test/entities] use the new connection api
2014-06-11, by Aurelien Campeas
[web] restore query logging functionality (closes #3972561)
2014-07-02, by Julien Cristau
[cwctl] make cubicweb-ctl versions lighter (closes #4002158)
2014-06-17, by Julien Cristau
Added tag cubicweb-version-3.17.16, cubicweb-debian-version-3.17.16-1, cubicweb-centos-version-3.17.16-1 for changeset a979d1594af6
stable
2014-07-08, by Aurelien Campeas
[forms] consider inline creation form information as linkto info. Closes #3161121
2013-09-23, by Sylvain Thénault
[pkg] prepare 3.17.16
stable
cubicweb-centos-version-3.17.16-1
cubicweb-debian-version-3.17.16-1
cubicweb-version-3.17.16
2014-07-07, by Aurelien Campeas
[reledit] Fix reledit icons jumpiness (closes #4106867)
stable
2014-06-02, by Rémi Cardona
[views] Replace poorly named "invisible" class with "list-unstyled"
stable
2014-06-02, by Rémi Cardona
[views] a 'div' with 'display: inline' screams 'span'
stable
2014-06-02, by Rémi Cardona
[pkg] remove simplejson dependency
2014-07-04, by Julien Cristau
Added tag cubicweb-version-3.19.2, cubicweb-debian-version-3.19.2-1, cubicweb-centos-version-3.19.2-1 for changeset 8ac2202866e7
2014-07-03, by Julien Cristau
[pkg] Fix version number
3.19.2
centos/3.19.2-1
cubicweb-centos-version-3.19.2-1
cubicweb-debian-version-3.19.2-1
cubicweb-version-3.19.2
debian/3.19.2-1
2014-07-03, by Julien Cristau
[pkg] 3.19.2
2014-07-03, by Julien Cristau
[webtests] finish to give all self.view(....) a req=req parameter
2014-06-06, by Aurelien Campeas
[tests/syncsession] use the new connection api
2014-06-05, by Aurelien Campeas
[webtests/application] remove unused imports
2014-07-01, by Aurelien Campeas
[webtests/application] .user(...) really wants a request object
2014-06-05, by Aurelien Campeas
[tests/datafeed] use the new connection api (a small leftover)
2014-06-04, by Aurelien Campeas
[entitiestests/base] don't store an entity on the test case
2014-07-02, by Julien Cristau
[entitiestests/base] use the new connection api
2014-06-05, by Aurelien Campeas
[testlib] use the new connection api
2014-06-04, by Aurelien Campeas
[exttests/rest] use the new connection api
2014-06-05, by Aurelien Campeas
[webtests/bookmarks] use the new connection api
2014-06-04, by Aurelien Campeas
[hookstests/integrity] use the new connection api
2014-06-04, by Aurelien Campeas
[hookstests/base] use connections instead of web requests
2014-07-02, by Julien Cristau
[hookstests/base] use the new connection api
2014-06-04, by Aurelien Campeas
[hookstests/syncschema] use the new connection api
2014-06-04, by Aurelien Campeas
[tests/rqlannotation,querier] use the new connection api
2014-06-04, by Aurelien Campeas
[webtests/web] use the new connection api
2014-07-02, by Julien Cristau
[webtests/navigation] use the new connection api
2014-06-03, by Aurelien Campeas
[webtests/basetemplates] use the new connection api
2014-06-03, by Aurelien Campeas
[webtests/basecontrollers] use the new connection api
2014-06-05, by Aurelien Campeas
[testlib] deprecate .remote_call and provide new connection api friendly .remote_calling
2014-06-03, by Aurelien Campeas
[webtests/propertysheet] kill an "import *"
2014-06-03, by Aurelien Campeas
[webtests/breadcrumbs] break long lines
2014-06-03, by Aurelien Campeas
[webtests/views_editforms] use the new connection api
2014-06-05, by Aurelien Campeas
[webtests/urlrewrite] do not store a plain entity on the test, only an eid
2014-07-01, by Aurelien Campeas
[webtests/urlrewrite] use the new connection api
2014-06-03, by Aurelien Campeas
[webtests/urlpublisher] use the new connection api
2014-06-05, by Aurelien Campeas
[webtests/baseviews] use the new connection api
2014-06-03, by Aurelien Campeas
[devtools/testlib,fill] use the new connection api (for auto_populate)
2014-07-02, by Julien Cristau
[webtests/automatic views tests] use the new connection api
2014-07-02, by Julien Cristau
[devtools/repotest] simplify a very small helper
2014-06-04, by Aurelien Campeas
[tests/repotest] use the new connection api
2014-06-04, by Aurelien Campeas
[tests/querier] use the new connection api (part 3/3)
2014-06-02, by Aurelien Campeas
[test/querier] use the new connection api (part 2/3)
2014-06-10, by Aurelien Campeas
[test/querier] use the new connection api (part 1/3)
2014-06-10, by Aurelien Campeas
[dbapi] allow talking to a pre-3.19 remote repository
2014-07-01, by Julien Cristau
[migration] don't add new elements to config._cubes in remove_cube
2014-06-17, by Julien Cristau
[web test] repair test broken by 0872ac2a1db0
2014-07-02, by Sylvain Thénault
[dataimport] Drop reference to the 'source' column (closes #4067694).
2014-05-06, by Damien Garaud
[notification] drop on commit sending of message feature of NotificationView
2014-05-21, by Sylvain Thénault
[datafeed parser] enhance retrieve_url to support POSTing data and custom HTTP headers
2014-03-21, by Sylvain Thénault
[datafeed parser] fix retrieve_url to always return urllib2.urlopen compatible output
2014-03-25, by Sylvain Thénault
[datafeed parser] factor out retrieve_url method from DataFeedXMLParser.parse
2014-03-20, by Sylvain Thénault
[datafeed] Allow to override use_cwuri_as_url in configuration of a datafeed source
2014-03-20, by Sylvain Thénault
merge from 3.19 branch
2014-06-27, by Julien Cristau
[entity/rset] replace scary warnings about ambiguous rdefs by XXX in the code
2014-04-03, by Sylvain Thénault
[web/js] Deprecate baseuri() and replace with BASE_URL (closes #3955372)
2014-05-23, by Rémi Cardona
[request] Ensure base_url() always has a trailing '/' (closes #3955093)
2014-05-23, by Rémi Cardona
[schema] spelling fixes in doc strings
2014-06-11, by Julien Cristau
[views] a 'div' with 'display: inline' screams 'span'
2014-06-02, by Rémi Cardona
[views] Rewrite cw.utils.formContents() with jQuery (closes #3747244)
2014-02-17, by Rémi Cardona
[web/data] Remove broken backward compatibility function
2014-05-26, by Rémi Cardona
[repoapi] make ClientConnection call RequestSessionBase's init
2014-06-19, by Julien Cristau
[webtests/views_staticcontrollers] use the new connection api
2014-06-02, by Aurelien Campeas
[webtests/views_selectors] use the new connection api
2014-06-02, by Aurelien Campeas
[webtests/views_json] use the new connection api
2014-06-02, by Aurelien Campeas
[webtests/views_errorform] use the new connection api
2014-06-02, by Aurelien Campeas
[webtests/views_actions] use the new connection api
2014-06-02, by Aurelien Campeas
[webtests/views_xmlrss] use the new connection api
2014-06-02, by Aurelien Campeas
[webtest/pyviews] use the new connection api
2014-06-02, by Aurelien Campeas
[tests/sqlutils] use the new connection api
2014-06-02, by Aurelien Campeas
[tests/postgres] use the new connection api
2014-06-02, by Aurelien Campeas
[tests/repository] use the new connection api (part 2/2)
2014-06-02, by Aurelien Campeas
[repository,tests] use the new connection api (part 1/2)
2014-06-02, by Aurelien Campeas
[book] fix various parts of the rql section
stable
2014-06-17, by Sylvain Thénault
[repository] session -> cnx renaming (already done in the source object)
2014-06-02, by Aurelien Campeas
[tests/session] remove unused import
2014-05-30, by Aurelien Campeas
[tests/datafeed] use the new connection api
2014-05-30, by Aurelien Campeas
[tests/checkintegrity] use the new connection api
2014-05-30, by Aurelien Campeas
[tests/schemaserial] kill star import
2014-05-30, by Aurelien Campeas
[tests/schemaserial] break long lines
2014-05-30, by Aurelien Campeas
[tests/ldap] don't leak sessions
2014-06-16, by Julien Cristau
[tests/ldap] use the new connection api
2014-05-30, by Aurelien Campeas
[test/migration] fix crash on execution
2014-06-13, by Aurelien Campeas
[web] Remove unreachable and broken code
2014-06-05, by Rémi Cardona
[testlib] call init_config once the config has been properly bootstraped
2014-04-15, by Sylvain Thénault
[devtools] even better: use a plain Connection (server-side) object for pre_setup
2014-06-12, by Aurelien Campeas
[devtools] pre_setup_database should take a connection object
2014-05-30, by Aurelien Campeas
[tests/migration] use the new connection api
2014-05-30, by Aurelien Campeas
[tests/undo] use the new connection api
2014-05-28, by Aurelien Campeas
[js/ajax] deprecate user-callback support
2014-06-12, by Aurelien Campeas
EditRelationMixIn: stop using user_rql_callback
2014-03-07, by Julien Cristau
[tests/storage] use the new connection api
2014-05-28, by Aurelien Campeas
[tests/security] use the new connection api
2014-06-05, by Aurelien Campeas
[htmlwidgets] Remove unreachable code
2014-06-02, by Rémi Cardona
Remove redundant __nonzero__ methods
2014-04-24, by Rémi Cardona
[etwist] Remove unused host_prefixed_baseurl()
2014-05-23, by Rémi Cardona
[basetemplate] Remove misleading comment
2014-05-23, by Rémi Cardona
[tests/security] break lines > 100 chars
2014-05-28, by Aurelien Campeas
[doc/3.19] Mention [gs]et_shared_data deprecation
2014-06-11, by Julien Cristau
[hooks] internal_session -> internal_cnx (including a typo)
2014-06-03, by Aurelien Campeas
deprecate get/set_shared_data API
2014-05-02, by Aurelien Campeas
[migration] Stop setting session.data['rebuild-infered']
2014-06-11, by Julien Cristau
Import PIL modules from the PIL namespace to be Pillow-compatible
2014-06-04, by Christophe de Vienne
merge two stable heads
stable
2014-06-10, by Julien Cristau
merge 3.18.5 into 3.19 branch
2014-06-10, by Julien Cristau
merge 3.17.15 into 3.18 branch
stable
2014-06-10, by Julien Cristau
[vreg] fix bad super call to lgc.registry.Registry()
stable
2014-05-16, by Adrien Di Mascio
Added tag cubicweb-version-3.18.5, cubicweb-debian-version-3.18.5-1, cubicweb-centos-version-3.18.5-1 for changeset 5071b69b6b0b
stable
2014-06-05, by Aurelien Campeas
[pkg] prepare 3.18.5
stable
cubicweb-centos-version-3.18.5-1
cubicweb-debian-version-3.18.5-1
cubicweb-version-3.18.5
2014-06-05, by Aurelien Campeas
[sobjects] update notifications system to 3.19 api
2014-04-09, by Sylvain Thénault
[connection] set language on new Connection for the internal manager
2014-06-04, by Julien Cristau
less
more
|
(0)
-10000
-3000
-1000
-240
+240
+1000
tip