]>
git.uio.no Git - u/erikhf/frm.git/log
Roza Moustafa [Sun, 13 Dec 2015 10:16:40 +0000 (11:16 +0100)]
Merge branch 'master' of git.uio.no:u/erikhf/frm
Julie Hill Roa [Sun, 13 Dec 2015 09:19:01 +0000 (10:19 +0100)]
final commit
Roza Moustafa [Sat, 12 Dec 2015 09:40:54 +0000 (10:40 +0100)]
ryddet opp i css filene, benytter kun map.css
Julie Hill Roa [Fri, 11 Dec 2015 14:48:14 +0000 (15:48 +0100)]
small bux fix in add/edit
Julie Hill Roa [Fri, 11 Dec 2015 13:00:54 +0000 (14:00 +0100)]
fix in adding and editing markers
Julie Hill Roa [Thu, 10 Dec 2015 18:53:59 +0000 (19:53 +0100)]
merge with master
Erik Haider Forsén [Thu, 10 Dec 2015 18:50:17 +0000 (19:50 +0100)]
fix for drawing temp marker
Yrjan A. F. Fraschetti [Thu, 10 Dec 2015 18:35:41 +0000 (19:35 +0100)]
cleanup in map.css
Yrjan A. F. Fraschetti [Thu, 10 Dec 2015 18:33:36 +0000 (19:33 +0100)]
Merge branch 'master' of git.uio.no:u/erikhf/frm
Yrjan A. F. Fraschetti [Thu, 10 Dec 2015 18:33:23 +0000 (19:33 +0100)]
Tried to make divresult adjust to the size of the window. Unsucessfull
Erik Haider Forsén [Thu, 10 Dec 2015 18:23:15 +0000 (19:23 +0100)]
[sidebar] Added comments, formatted code
Erik Haider Forsén [Thu, 10 Dec 2015 18:05:13 +0000 (19:05 +0100)]
[sidebar][bugfix] Is now able to save new coordinates on existing organisational unit
Yrjan A. F. Fraschetti [Thu, 10 Dec 2015 18:17:41 +0000 (19:17 +0100)]
Added more comments to setFilter()
Yrjan A. F. Fraschetti [Thu, 10 Dec 2015 18:14:13 +0000 (19:14 +0100)]
Added more comments to checkOrgunits()
Yrjan A. F. Fraschetti [Thu, 10 Dec 2015 18:05:35 +0000 (19:05 +0100)]
Added functionality where the filter box is removed if visible when org unit is selected
Yrjan A. F. Fraschetti [Thu, 10 Dec 2015 17:57:29 +0000 (18:57 +0100)]
Made filterbutton toggle from ts and not html
Yrjan A. F. Fraschetti [Thu, 10 Dec 2015 17:52:34 +0000 (18:52 +0100)]
Cleanup in search
Julie Hill Roa [Thu, 10 Dec 2015 17:13:53 +0000 (18:13 +0100)]
Merge branch 'master' of git.uio.no:u/erikhf/frm
* 'master' of git.uio.no:u/erikhf/frm:
Small fixes in filter gui
[bugfix] edit and add positions
roza og julie masseee farger
mer design alle gly paa plass
mer design og fikset at no result forsvinner igjen ved sidebar open
sidebar design oppdatert
mer design
kommentarer, ryddet i koden
Julie Hill Roa [Thu, 10 Dec 2015 17:13:46 +0000 (18:13 +0100)]
small fix
Yrjan A. F. Fraschetti [Thu, 10 Dec 2015 17:10:16 +0000 (18:10 +0100)]
Fixed merge conflicts
Yrjan A. F. Fraschetti [Thu, 10 Dec 2015 17:08:41 +0000 (18:08 +0100)]
Small fixes in filter gui
Erik Haider Forsén [Thu, 10 Dec 2015 17:06:01 +0000 (18:06 +0100)]
[bugfix] edit and add positions
Roza Moustafa [Thu, 10 Dec 2015 16:58:33 +0000 (17:58 +0100)]
design ferdig for i dag
Roza Moustafa [Thu, 10 Dec 2015 16:53:31 +0000 (17:53 +0100)]
roza og julie masseee farger
Roza Moustafa [Thu, 10 Dec 2015 16:51:24 +0000 (17:51 +0100)]
Merge branch 'master' of git.uio.no:u/erikhf/frm
Roza Moustafa [Thu, 10 Dec 2015 16:50:50 +0000 (17:50 +0100)]
mer design alle gly paa plass
Roza Moustafa [Thu, 10 Dec 2015 16:44:51 +0000 (17:44 +0100)]
mer design og fikset at no result forsvinner igjen ved sidebar open
Roza Moustafa [Thu, 10 Dec 2015 16:23:15 +0000 (17:23 +0100)]
sidebar design oppdatert
Roza Moustafa [Thu, 10 Dec 2015 15:54:30 +0000 (16:54 +0100)]
mer design
Roza Moustafa [Thu, 10 Dec 2015 15:17:50 +0000 (16:17 +0100)]
kommentarer, ryddet i koden
Julie Hill Roa [Thu, 10 Dec 2015 15:17:17 +0000 (16:17 +0100)]
commented code i map.ts
Julie Hill Roa [Thu, 10 Dec 2015 14:48:27 +0000 (15:48 +0100)]
bugfix
Julie Hill Roa [Thu, 10 Dec 2015 14:44:56 +0000 (15:44 +0100)]
Merge branch 'colorpolygon'
* colorpolygon:
commented out tooltip
bugfix
changes colors
[colorpolygon] added tooptip if we want
changed colors on polygon
Julie Hill Roa [Thu, 10 Dec 2015 14:43:50 +0000 (15:43 +0100)]
commented out tooltip
Roza Moustafa [Thu, 10 Dec 2015 13:08:50 +0000 (14:08 +0100)]
Merge branch 'roza'
Julie Hill Roa [Wed, 9 Dec 2015 20:13:01 +0000 (21:13 +0100)]
bugfix
Julie Hill Roa [Wed, 9 Dec 2015 20:09:49 +0000 (21:09 +0100)]
changes colors
Julie Hill Roa [Wed, 9 Dec 2015 20:09:38 +0000 (21:09 +0100)]
merge med master
Julie Hill Roa [Wed, 9 Dec 2015 19:18:25 +0000 (20:18 +0100)]
bugfix
Roza Moustafa [Tue, 8 Dec 2015 17:13:39 +0000 (18:13 +0100)]
flyttet css sidebar til map, og designet alle sidebar-elementer
Yrjan A. F. Fraschetti [Tue, 8 Dec 2015 13:45:20 +0000 (14:45 +0100)]
Added some comments to search
Yrjan A. F. Fraschetti [Tue, 8 Dec 2015 13:29:05 +0000 (14:29 +0100)]
Cleanup of code in search
Julie Hill Roa [Sun, 6 Dec 2015 18:53:33 +0000 (19:53 +0100)]
Merge branch 'master' of git.uio.no:u/erikhf/frm
* 'master' of git.uio.no:u/erikhf/frm:
litt design
Julie Hill Roa [Sun, 6 Dec 2015 18:53:28 +0000 (19:53 +0100)]
quick bug fix
Roza Moustafa [Sun, 6 Dec 2015 18:47:03 +0000 (19:47 +0100)]
litt design
Erik Haider Forsén [Sun, 6 Dec 2015 18:35:35 +0000 (19:35 +0100)]
[pair-programming] final touch
Julie Hill Roa [Sun, 6 Dec 2015 16:46:52 +0000 (17:46 +0100)]
merge
Roza Moustafa [Sun, 6 Dec 2015 16:37:51 +0000 (17:37 +0100)]
merge faardih
Roza Moustafa [Sun, 6 Dec 2015 16:27:58 +0000 (17:27 +0100)]
start paa modal
Erik Haider Forsén [Sun, 6 Dec 2015 16:27:55 +0000 (17:27 +0100)]
Merge branch 'addedit'
* addedit:
[sidebar] Tried to add organisationUnitGroups, unsuccessful
[sibebar] added polygon
[sidebar] Added warning if org unit doesn't have coordinates. Added more contact information to sidebar
[sidebar] Date is now working properly on read and write
[bugfix] If "featureType" is not present in PUT request, it will be set to "NONE" in the API. Fixed
Erik Haider Forsén [Sun, 6 Dec 2015 16:26:25 +0000 (17:26 +0100)]
[sidebar] Tried to add organisationUnitGroups, unsuccessful
Yrjan A. F. Fraschetti [Sun, 6 Dec 2015 16:24:00 +0000 (17:24 +0100)]
Added a beatiful design to the sidebar
Roza Moustafa [Sun, 6 Dec 2015 15:25:21 +0000 (16:25 +0100)]
litt design av filtermeny + plassering
Julie Hill Roa [Sun, 6 Dec 2015 15:06:50 +0000 (16:06 +0100)]
Merge branch 'master' of git.uio.no:u/erikhf/frm
* 'master' of git.uio.no:u/erikhf/frm:
Cleanup
Added message for no result when searching
Julie Hill Roa [Sun, 6 Dec 2015 15:05:49 +0000 (16:05 +0100)]
[colorpolygon] added tooptip if we want
Yrjan A. F. Fraschetti [Sun, 6 Dec 2015 14:56:02 +0000 (15:56 +0100)]
Cleanup
Julie Hill Roa [Sun, 6 Dec 2015 14:38:43 +0000 (15:38 +0100)]
changed colors on polygon
Roza Moustafa [Sun, 6 Dec 2015 14:35:51 +0000 (15:35 +0100)]
searchbar design, lukke resultat, hoyde med scroll og tomme inputen + plassering
Yrjan A. F. Fraschetti [Sun, 6 Dec 2015 14:24:38 +0000 (15:24 +0100)]
Merge branch 'searchbug'
Added message for when there is no result in search
Yrjan A. F. Fraschetti [Sun, 6 Dec 2015 14:23:29 +0000 (15:23 +0100)]
Added message for no result when searching
Julie Hill Roa [Sun, 6 Dec 2015 14:16:42 +0000 (15:16 +0100)]
Merge branch 'centermap'
* centermap:
[centermap] centering map on last point
focus on points
Julie Hill Roa [Sun, 6 Dec 2015 14:16:11 +0000 (15:16 +0100)]
[centermap] centering map on last point
Yrjan A. F. Fraschetti [Sun, 6 Dec 2015 12:49:50 +0000 (13:49 +0100)]
Merge branch 'searchbug'
Added new fix for updating search when filter is set
Yrjan A. F. Fraschetti [Sun, 6 Dec 2015 12:42:07 +0000 (13:42 +0100)]
Fixed bug where search does not update when filter is set
Julie Hill Roa [Sun, 6 Dec 2015 12:29:02 +0000 (13:29 +0100)]
focus on points
Yrjan A. F. Fraschetti [Sun, 6 Dec 2015 11:54:42 +0000 (12:54 +0100)]
Merge branch 'searchbug'
Mostly bugfixes regarding search an filter
Yrjan A. F. Fraschetti [Sun, 6 Dec 2015 11:51:38 +0000 (12:51 +0100)]
Fixed bugs where searchresult did not update, where searchlist got duplicated when filter was applied, and reset the searchlist when filter is removed
Erik Haider Forsén [Sun, 6 Dec 2015 11:32:08 +0000 (12:32 +0100)]
[sibebar] added polygon
Julie Hill Roa [Sun, 6 Dec 2015 11:18:59 +0000 (12:18 +0100)]
draw searched parent and markes searched as active
Erik Haider Forsén [Sun, 6 Dec 2015 10:55:19 +0000 (11:55 +0100)]
[sidebar] Added warning if org unit doesn't have coordinates. Added more contact information to sidebar
Erik Haider Forsén [Sun, 6 Dec 2015 10:26:42 +0000 (11:26 +0100)]
[sidebar] Date is now working properly on read and write
Erik Haider Forsén [Sun, 6 Dec 2015 09:11:43 +0000 (10:11 +0100)]
[bugfix] If "featureType" is not present in PUT request, it will be set to "NONE" in the API. Fixed
Julie Hill Roa [Sun, 6 Dec 2015 09:01:03 +0000 (10:01 +0100)]
[levels] modal buttons swaped
Julie Hill Roa [Sun, 6 Dec 2015 09:00:38 +0000 (10:00 +0100)]
[levels] map levelse more generic
Erik Haider Forsén [Thu, 3 Dec 2015 21:54:55 +0000 (22:54 +0100)]
everything is working, great success
Erik Haider Forsén [Thu, 3 Dec 2015 21:45:54 +0000 (22:45 +0100)]
yay merge
Erik Haider Forsén [Thu, 3 Dec 2015 21:36:15 +0000 (22:36 +0100)]
merge fun
Julie Hill Roa [Thu, 3 Dec 2015 21:06:18 +0000 (22:06 +0100)]
some code fixes
Julie Hill Roa [Thu, 3 Dec 2015 21:05:54 +0000 (22:05 +0100)]
merge with master
Roza Moustafa [Thu, 3 Dec 2015 19:47:35 +0000 (20:47 +0100)]
merge filter og sookefelt funksjoner + litt redesign
Julie Hill Roa [Thu, 3 Dec 2015 19:28:39 +0000 (20:28 +0100)]
clean up
Roza Moustafa [Thu, 3 Dec 2015 19:26:22 +0000 (20:26 +0100)]
faa endringer
Erik Haider Forsén [Thu, 3 Dec 2015 19:21:06 +0000 (20:21 +0100)]
Map position is updated live
Roza Moustafa [Thu, 3 Dec 2015 18:14:09 +0000 (19:14 +0100)]
ting oppaa kart
Yrjan A. F. Fraschetti [Thu, 3 Dec 2015 18:00:16 +0000 (19:00 +0100)]
Merge branch 'navbar'
Added new features for filtering
Yrjan A. F. Fraschetti [Thu, 3 Dec 2015 17:57:43 +0000 (18:57 +0100)]
Added live filtering of search
Julie Hill Roa [Thu, 3 Dec 2015 17:55:25 +0000 (18:55 +0100)]
Resolved merge conflixts
Julie Hill Roa [Thu, 3 Dec 2015 17:35:19 +0000 (18:35 +0100)]
[showdetails] pop up fixed !
Erik Haider Forsén [Thu, 3 Dec 2015 17:35:03 +0000 (18:35 +0100)]
[sidebar] fixed form design
Erik Haider Forsén [Thu, 3 Dec 2015 14:29:20 +0000 (15:29 +0100)]
[fix] merge fix
Erik Haider Forsén [Thu, 3 Dec 2015 14:12:42 +0000 (15:12 +0100)]
Merge branch 'sidebar'
* sidebar:
[sidebar] Using model-driven form instead of data-driven form
[sidebar] Working on adding object
[sidebar] Functionality to cancel editing
[sidebar] Update existing organizational unit
# Conflicts:
# src/components/map/map.ts
Erik Haider Forsén [Thu, 3 Dec 2015 14:07:48 +0000 (15:07 +0100)]
[sidebar] Using model-driven form instead of data-driven form
Julie Hill Roa [Thu, 3 Dec 2015 12:48:29 +0000 (13:48 +0100)]
[showdetails]merged master itno showdetails
Julie Hill Roa [Thu, 3 Dec 2015 12:45:57 +0000 (13:45 +0100)]
merge
Roza Moustafa [Thu, 3 Dec 2015 12:27:42 +0000 (13:27 +0100)]
merge master i modalboks
Roza Moustafa [Thu, 3 Dec 2015 12:18:22 +0000 (13:18 +0100)]
modal over kart
Roza Moustafa [Thu, 3 Dec 2015 12:07:09 +0000 (13:07 +0100)]
modal oppdatert med aa close fuksjon
Julie Hill Roa [Thu, 3 Dec 2015 11:53:13 +0000 (12:53 +0100)]
[stylegeojson] merge conflict resolved
Julie Hill Roa [Thu, 3 Dec 2015 11:48:54 +0000 (12:48 +0100)]
styled
Roza Moustafa [Thu, 3 Dec 2015 11:11:48 +0000 (12:11 +0100)]
merge modal