- 29 May, 2014 3 commits
-
-
Antti Tönkyrä committed
-
Feature/meta rest and db The META REST API: Setting: curl -XPOST -H 'Content-Type: application/json' --data-ascii '{"setting-a":1}' http://localhost:8080/MoyaWeb/rest/meta/printedcard/2247/module1-settings curl -XPOST -H 'Content-Type: application/json' --data-ascii '{"type":"ladyfit", "size":"S"}' http://localhost:8080/MoyaWeb/rest/meta/printedcard/2247/shirt-preference Getting: curl http://localhost:8080/MoyaWeb/rest/meta/printedcard/2247/ => {"shirt-preference":{"type":...,"size":...}} curl http://localhost:8080/MoyaWeb/rest/meta/printedcard/2247/shirt-preference => {"type":...,"size":...} curl http://localhost:8080/MoyaWeb/rest/meta/printedcard/2247/foo/bar ALSO: - Fixed Changed Fields Optimistic Locking policy to NOT to try compare JSON fields on UPDATE (cannot compare json objects in PostgreSQL, tries to do UPDATE table SET meta='{"foo":1}' WHERE id = 23 AND meta = '{"foo":2}'; or so and explodes) - Fixed Returning Policy to do INSERT ... RETURNING id; - BROKER DDL GENERATION: does not currently do "id SERIAL" but "id INTEGER" because eclipselink assumes too much.Antti Tönkyrä committed -
Authkoodin generointi ja piirto + restapi ja yksi bugikorjaus Authkoodin generointi ja piirtäminen kortille sekä restapi käyttäjän hakemiseksi koodilla. Korjattu myös templaten asettaminen CardTemplateDataEditViewin initView():ssä silloin kun cardObjectDataId tai cardTextDataId on annettu parametrinä.
Antti Tönkyrä committed
-
- 28 May, 2014 6 commits
-
-
/MoyaWeb/rest/meta/v1/<type>/<id>/<path...>
Juho Juopperi committed -
…fields. Also fix Returning Policy to make SQL more performant. BROKEN DDL generation (missing SERIAL fields now. Sorry. Eclipselink fought back!)
Juho Juopperi committed -
Juho Juopperi committed
-
Juho Juopperi committed
-
Liv Haapala committed
-
- Korjattu bugi korttidatan muokkauksesta
Liv Haapala committed
-
- 25 May, 2014 5 commits
-
-
Card fixes misc. card fixes, see commit messages
Tuomas Riihimäki committed -
- Do not try to flush PDF if there are no contents in it (will throw exception), besides we don't use the result since we throw out ourselves - We can log the error even when there is no mail address - In case we hit an user with too much power on their card, revoke the old card (set it to disabled) and try to refresh with a better one - Remove unneeded flush (what is this supposed to do?)
Antti Tönkyrä committed -
- biggestCard = card; card must be enabled in order to enter this if branch thus setEnabled is extraneous in this case
Antti Tönkyrä committed -
Master Lisäominaisuuksia liittyen korttien printtaamiseen ja käyttäjien kuvien tarkasteluun.
Antti Tönkyrä committed -
Liv Haapala committed
-
- 24 May, 2014 3 commits
-
-
Liv Haapala committed
-
Liv Haapala committed
-
This reverts commit 2c78c6fc. Conflicts: code/MoyaDatabase/src/fi/codecrew/moya/model/User.java code/MoyaWeb/WebContent/useradmin/charts.xhtml code/MoyaWeb/WebContent/useradmin/list.xhtml code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/user/ChartView.java
Liv Haapala committed
-
- 23 May, 2014 1 commit
-
-
- viilailuja käyttäjien tarkastusnäkymään
Liv Haapala committed
-
- 21 May, 2014 1 commit
-
-
Liv Haapala committed
-
- 20 May, 2014 1 commit
-
-
…ecteja, mitkä renderlidään kortille. - Tarkastusnäkymän Reject-napin korjaus. Tila muuttuu rejectoiduksi ja siitä voi lähettää sähköpostia käyttäjälle. - Lisätty tarkastusnäkymälistaukseen käyttäjän puhelinnumero ja sähköpostiosoite
Liv Haapala committed
-
- 19 May, 2014 3 commits
-
-
Liv Haapala committed
-
Conflicts: code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/BootstrapBean.java code/MoyaDatabase/src/META-INF/persistence.xml
Liv Haapala committed -
Calculation of age fixed Data for cardTemplate
Liv Haapala committed
-
- 18 May, 2014 2 commits
-
-
Rest auth fix kattonu: @tkfftk
Tuukka Kivilahti committed -
Networkassociation oh god Reviewed-by: @tuomari
Tuomas Riihimäki committed
-
- 17 May, 2014 15 commits
-
-
Antti Tönkyrä committed
-
Tuomas Riihimäki committed
-
Antti Tönkyrä committed
-
Antti Tönkyrä committed
-
Antti Tönkyrä committed
-
Votelistfix
Juho Juopperi committed -
Tuomas Riihimäki committed
-
JSON metadata fields for entities Adds meta JSON field to all GenericEntity entities. The field is of type json in PostgreSQL and of type JSONObject in Java. There are getMeta() and setMeta() accessors in GenericEntity and EntityMeta interface. Reviewed-By: @tuomari
Tuomas Riihimäki committed -
…nseTargets to licensetargets as it has really been generated lowercase in existing databases
Juho Juopperi committed -
Biling fixes Refactor some billing stuff. Mostly adding entity updating to all relevant reference entities. Also fixes #67 kattonu: @tkfftk
Tuukka Kivilahti committed -
Faces context fix Remove injecting FacesContext to managed beans (Views) and instead use FacesContext.getInstance() May fix IllegalStateExceptions kattonu: @tkfftk
Tuukka Kivilahti committed -
Streamfixes Mostly minor ui fixes. kattonu: @tkfftk
Tuukka Kivilahti committed -
Antti Tönkyrä committed
-
Juho Juopperi committed
-
Accidentally removed a dependency This reverts commit dfbaa469.
Juho Juopperi committed
-