summaryrefslogtreecommitdiffstats
path: root/server/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into 7.4Artur Signell2014-12-191-3/+21
|\
| * Ensure enum fields are created when not specifying a strict type (#10975)Artur Signell2014-12-181-3/+21
| | | | | | | | Change-Id: I64cfc5b315444d7135738a8f3870bf50050f4678
* | Merge remote-tracking branch 'origin/master' into 7.4Artur Signell2014-12-198-43/+66
|\| | | | | | | | | | | | | Conflicts: shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java Change-Id: Iad7c2371362240a6bf3bce02cfc61fc242d44e39
| * Allow TabSheet and Accordion tab captions to contain HTML (#14609)Artur Signell2014-12-181-0/+30
| | | | | | | | Change-Id: If15db442fdbdcc80918e52f8c87e0808f76eb336
| * 3 args method buildAndBind should be overriden, not 2 args (#12453).Denis Anisimov2014-12-181-3/+3
| | | | | | | | Change-Id: I7afabec7e0d9334b799019b581fca858895b2cc1
| * Add @since to AbstractSplitPanel. (#15285)Sauli Tähkäpää2014-12-181-1/+1
| | | | | | | | Change-Id: I476d8c7e53ce90941b00deefffc1b6a7ea63b43b
| * Avoid NoClassDefFoundError retrieving Atmosphere version (#14904).Denis Anisimov2014-12-183-17/+31
| | | | | | | | Change-Id: Id64c4c4535e250c6e0e6457dfdfd17424bdc2fd4
| * Make is possible to click a detached button again (#12781)Artur Signell2014-12-181-1/+1
| | | | | | | | | | | | Partial revert of the earlier fix Change-Id: I67d016f1ea073189fdb53fc99f7c1b45b21ac124
| * Revert "Update selection after changes in underlying data sourceLeif Åstrand2014-12-181-21/+0
| | | | | | | | | | | | | | (#13580)." This reverts commit f4d1383b20da01f9fc43c32d7541a7816f8a9a9b. Change-Id: I5911f63ae35bef54f01477b14e5feffdf952aa6d
* | Merge remote-tracking branch 'origin/grid' into 7.4Artur Signell2014-12-198-19/+27
|\ \
| * | Set @since values for Grid classesLeif Åstrand2014-12-188-19/+27
| | | | | | | | | | | | Change-Id: Ib0c7d23c2a963e24ecca7769f6b179826be55102
* | | Merge remote-tracking branch 'origin/master' into 7.4Artur Signell2014-12-182-12/+23
|\ \ \ | | |/ | |/|
| * | Allow reading and writing empty designs (#7749).Mika Murtojarvi2014-12-182-12/+23
| | | | | | | | | | | | Change-Id: Id66201d040d07f0e0d731418624c9b702b2d0d3b
* | | Merge remote-tracking branch 'origin/grid' into 7.4Artur Signell2014-12-184-8/+43
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: server/src/com/vaadin/data/util/AbstractInMemoryContainer.java Change-Id: Ic7ed64fa870c435f6cad3e6e436a3b8d6457de41
| * | Merge remote-tracking branch 'origin/master' into gridLeif Åstrand2014-12-1859-142/+4260
| |\| | | | | | | | | | Change-Id: Ic7629f9cedb3c948edf4f63c678ca499e3d52805
| | * Allow captions to contain HTML (#9426)Artur Signell2014-12-183-5/+39
| | | | | | | | | | | | Change-Id: I4a0e580aef1a97ce69238ea0d476599883928d84
* | | Merge remote-tracking branch 'origin/master' into 7.4Artur Signell2014-12-1814-3/+50
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: server/src/com/vaadin/data/util/AbstractInMemoryContainer.java Change-Id: I39b742a96653de3a59571b4e9b4143fd2e3d3978
| * | Missing @since for 7.4Leif Åstrand2014-12-1814-3/+51
| | | | | | | | | | | | Change-Id: I8fdf0c264febf2ab9ae0f230f6bb357ef57be9ec
* | | Merge remote-tracking branch 'origin/grid' into 7.4Artur Signell2014-12-182-9/+43
|\ \ \ | | |/ | |/|
| * | Fix ClickableRenderers to use CellReferences (#13334)Teemu Suo-Anttila2014-12-182-9/+43
| | | | | | | | | | | | | | | | | | | | | This patch also uses row keys and column ids in communication rather than indices. Change-Id: Ie3bb554bd5c45700f1681160eef08bef8beeaaee
* | | Merge remote-tracking branch 'origin/master' into 7.4Artur Signell2014-12-183-29/+26
|\ \ \ | | |/ | |/|
| * | Fix inconsistencies in CheckBox clear and isEmpty (#14755)Artur Signell2014-12-181-0/+11
| | | | | | | | | | | | Change-Id: I566257d3a4db15973f76a5a70adb095bd7203918
| * | Minor declarative API improvement (#7749)Artur Signell2014-12-182-29/+15
| | | | | | | | | Change-Id: Id5b11b27e7750085d30d2fa592b124ae474d6e9a
* | | Merge remote-tracking branch 'origin/grid' into 7.4Artur Signell2014-12-1823-67/+7729
|\ \ \ | |/ / |/| / | |/ | | | | | | Conflicts: WebContent/release-notes.html Change-Id: Id908215d05fafc73bc2d81f8b9d857078bf12e00
| * Fix server selection firing multiple events on client select (#13334)Teemu Suo-Anttila2014-12-171-27/+89
| | | | | | | | | | | | | | This patch fixes multiple events from Single Selection Model. Multi Selection Model is designed a bit differently. Change-Id: I0350d7f2de873ff9fba7411c5ca8caefa156be20
| * Change "editor row" to just "editor" in method names and javadoc (#13334)Johannes Dahlström2014-12-171-76/+86
| | | | | | | | Change-Id: Idafdbe3d71a38a979e1eeb07c527f66ce61ccfa9
| * Move SortDirection from grid package to data package (#13334)Teemu Suo-Anttila2014-12-174-4/+5
| | | | | | | | Change-Id: Id8fecbee0171b783a62d747433667267f530a6a7
| * Merge remote-tracking branch 'origin/master' into gridTeemu Suo-Anttila2014-12-179-151/+219
| |\ | | | | | | | | | Change-Id: If3dd8380afe425491dfb877c08c4ff078312a3aa
| * | GeneratedPropertyContainer returns the original containerHenrik Paul2014-12-151-0/+9
| | | | | | | | | | | | Change-Id: Ia766f1e989d6a06d4b1746b0612c090b6fbd2735
| * | Fixes removing Widgets from Grid header/footerTeemu Suo-Anttila2014-12-121-1/+10
| | | | | | | | | | | | Change-Id: Ic2872fec49851ea3c8ed32ca2a77dcbd27e739a8
| * | Merge remote-tracking branch 'origin/master' into gridLeif Åstrand2014-12-122-13/+66
| |\ \ | | | | | | | | | | | | Change-Id: I7f2c5de8200028b11223e2be3c673bef3339306a
| * | | Refactor Grid client side package structure (#13334)Teemu Suo-Anttila2014-12-122-2/+2
| | | | | | | | | | | | | | | | Change-Id: Iab81d2344480d2b60303172a96f4e5e4fa8e1623
| * | | Rename SelectionChangeEvent and SortOrderChangeEvent (#13334)Teemu Suo-Anttila2014-12-123-71/+58
| | | | | | | | | | | | | | | | | | | | Also renames related listeners and notifiers. Change-Id: I96bfdae8173a1c691623938cc7dbcddee7198e46
| * | | Split CellStyleGenerator into separate cell and row style generatorsArtur Signell2014-12-122-27/+222
| | | | | | | | | | | | | | | | | | | | | | | | (#13334) Change-Id: If07018b6f74ff1a4c616705f61b6118647d64342
| * | | Add expand and min/max width for GridColumns (#13334)Henrik Paul2014-12-121-0/+135
| | | | | | | | | | | | | | | | Change-Id: I6cb2f4a11d97c3704c1fd8f8571889f1a8d5c4b8
| * | | Refactor server-side editor row to work in real(er) cases (#13334)Leif Åstrand2014-12-122-150/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't configure fields for properties without columns - Rename "bind" to "set" to match the getter - Make it possible to get a field before editing has started - Remove setting of editable since the field can be configured directly - Remove error handler concept since we have not tests and no use cases - Unbind and detach field when removing a column Change-Id: I38ead4e680cdbab2525fe08ff09ed045255e2d4f
| * | | Remove unnecessary @since and @author JavaDoc markings (#13334)Teemu Suo-Anttila2014-12-121-15/+0
| | | | | | | | | | | | | | | | Change-Id: I5fe9fb9a5ec27ec047ef2286bd429efabaa0e818
| * | | Remove SortEventOriginator and replace it with a boolean (#13334)Teemu Suo-Anttila2014-12-122-17/+15
| | | | | | | | | | | | | | | | Change-Id: I8a203c5e2f4bc9074ccf3cb4e7f347f17d89fe52
| * | | Merge remote-tracking branch 'origin/master' into gridArtur Signell2014-12-1233-193/+271
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: server/tests/src/com/vaadin/data/util/BeanItemContainerTest.java Change-Id: I04938bd8c5b4f01c3ca801c9f7adbb20d279523c
| * | | | Columns can now have subpixel accuracy widths (#13334)Henrik Paul2014-12-121-4/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I1d16260be7b15c9fbdbfdd8f51e50e9f34e96272
| * | | | Do not prefix generated styles (#13334)Artur Signell2014-12-121-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unprefixed styles are easier to use, are consistent with header styles and multiple styles are consistent instead of the first one being prefixed. Change-Id: I9ef7502e2e9ece33982f6bf563f95458bf6ea63d
| * | | | Make AbstractRemoteDataSource easier to use (#13334)Leif Åstrand2014-12-121-31/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Adds a callback to requestRows so implementors know what to do when receiving data - Guestimate the initial amount of available rows so an initial request can be made before the actual size is known Change-Id: Iba44eab1695e3ff9947a4e7ed16eee55af98fec4
| * | | | Move Sort related helpers and events to correct packages (#13334)Teemu Suo-Anttila2014-12-128-117/+123
| | | | | | | | | | | | | | | Change-Id: I3aa86364b61d42f971c4fca2b4c4895ddae870c4
| * | | | Make SelectionChangeEvent general and move it to event packacge (#13334)Teemu Suo-Anttila2014-12-114-87/+46
| | | | | | | | | | | | | | | | | | | | Change-Id: I232bf1d021dd95dfa3e9697cef4d8e9987da3373
| * | | | Move server-side SelectionModels inside Grid (#13334)Teemu Suo-Anttila2014-12-116-674/+575
| | | | | | | | | | | | | | | Change-Id: I382ad0bcb192f44270eb60ec70d9141e8dd463f5
| * | | | Remove editor row discard methods; rename "commit" to "save" (#13334)Johannes Dahlström2014-12-111-24/+8
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic7cec3c3750db8a2e0b23a4d38f63e9642999e3e
| * | | | Move Renderers to com.vaadin.ui.renderer package (#13334)Teemu Suo-Anttila2014-12-1111-14/+14
| | | | | | | | | | | | | | | | | | | | Change-Id: I80370f05cfa8123d64728abd5ede9642931e0cd8
| * | | | Fix selecting logic of SingleSelectionModel API (#13334)Teemu Suo-Anttila2014-12-113-23/+15
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib48e586cb791669efc4aa98442a31c1dda42e1aa
| * | | | Split and capitalize header captions by defaultArtur Signell2014-12-102-37/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only done on the server side where we have property ids to generate the default headers from. On the client side you must always specify the header. Change-Id: Ic743fb3f52517116193b022cfdd2df7dea8dd487
| * | | | Add sanity checking to server side selection models (#13334)Teemu Suo-Anttila2014-12-104-3/+47
| | | | | | | | | | | | | | | | | | | | Change-Id: I9686cdbf82c017f834502cf56eafe23ca9829d5f