u/erikhf/frm.git
3 years agoMerge branch 'sidebar'
Erik Haider Forsén [Thu, 26 Nov 2015 09:51:24 +0000]
Merge branch 'sidebar'

* sidebar:
  [sidebar] template for showing and editing a organization unit
  [sidebar] Showing basic information on side panel
  [sidebar] Skeleton up

# Conflicts:
# src/components/app.html
# src/components/app.ts
# src/components/sidebar/sidebar.html
# src/components/sidebar/sidebar.ts

3 years agoMerge branch 'sidebar'
Erik Haider Forsén [Thu, 26 Nov 2015 09:20:21 +0000]
Merge branch 'sidebar'

* sidebar:
  [sidebar] template for showing and editing a organization unit
  [sidebar] Showing basic information on side panel
  [sidebar] Skeleton up

# Conflicts:
# src/components/app.html
# src/components/app.ts
# src/components/sidebar/sidebar.html
# src/components/sidebar/sidebar.ts

3 years agoAdded select
Yrjan A. F. Fraschetti [Thu, 26 Nov 2015 09:15:25 +0000]
Added select

3 years agoMerge branch 'navbar' of git.uio.no:u/erikhf/frm into navbar
Yrjan A. F. Fraschetti [Thu, 26 Nov 2015 09:13:37 +0000]
Merge branch 'navbar' of git.uio.no:u/erikhf/frm into navbar

# Conflicts:
# src/components/navbar/navbar.html

3 years agoAdded selectors for filter
Yrjan A. F. Fraschetti [Thu, 26 Nov 2015 09:07:27 +0000]
Added selectors for filter

3 years ago[sidebar] template for showing and editing a organization unit
Erik Haider Forsén [Thu, 26 Nov 2015 09:05:18 +0000]
[sidebar] template for showing and editing a organization unit

3 years agooppdatert dropdown med selector
Roza Moustafa [Thu, 26 Nov 2015 08:59:50 +0000]
oppdatert dropdown med selector

3 years agoTester maater aa presentere filtererng paa i dropdwon-menyen
Roza Moustafa [Tue, 24 Nov 2015 21:01:57 +0000]
Tester maater aa presentere filtererng paa i dropdwon-menyen

3 years agoBorder og skygge paa sookefelt og dropdown-knapp, endre farge ved focus
Roza Moustafa [Tue, 24 Nov 2015 19:49:29 +0000]
Border og skygge paa sookefelt og dropdown-knapp, endre farge ved focus

3 years agoOppned knapp for dropdown-menyen funker som det skal
Roza Moustafa [Tue, 24 Nov 2015 19:47:36 +0000]
Oppned knapp for dropdown-menyen funker som det skal

3 years agolagt paa skygge
Roza Moustafa [Tue, 24 Nov 2015 19:45:01 +0000]
lagt  paa skygge

3 years agomerge!
Yrjan A. F. Fraschetti [Sun, 22 Nov 2015 21:24:45 +0000]
merge!

3 years agoMerge
Yrjan A. F. Fraschetti [Sun, 22 Nov 2015 21:22:29 +0000]
Merge

3 years ago[maps] removed markers
Erik Haider Forsén [Thu, 19 Nov 2015 19:50:49 +0000]
[maps] removed markers

3 years agoFixed events between components
Erik Haider Forsén [Thu, 19 Nov 2015 19:48:30 +0000]
Fixed events between components

3 years agoMerge branch 'map'
Julie Hill Roa [Thu, 19 Nov 2015 19:38:07 +0000]
Merge branch 'map'

* map:
  [map] removed other layers wehn moving down to next level
  [map] This fix
  [map] get id of clicked polygon
  [map] got contact with layer
  rest call for layer 2 and show it on map

3 years ago[map] removed other layers wehn moving down to next level
Julie Hill Roa [Thu, 19 Nov 2015 19:36:04 +0000]
[map] removed other layers wehn moving down to next level

3 years agoMerge branch 'navbar'
Roza Moustafa [Thu, 19 Nov 2015 19:08:06 +0000]
Merge branch 'navbar'

# Conflicts:
# src/components/app.html
# src/components/map/map.ts
# src/components/search/search.ts

