63 Commits
Author SHA1 Message Date
Marcin Michałek 25ae88ed14 profile interceptor fix 2015-01-29 09:58:39 +01:00
mar a8370ef8c4 fixy 2015-01-28 12:44:39 +01:00
mar 0ec9584b80 last ? 2015-01-27 23:40:34 +01:00
mar 0a1b9cac4b modyfikacja gisa 2015-01-27 23:22:54 +01:00
Marcin Michałek 9690f47213 Merge branch 'master' of https://github.com/lukasgol/bazy-projekt-rest 2015-01-27 23:12:38 +01:00
Marcin Michałek 090260c858 new profiles and configuration jar, log exceptions in profiles and configuration 2015-01-27 23:12:23 +01:00
mar 20e7c76adc modyfikacja gisa dadany delete 2015-01-27 21:50:31 +01:00
Marcin Michałek a2291465d3 Merge branch 'master' of https://github.com/lukasgol/bazy-projekt-rest 2015-01-27 21:05:27 +01:00
Marcin Michałek d78bcb87c0 logs: add optional limits parameter, default to 50 2015-01-27 21:04:57 +01:00
lukasgol d5a5cba4a9 refactor 2015-01-27 20:56:05 +01:00
mar 87547ed2d5 poprawki,poprawki, edycja gis 2015-01-27 19:49:43 +01:00
Marcin Michałek 241772baa7 loging requests 2015-01-27 19:04:41 +01:00
Marcin Michałek 4eb3768e12 loging partially, fox for sql way id 2015-01-27 17:31:04 +01:00
Marcin Michałek 51ad0bd7a0 get logs method 2015-01-27 15:55:16 +01:00
lukasgol 671b7e78db refactor 2015-01-27 00:36:52 +01:00
lukasgol b0c52e292f nowe uslugi do sensorow 2015-01-27 00:20:00 +01:00
lukasgol a8a5564078 sensory get all general 2015-01-26 23:45:20 +01:00
lukasgol b0e2e2ba75 pobieranie polygons 2015-01-26 22:51:19 +01:00
lukasgol d4d431433a Merge remote-tracking branch 'origin/master'
Conflicts:
	src/main/java/hello/agh/edu/bazy/dbApi/gis/GisDbApi.java
2015-01-26 22:49:37 +01:00
lukasgol f6032973a2 pobieranie polygons 2015-01-26 22:46:03 +01:00
Marcin Michałek 2dc17f8b93 change lamps to points, remove gis mapper for lamps, fix getinal all points and getting lapmps for id 2015-01-26 21:05:28 +01:00
Marcin Michałek 4abe8817e8 fix for put lamp 2015-01-26 19:15:54 +01:00
lukasgol 31c46b4a4a reafactor gisdbapi 2015-01-26 18:26:24 +01:00
mar 52df739b64 dodanie profili 2015-01-25 22:12:37 +01:00
Marcin Michałek 93ecd9ef9d add missing method to profiles controller 2015-01-25 22:07:15 +01:00
Marcin Michałek 3bc69682bc Merge branch 'master' of https://github.com/lukasgol/bazy-projekt-rest 2015-01-25 21:46:01 +01:00
Marcin Michałek 4ae295c873 Merge branch 'master' of https://github.com/lukasgol/bazy-projekt-rest
Conflicts:
	src/main/java/hello/agh/edu/bazy/controllers/ProfileController.java
	src/main/java/hello/agh/edu/bazy/path/APIServicePaths.java
2015-01-25 21:45:14 +01:00
mar 6e9c332f3c interceptor dla profiles 2015-01-25 21:41:08 +01:00
Marcin Michałek 39870c8298 profile controller part 2015-01-25 21:40:15 +01:00
mar aa4154fd7f czesciowy profile 2015-01-25 21:31:34 +01:00
mar ea675d9185 dodanie profile 2015-01-25 20:38:52 +01:00
Marcin Michałek 582e6edc86 import fix 2015-01-25 19:55:59 +01:00
mar 64379da3c4 poprawki 2015-01-25 19:54:11 +01:00
mar 9eb8f56961 poprawki 2015-01-25 19:51:14 +01:00
lukasgol 64db3de53e reafactor paczek 2015-01-25 17:08:26 +01:00
lukasgol 4777f65afe sensory pobieranie po id 2015-01-25 16:08:03 +01:00
lukasgol 233bcb7b18 refactor paczek 2015-01-25 15:42:44 +01:00
lukasgol 1e17d00cd3 wyczyszczenie properties i poprawa bledu w gis controllerze 2015-01-25 15:40:56 +01:00
Marcin Michałek 8de6cdf7c4 configure interceptors to work at specified path, interceptors for gis and sensors working 2015-01-25 12:20:20 +01:00
Marcin Michałek b5afe0fce9 modify interceptor to take module permission as parameter /paths do not work/ 2015-01-25 12:10:18 +01:00
Marcin Michałek f68af51a48 insert lamp: add id as parameter 2015-01-25 11:37:10 +01:00
Marcin Michałek 07c11d6c3b intercepting all requests and checking token for validity /commented out for now for easier testing/ 2015-01-25 11:06:08 +01:00
Marcin Michałek 81bb6c2961 get lamp by id, put lamp 2015-01-25 10:26:26 +01:00
Marcin Michałek de070f90aa remove cyclic dependancy sql error, list all gis lamps 2015-01-25 09:03:57 +01:00
Marcin Michałek 8d163bd84b add checking for precence of token and permission parameters /commented out for ease now/, disable login method 2015-01-25 09:03:10 +01:00
Marcin Michałek 382d4118c5 refactor, fix for gis db api not initializing jdbc template 2015-01-25 08:02:32 +01:00
lukasgol 1fd6391219 pobieranie danych szczeoglowych2 2015-01-25 03:19:52 +01:00
lukasgol bee8f3abe7 pobieranie danych szczeoglowych 2015-01-25 03:10:26 +01:00
lukasgol 70a2ab1427 poprawki 2015-01-25 01:01:33 +01:00
lukasgol 6737cd101e spac mi sie chce 2015-01-25 00:55:41 +01:00