git://git.uio.no
/
u/erikhf/frm.git
/ shortlog
commit
grep
author
committer
pickaxe
?
search:
re
summary
| shortlog |
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
u/erikhf/frm.git
2015-12-06
Julie Hill Roa
draw searched parent and markes searched as active
drawserchedparent
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-06
Julie Hill Roa
[levels] modal buttons swaped
levels
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-06
Julie Hill Roa
[levels] map levelse more generic
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Erik Haider...
everything is working, great success
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Erik Haider...
yay merge
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Erik Haider...
merge fun
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Julie Hill Roa
some code fixes
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Julie Hill Roa
merge with master
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Roza Moustafa
merge filter og sookefelt funksjoner + litt redesign
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Julie Hill Roa
clean up
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Roza Moustafa
faa endringer
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Erik Haider...
Map position is updated live
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Roza Moustafa
ting oppaa kart
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Yrjan A. F...
Merge branch 'navbar'
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Yrjan A. F...
Added live filtering of search
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Julie Hill Roa
Resolved merge conflixts
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Julie Hill Roa
[showdetails] pop up fixed !
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Erik Haider...
[sidebar] fixed form design
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Erik Haider...
[fix] merge fix
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Erik Haider...
Merge branch 'sidebar'
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Erik Haider...
[sidebar] Using model-driven form instead of data-drive...
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Julie Hill Roa
[showdetails]merged master itno showdetails
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Julie Hill Roa
merge
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Roza Moustafa
merge master i modalboks
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Roza Moustafa
modal over kart
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Roza Moustafa
modal oppdatert med aa close fuksjon
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Julie Hill Roa
[stylegeojson] merge conflict resolved
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Julie Hill Roa
styled
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Roza Moustafa
merge modal
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Roza Moustafa
modal dukker opp ved trykk paa kart
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Julie Hill Roa
litte code cleanup
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Julie Hill Roa
style update
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Julie Hill Roa
[drwparent] bug fix
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Roza Moustafa
html kode for modal
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Julie Hill Roa
drawing parent for adding new orgU
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Roza Moustafa
Endrer styling, map som body-background resten kommente...
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-03
Yrjan A. F...
Fixed merge conflic in map.ts
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-01
Erik Haider...
[sidebar] Working on adding object
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-01
Erik Haider...
Merge branch 'master' into sidebar
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-12-01
Yrjan A. F...
Improved readability in search.ts
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-30
Yrjan A. F...
Added auto filling in filter selectors
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-29
Roza Moustafa
knapp som toommer search uten styling
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-26
Roza Moustafa
Sooke igjen etter aa ha klikket vekk fra sookeresultater
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-26
Julie Hill Roa
search done on map minus mapFocus
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-26
Julie Hill Roa
[focusSearched] deleted all geoJson and drew up the...
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-26
Julie Hill Roa
[ExpandLevels] bug fixes, no expanding and going up...
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-26
Julie Hill Roa
[ExpandLevels] expandes up and down
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-26
Yrjan A. F...
Working on filling in selectors for filter
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-26
Roza Moustafa
Sookeresultater forsvinner naar sookefeltet er tomt...
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-26
Julie Hill Roa
merged AddorgUnit into ExpandLevels
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-26
Julie Hill Roa
Trying to change style on marker
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-26
Julie Hill Roa
expaned to alle levels downwords
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-26
Roza Moustafa
Toomme filtering ved aa klikke vekk dropdown meny
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-26
Julie Hill Roa
[AddOrgUnit] done, except one calling method
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-26
Julie Hill Roa
[AddOrgUnit] removed geoLocation
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-26
Julie Hill Roa
[AddOrgUnit] made a cool marker
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-26
Erik Haider...
[sidebar] Functionality to cancel editing
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-26
Erik Haider...
[sidebar] Update existing organizational unit
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-26
Julie Hill Roa
[ExpandLevels] getting childs array from dhis api
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-26
Yrjan A. F...
Fixed issue with filter where multiple instances of...
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-26
Erik Haider...
Merge branch 'sidebar'
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-26
Erik Haider...
Merge branch 'sidebar'
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-26
Julie Hill Roa
[ExpansLevels] addListner on map only called once
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-26
Yrjan A. F...
Added select
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-26
Yrjan A. F...
Merge branch 'navbar' of git.uio.no:u/erikhf/frm into...
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-26
Yrjan A. F...
Added selectors for filter
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-26
Julie Hill Roa
shit dont work
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-26
Erik Haider...
[sidebar] template for showing and editing a organizati...
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-26
Roza Moustafa
oppdatert dropdown med selector
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-24
Roza Moustafa
Tester maater aa presentere filtererng paa i dropdwon...
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-24
Roza Moustafa
Border og skygge paa sookefelt og dropdown-knapp, endre...
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-24
Roza Moustafa
Oppned knapp for dropdown-menyen funker som det skal
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-24
Roza Moustafa
lagt paa skygge
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-22
Yrjan A. F...
merge!
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-22
Yrjan A. F...
Merge
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-19
Erik Haider...
[maps] removed markers
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-19
Erik Haider...
Fixed events between components
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-19
Julie Hill Roa
Merge branch 'map'
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-19
Julie Hill Roa
[map] removed other layers wehn moving down to next...
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-19
Roza Moustafa
Merge branch 'navbar'
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-19
Roza Moustafa
design av nav, search og en liten dropdown meny
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-19
Erik Haider...
[map] This fix
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-19
Erik Haider...
[sidebar] Showing basic information on side panel
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-19
Julie Hill Roa
[map] get id of clicked polygon
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-19
Erik Haider...
[sidebar] Skeleton up
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-19
Julie Hill Roa
[map] got contact with layer
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-19
Erik Haider...
[search][map] Sending ID of clicked search result to...
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-19
Julie Hill Roa
rest call for layer 2 and show it on map
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-19
Yrjan A. F...
Added a filter method in livesearch
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-19
Julie Hill Roa
Merge branch 'map'
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-19
Julie Hill Roa
Added "this is you" marker
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-16
Julie Hill Roa
Added "this is you" marker
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-16
Julie Hill Roa
Added "this is you" marker
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-15
Erik Haider...
[navbar] Renamed some links
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-15
Erik Haider...
[navbar] Created navbar, moved search component from...
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-15
Erik Haider...
[search] Styling the search input and results
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-15
Erik Haider...
[search] Moved styles to separate css file
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-15
Erik Haider...
[search] Make search result clickable
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-14
Erik Haider...
[search] Code cleanup
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
2015-11-14
Erik Haider...
Merge branch 'master' into search
commit
|
commitdiff
|
tree
| snapshot (
tar.bz2
zip
)
next