3 years agodesign av nav, search og en liten dropdown meny
Roza Moustafa [Thu, 19 Nov 2015 18:57:44 +0000]
design av nav, search og en liten dropdown meny

3 years ago[map] This fix
Erik Haider Forsén [Thu, 19 Nov 2015 18:46:11 +0000]
[map] This fix

3 years ago[sidebar] Showing basic information on side panel
Erik Haider Forsén [Thu, 19 Nov 2015 18:32:50 +0000]
[sidebar] Showing basic information on side panel

3 years ago[map] get id of clicked polygon
Julie Hill Roa [Thu, 19 Nov 2015 18:21:51 +0000]
[map] get id of clicked polygon

3 years ago[sidebar] Skeleton up
Erik Haider Forsén [Thu, 19 Nov 2015 17:41:50 +0000]
[sidebar] Skeleton up

3 years ago[map] got contact with layer
Julie Hill Roa [Thu, 19 Nov 2015 17:19:30 +0000]
[map] got contact with layer

3 years ago[search][map] Sending ID of clicked search result to map component
Erik Haider Forsén [Thu, 19 Nov 2015 17:01:35 +0000]
[search][map] Sending ID of clicked search result to map component

3 years agorest call for layer 2 and show it on map
Julie Hill Roa [Thu, 19 Nov 2015 15:21:32 +0000]
rest call for layer 2 and show it on map

3 years agoAdded a filter method in livesearch
Yrjan A. F. Fraschetti [Thu, 19 Nov 2015 14:47:10 +0000]
Added a filter method in livesearch

3 years agoMerge branch 'map'
Julie Hill Roa [Thu, 19 Nov 2015 09:13:45 +0000]
Merge branch 'map'

* map:
  Added "this is you" marker
  Added "this is you" marker
  Added "this is you" marker

3 years agoAdded "this is you" marker
Julie Hill Roa [Thu, 19 Nov 2015 08:56:26 +0000]
Added "this is you" marker

3 years agoAdded "this is you" marker
Julie Hill Roa [Mon, 16 Nov 2015 07:05:07 +0000]
Added "this is you" marker

3 years agoAdded "this is you" marker
Julie Hill Roa [Mon, 16 Nov 2015 06:58:36 +0000]
Added "this is you" marker

3 years ago[navbar] Renamed some links
Erik Haider Forsén [Sun, 15 Nov 2015 15:55:39 +0000]
[navbar] Renamed some links

3 years ago[navbar] Created navbar, moved search component from app to navbar.
Erik Haider Forsén [Sun, 15 Nov 2015 15:52:07 +0000]
[navbar] Created navbar, moved search component from app to navbar.

3 years ago[search] Styling the search input and results
Erik Haider Forsén [Sun, 15 Nov 2015 15:30:21 +0000]
[search] Styling the search input and results

3 years ago[search] Moved styles to separate css file
Erik Haider Forsén [Sun, 15 Nov 2015 13:25:04 +0000]
[search] Moved styles to separate css file

3 years ago[search] Make search result clickable
Erik Haider Forsén [Sun, 15 Nov 2015 11:49:42 +0000]
[search] Make search result clickable

3 years ago[search] Code cleanup
Erik Haider Forsén [Sat, 14 Nov 2015 14:33:39 +0000]
[search] Code cleanup

3 years agoMerge branch 'master' into search
Erik Haider Forsén [Sat, 14 Nov 2015 14:30:31 +0000]
Merge branch 'master' into search

* master:
  Revert "[apiService] created a service for getting the API URL"

# Conflicts:
# src/components/app.ts
# src/index.html

3 years agoRevert "[apiService] created a service for getting the API URL"
Erik Haider Forsén [Sat, 14 Nov 2015 14:27:56 +0000]
Revert "[apiService] created a service for getting the API URL"

This reverts commit aca80f6a97807505358ebe0d62d58e3de67252c3.

3 years agoMerge branch 'master' into search
Erik Haider Forsén [Sat, 14 Nov 2015 13:04:45 +0000]
Merge branch 'master' into search

* master:
  [apiService] created a service for getting the API URL

# Conflicts:
# src/components/app.ts
# src/index.html

