Richard Flamsholt
|
30002270ad
|
Better description
|
2013-11-08 18:52:57 +01:00 |
Tihomir Valkanov
|
055ac525dc
|
Merge branch 'master' of https://github.com/telerik/hackaton-team15.git
|
2013-11-08 11:26:45 -06:00 |
|
Tihomir Valkanov
|
20adf4ec35
|
remove some files
|
2013-11-08 11:25:29 -06:00 |
|
Richard Flamsholt
|
b7d06c9553
|
Don't check in Graphite user-settings
|
2013-11-08 18:21:36 +01:00 |
|
Richard Flamsholt
|
a7945b62ab
|
Updated readme to match the final name, Whee
|
2013-11-08 18:20:11 +01:00 |
|
Tihomir Valkanov
|
f87bd09a25
|
cool join button
|
2013-11-08 11:05:46 -06:00 |
|
Tihomir Valkanov
|
663bac6443
|
cancel and done button new style
|
2013-11-08 11:00:53 -06:00 |
|
Richard Flamsholt
|
e4ca67dd0c
|
Use sans-serif which looks fine in simulator with iPhone5 selected
|
2013-11-08 10:04:54 -06:00 |
|
Richard Flamsholt
|
137ab8f66d
|
Add Open Sans font
|
2013-11-08 09:57:07 -06:00 |
|
Tihomir Valkanov
|
b2890ada33
|
add new cool button
|
2013-11-08 09:52:40 -06:00 |
|
Tihomir Valkanov
|
9836627d23
|
Merge branch 'master' of https://github.com/telerik/hackaton-team15.git
|
2013-11-08 09:48:08 -06:00 |
|
Tihomir Valkanov
|
c59f59f821
|
other more pretty font : )
|
2013-11-08 09:47:42 -06:00 |
|
Richard Flamsholt
|
324b144ed0
|
Nonexisting images were still shown - fixed
|
2013-11-08 09:44:12 -06:00 |
|
Tihomir Valkanov
|
0d78a9f7ae
|
Merge branch 'master' of https://github.com/telerik/hackaton-team15.git
|
2013-11-08 09:41:46 -06:00 |
|
Tihomir Valkanov
|
576063cf55
|
some styling stuff icons etc
|
2013-11-08 09:41:27 -06:00 |
|
Richard Flamsholt
|
b73239d42c
|
Don't show empty blocks if there is no image
|
2013-11-08 09:34:12 -06:00 |
|
Richard Flamsholt
|
03ebf299c9
|
Better Add Event view
|
2013-11-08 09:24:11 -06:00 |
|
Richard Flamsholt
|
5503abfe27
|
Graphite preferred " to ' in link-ref
|
2013-11-08 08:25:59 -06:00 |
|
Richard Flamsholt
|
70ae8b2421
|
Merge branch 'master' of https://github.com/telerik/hackaton-team15.git
Conflicts:
Eventer/views/feedView.html
|
2013-11-08 08:23:38 -06:00 |
|
Richard Flamsholt
|
648f359bcc
|
Use top-bar buttons for add-event Done
|
2013-11-08 08:20:53 -06:00 |
|
Tihomir Valkanov
|
4f16abcf55
|
some styling
|
2013-11-08 08:17:26 -06:00 |
|
Richard Flamsholt
|
d2305b2ba8
|
Proper Organizer and maxParticipants and go back when event is created
|
2013-11-08 07:41:18 -06:00 |
|
Richard Flamsholt
|
66f8da71bf
|
Changes made by Richard Flamsholt (richard.flamsholt@telerik.com).
|
2013-11-08 07:25:15 -06:00 |
|
Richard Flamsholt
|
bdcb69262c
|
Merge branch 'master' of https://github.com/telerik/hackaton-team15.git
Conflicts:
Eventer/views/feedView.html
|
2013-11-08 07:25:02 -06:00 |
|
Richard Flamsholt
|
775f8b8575
|
Moved max participants and removed locationcoordinates
|
2013-11-08 07:22:35 -06:00 |
|
Richard Flamsholt
|
712fc24738
|
first working add event
|
2013-11-08 06:58:33 -06:00 |
|
Richard Flamsholt
|
ee1ff0cda5
|
first working add event
|
2013-11-08 06:58:12 -06:00 |
|
Tihomir Valkanov
|
fd5712734a
|
get rid of the logout and back buttons
|
2013-11-08 06:32:21 -06:00 |
|
Tihomir Valkanov
|
dc6adf1f07
|
swipe gesture to go back on the feed
|
2013-11-08 06:28:23 -06:00 |
|
Richard Flamsholt
|
a65c57bab0
|
No changes, but Graphite wants to commit
|
2013-11-08 06:13:38 -06:00 |
|
Richard Flamsholt
|
41006f8818
|
Merge branch 'master' of https://github.com/telerik/hackaton-team15.git
Conflicts:
Eventer/styles/main.css
|
2013-11-08 06:13:01 -06:00 |
|
Richard Flamsholt
|
ca46bd214f
|
Added (non-functional yet) addEvent view
|
2013-11-08 05:51:41 -06:00 |
|
Tihomir Valkanov
|
b30c144d81
|
hardcoded avatars
|
2013-11-08 05:36:23 -06:00 |
|
Tihomir Valkanov
|
5f6913d188
|
some conflicts
|
2013-11-08 05:08:31 -06:00 |
|
Tihomir Valkanov
|
03de1ee7f3
|
Merge branch 'master' of https://github.com/telerik/hackaton-team15.git
|
2013-11-08 05:06:52 -06:00 |
|
Tihomir Valkanov
|
ab1da20936
|
clean up some old code
|
2013-11-08 05:05:26 -06:00 |
|
Richard Flamsholt
|
9cce1ae2b2
|
Ignore .user-settings.xml
|
2013-11-08 11:20:22 +01:00 |
|
Richard Flamsholt
|
822a7351d9
|
Put back Tihomirs lost changes
|
2013-11-08 04:05:45 +01:00 |
|
Richard Flamsholt
|
26b6c737ff
|
Merge branch 'master' of https://github.com/telerik/hackaton-team15.git
Conflicts:
.user-settings.xml
|
2013-11-07 19:44:59 -06:00 |
|
Tihomir Valkanov
|
bde3480894
|
View Event Page
|
2013-11-07 19:40:35 -06:00 |
|
Tihomir Valkanov
|
b9ed19c654
|
skip unnecessary login
|
2013-11-07 16:12:27 -06:00 |
|
Richard Flamsholt
|
5ba5b2c19b
|
Merge branch 'master' of https://github.com/telerik/hackaton-team15.git
|
2013-11-07 13:34:35 -06:00 |
|
Tihomir Valkanov
|
92eb6b385e
|
Demo Feed
|
2013-11-07 13:31:32 -06:00 |
|
Richard Flamsholt
|
7736d973cf
|
Merge branch 'master' of https://github.com/telerik/hackaton-team15.git
|
2013-11-07 10:47:08 -06:00 |
|
Richard Flamsholt
|
7f2fa04013
|
Changes made by Richard Flamsholt (richard.flamsholt@telerik.com).
|
2013-11-07 10:46:57 -06:00 |
|
Tihomir Valkanov
|
e40fd9b0f4
|
Changes made by Tihomir Valkanov (tihomir.valkanov@gmail.com).
|
2013-11-07 10:39:58 -06:00 |
|
Richard Flamsholt
|
98ce6c0ebe
|
Merge branch 'master' of https://github.com/telerik/hackaton-team15.git
Conflicts:
.gitignore
|
2013-11-07 10:10:36 -06:00 |
|
Richard Flamsholt
|
d1c8bd1f95
|
Added proper everlive api key for our app's data
|
2013-11-07 10:08:12 -06:00 |
|
Richard Flamsholt
|
18ea9f2048
|
Workspace created.
|
2013-11-07 09:36:27 -06:00 |
|
Richard Flamsholt
|
d088e0cda7
|
Useful links and source dir
|
2013-11-07 14:21:15 +01:00 |