]>
git.uio.no Git - u/erikhf/frm.git/log
summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Roza Moustafa [Tue, 24 Nov 2015 21:01:57 +0000 (22:01 +0100)]
Tester maater aa presentere filtererng paa i dropdwon-menyen
Roza Moustafa [Tue, 24 Nov 2015 19:49:29 +0000 (20:49 +0100)]
Border og skygge paa sookefelt og dropdown-knapp, endre farge ved focus
Roza Moustafa [Tue, 24 Nov 2015 19:47:36 +0000 (20:47 +0100)]
Oppned knapp for dropdown-menyen funker som det skal
Roza Moustafa [Tue, 24 Nov 2015 19:45:01 +0000 (20:45 +0100)]
lagt paa skygge
Roza Moustafa [Thu, 19 Nov 2015 19:08:06 +0000 (20:08 +0100)]
Merge branch 'navbar'
# Conflicts:
# src/components/app.html
# src/components/map/map.ts
# src/components/search/search.ts
Roza Moustafa [Thu, 19 Nov 2015 18:57:44 +0000 (19:57 +0100)]
design av nav, search og en liten dropdown meny
Erik Haider Forsén [Thu, 19 Nov 2015 17:01:35 +0000 (18:01 +0100)]
[search][map] Sending ID of clicked search result to map component
Yrjan A. F. Fraschetti [Thu, 19 Nov 2015 14:47:10 +0000 (15:47 +0100)]
Added a filter method in livesearch
Julie Hill Roa [Thu, 19 Nov 2015 09:13:45 +0000 (10:13 +0100)]
Merge branch 'map'
* map:
Added "this is you" marker
Added "this is you" marker
Added "this is you" marker
Julie Hill Roa [Thu, 19 Nov 2015 08:56:26 +0000 (09:56 +0100)]
Added "this is you" marker
Julie Hill Roa [Mon, 16 Nov 2015 07:05:07 +0000 (08:05 +0100)]
Added "this is you" marker
Julie Hill Roa [Mon, 16 Nov 2015 06:58:36 +0000 (07:58 +0100)]
Added "this is you" marker
Erik Haider Forsén [Sun, 15 Nov 2015 15:55:39 +0000 (16:55 +0100)]
[navbar] Renamed some links
Erik Haider Forsén [Sun, 15 Nov 2015 15:52:07 +0000 (16:52 +0100)]
[navbar] Created navbar, moved search component from app to navbar.
Erik Haider Forsén [Sun, 15 Nov 2015 15:30:21 +0000 (16:30 +0100)]
[search] Styling the search input and results
Erik Haider Forsén [Sun, 15 Nov 2015 13:25:04 +0000 (14:25 +0100)]
[search] Moved styles to separate css file
Erik Haider Forsén [Sun, 15 Nov 2015 11:49:42 +0000 (12:49 +0100)]
[search] Make search result clickable
Erik Haider Forsén [Sat, 14 Nov 2015 14:33:39 +0000 (15:33 +0100)]
[search] Code cleanup
Erik Haider Forsén [Sat, 14 Nov 2015 14:30:31 +0000 (15:30 +0100)]
Merge branch 'master' into search
* master:
Revert "[apiService] created a service for getting the API URL"
# Conflicts:
# src/components/app.ts
# src/index.html
Erik Haider Forsén [Sat, 14 Nov 2015 14:27:56 +0000 (15:27 +0100)]
Revert "[apiService] created a service for getting the API URL"
This reverts commit
aca80f6a97807505358ebe0d62d58e3de67252c3.
Erik Haider Forsén [Sat, 14 Nov 2015 13:04:45 +0000 (14:04 +0100)]
Merge branch 'master' into search
* master:
[apiService] created a service for getting the API URL
# Conflicts:
# src/components/app.ts
# src/index.html
Erik Haider Forsén [Sat, 14 Nov 2015 12:43:58 +0000 (13:43 +0100)]
[apiService] created a service for getting the API URL
Erik Haider Forsén [Sat, 14 Nov 2015 12:23:36 +0000 (13:23 +0100)]
[search] fixed api query, live/dynamic search is now working (verified on dhis-live platform)
Erik Haider Forsén [Sat, 14 Nov 2015 11:04:09 +0000 (12:04 +0100)]
Modified to query the api with the search string
Erik Haider Forsén [Sat, 14 Nov 2015 11:03:05 +0000 (12:03 +0100)]
No longer needed as we're using the query functionality in the API.
Erik Haider Forsén [Fri, 13 Nov 2015 17:46:09 +0000 (18:46 +0100)]
semi working live search
Erik Haider Forsén [Thu, 12 Nov 2015 15:01:58 +0000 (16:01 +0100)]
[search] experimenting with pipes
Erik Haider Forsén [Thu, 12 Nov 2015 13:11:13 +0000 (14:11 +0100)]
Fixed map (pair programming)
Erik Haider Forsén [Thu, 12 Nov 2015 12:01:58 +0000 (13:01 +0100)]
Fixed sample HTTP REST call to dhis api (pair programming)
Erik Haider Forsén [Thu, 12 Nov 2015 10:32:52 +0000 (11:32 +0100)]
Fixed placeholder for filter (pair programming)
Erik Haider Forsén [Thu, 12 Nov 2015 10:27:25 +0000 (11:27 +0100)]
Fixed placeholder for search (pair programming)
Erik Haider Forsén [Thu, 12 Nov 2015 10:24:01 +0000 (11:24 +0100)]
Fixed placeholder for map (pair programming)
Erik Haider Forsén [Thu, 12 Nov 2015 10:14:39 +0000 (11:14 +0100)]
New working structure after par programmering
Julie Hill Roa [Thu, 12 Nov 2015 08:25:05 +0000 (09:25 +0100)]
resdy to merge
Julie Hill Roa [Thu, 5 Nov 2015 14:03:03 +0000 (15:03 +0100)]
added a new structure
Erik Haider Forsén [Wed, 4 Nov 2015 14:29:09 +0000 (15:29 +0100)]
Updated gitignore
Erik Haider Forsén [Wed, 4 Nov 2015 13:41:49 +0000 (14:41 +0100)]
Cleaned up unused code
Erik Haider Forsén [Wed, 4 Nov 2015 13:38:57 +0000 (14:38 +0100)]
Fixed typo
Erik Haider Forsén [Mon, 2 Nov 2015 09:38:49 +0000 (10:38 +0100)]
fixed merge conflict
Erik Haider Forsén [Mon, 2 Nov 2015 09:35:52 +0000 (10:35 +0100)]
DHIS webapp
Erik Haider Forsén [Sat, 31 Oct 2015 15:58:13 +0000 (16:58 +0100)]
A dhis deployable sample app
Erik Haider Forsén [Sat, 31 Oct 2015 15:55:50 +0000 (16:55 +0100)]
updated gitignore to ignore zip archives
Erik Haider Forsén [Sat, 31 Oct 2015 15:26:55 +0000 (16:26 +0100)]
added some dependencies
Erik Haider Forsén [Sat, 31 Oct 2015 15:18:34 +0000 (16:18 +0100)]
reverted initial setup
Erik Haider Forsén [Fri, 30 Oct 2015 13:50:30 +0000 (14:50 +0100)]
updatet gitignore file
Erik Haider Forsén [Fri, 30 Oct 2015 12:08:14 +0000 (13:08 +0100)]
Created empty spring project with maven archetype plugin
Erik Haider Forsén [Fri, 30 Oct 2015 11:56:30 +0000 (12:56 +0100)]
initial commit