3 years ago[apiService] created a service for getting the API URL
Erik Haider Forsén [Sat, 14 Nov 2015 12:43:58 +0000]
[apiService] created a service for getting the API URL

3 years ago[search] fixed api query, live/dynamic search is now working (verified on dhis-live...
Erik Haider Forsén [Sat, 14 Nov 2015 12:23:36 +0000]
[search] fixed api query, live/dynamic search is now working (verified on dhis-live platform)

3 years agoModified to query the api with the search string
Erik Haider Forsén [Sat, 14 Nov 2015 11:04:09 +0000]
Modified to query the api with the search string

3 years agoNo longer needed as we're using the query functionality in the API.
Erik Haider Forsén [Sat, 14 Nov 2015 11:03:05 +0000]
No longer needed as we're using the query functionality in the API.

3 years agosemi working live search
Erik Haider Forsén [Fri, 13 Nov 2015 17:46:09 +0000]
semi working live search

3 years ago[search] experimenting with pipes
Erik Haider Forsén [Thu, 12 Nov 2015 15:01:58 +0000]
[search] experimenting with pipes

3 years agoFixed map (pair programming)
Erik Haider Forsén [Thu, 12 Nov 2015 13:11:13 +0000]
Fixed map  (pair programming)

3 years agoFixed sample HTTP REST call to dhis api (pair programming)
Erik Haider Forsén [Thu, 12 Nov 2015 12:01:58 +0000]
Fixed sample HTTP REST call to dhis api (pair programming)

3 years agoFixed placeholder for filter (pair programming)
Erik Haider Forsén [Thu, 12 Nov 2015 10:32:52 +0000]
Fixed placeholder for filter (pair programming)

3 years agoFixed placeholder for search (pair programming)
Erik Haider Forsén [Thu, 12 Nov 2015 10:27:25 +0000]
Fixed placeholder for search (pair programming)

3 years agoFixed placeholder for map (pair programming)
Erik Haider Forsén [Thu, 12 Nov 2015 10:24:01 +0000]
Fixed placeholder for map (pair programming)

3 years agoNew working structure after par programmering
Erik Haider Forsén [Thu, 12 Nov 2015 10:14:39 +0000]
New working structure after par programmering

3 years agoresdy to merge
Julie Hill Roa [Thu, 12 Nov 2015 08:25:05 +0000]
resdy to merge

3 years agoadded a new structure
Julie Hill Roa [Thu, 5 Nov 2015 14:03:03 +0000]
added a new structure

3 years agoUpdated gitignore
Erik Haider Forsén [Wed, 4 Nov 2015 14:29:09 +0000]
Updated gitignore

3 years agoCleaned up unused code
Erik Haider Forsén [Wed, 4 Nov 2015 13:41:49 +0000]
Cleaned up unused code

3 years agoFixed typo
Erik Haider Forsén [Wed, 4 Nov 2015 13:38:57 +0000]
Fixed typo

3 years agofixed merge conflict
Erik Haider Forsén [Mon, 2 Nov 2015 09:38:49 +0000]
fixed merge conflict

3 years agoDHIS webapp
Erik Haider Forsén [Mon, 2 Nov 2015 09:35:52 +0000]
DHIS webapp

3 years agoA dhis deployable sample app
Erik Haider Forsén [Sat, 31 Oct 2015 15:58:13 +0000]
A dhis deployable sample app

3 years agoupdated gitignore to ignore zip archives
Erik Haider Forsén [Sat, 31 Oct 2015 15:55:50 +0000]
updated gitignore to ignore zip archives

3 years agoadded some dependencies
Erik Haider Forsén [Sat, 31 Oct 2015 15:26:55 +0000]
added some dependencies

3 years agoreverted initial setup
Erik Haider Forsén [Sat, 31 Oct 2015 15:18:34 +0000]
reverted initial setup

3 years agoupdatet gitignore file
Erik Haider Forsén [Fri, 30 Oct 2015 13:50:30 +0000]
updatet gitignore file

3 years agoCreated empty spring project with maven archetype plugin
Erik Haider Forsén [Fri, 30 Oct 2015 12:08:14 +0000]
Created empty spring project with maven archetype plugin

3 years agoinitial commit
Erik Haider Forsén [Fri, 30 Oct 2015 11:56:30 +0000]
initial commit