Граф коммитов

470 Коммитов

Автор SHA1 Сообщение Дата
stoyanvi 12ef742ae0 #327414 Update color of some labels 2017-02-08 15:51:07 +02:00
stoyanvi 1233394f87 #327414 Add native popup menu for android 2017-02-08 14:10:27 +02:00
Georgi Prodanov 4156aae762 #328674 Change error message text. 2017-02-08 13:22:42 +02:00
Georgi Prodanov 39e776e94e #327413 Small adjustment to join group button and request status logic. 2017-02-08 13:03:21 +02:00
Georgi Prodanov fef16a4eaf Merge branch 'master' into gp/bugfixes-p2
# Conflicts:
#	app/groups/group-details/group-details.component.ts
2017-02-08 10:24:44 +02:00
Georgi Prodanov 4783956e3e #328656 Implement the concept of join requests. 2017-02-08 10:12:35 +02:00
stoyanvi 7b722f4dbd #327414 Fix Login page layout 2017-02-08 10:11:09 +02:00
stoyanvi 17a6915d29 #327414 Add arrow icon to user-display 2017-02-07 16:44:29 +02:00
stoyanvi 6601002420 #327414 Change Event and Group Details actions menu 2017-02-07 16:14:00 +02:00
stoyanvi 07130fcd98 #327414 Add Groups empty screen 2017-02-07 13:34:52 +02:00
Georgi Prodanov 1ae5dff68b #328430 Order user groups alphabetically as well. 2017-02-07 11:40:29 +02:00
Georgi Prodanov 2bd9fe06c1 Merge branch 'master' into gp/bugfixes-p2 2017-02-07 11:34:11 +02:00
Georgi Prodanov 5600899b66 #328494 Login user after successful registration. Fix settings screen to show unupdated values if update request fails. 2017-02-07 11:25:16 +02:00
stoyanvi 8fdf2f58b8 Merge branch 'master' into sivanov/styles 2017-02-07 11:13:25 +02:00
stoyanvi 05ca5c32f6 #327414 Add Events empty screens 2017-02-07 11:12:34 +02:00
Georgi Prodanov 9fc9038b49 #327413 Fix explosions when a user is deleted through the admin portal. 2017-02-06 18:59:13 +02:00
Georgi Prodanov 601580e168 Merge branch 'sivanov/styles' into gp/bugfixes-p2 2017-02-06 17:15:56 +02:00
stoyanvi b189566ef6 #327414 Change "dots menu" icon color 2017-02-06 13:05:43 +02:00
Georgi Prodanov 5e7ff21aa7 #328425 Hide "view requests" button when group does not require approval. 2017-02-06 12:44:01 +02:00
Georgi Prodanov 855212de88 #328133 Disable join group button after first request. 2017-02-06 12:33:00 +02:00
Georgi Prodanov 7e925bf846 #327413 Update push plugin version. 2017-02-03 23:06:34 +02:00
Georgi Prodanov 7075590b4a #328432 Fix error in checking for ability to unregister and add error for unexpected count of updated registrations when changing date vote. 2017-02-03 23:04:48 +02:00
Georgi Prodanov fce321acc5 Merge branch 'master' of github.com:telerik/team-spirit 2017-02-03 22:22:14 +02:00
Georgi Prodanov 406ae2b2fa #328432 Hide unregister option for past events. 2017-02-03 22:21:59 +02:00
stoyanvi d8ee3ad15e Merge branch 'master' into sivanov/styles 2017-02-03 16:37:59 +02:00
stoyanvi a4459bae93 #327414 Add icons and background resources to iOS. 2017-02-03 16:36:18 +02:00
Georgi Prodanov 4b052e8baa Merge branch 'master' into gp/bugfixes-p2
# Conflicts:
#	app/events/event-details/event-details.template.html
2017-02-03 16:28:15 +02:00
Georgi Prodanov 2d38df348f #328449 Change error message for unsuccessful login. 2017-02-03 15:51:03 +02:00
Georgi Prodanov abc2f1e09d #328432 Add some text when there are no group events. Add "dots menu" to group details page. Revert removing of delete button from edit event screen. 2017-02-03 15:26:27 +02:00
stoyanvi 82465f44d5 #327414 Event Details: Remove button margins 2017-02-03 15:24:17 +02:00
stoyanvi 1287952daf #327414 Add registered label styling 2017-02-03 14:53:49 +02:00
Georgi Prodanov ddc18e719f #328087 #328043 Add the "dots menu" to Android and unstyled version for iOS and move the delete button there. 2017-02-03 14:16:02 +02:00
Georgi Prodanov 5e70a333b5 Merge branch 'master' into gp/bugfixes-p2 2017-02-03 12:45:20 +02:00
Georgi Prodanov 5fabd5343a #328043 #327413 Add registered label to events list and event details screens. Fix scrolling on group members and event participants screens.
WIP: Unregister button and change vote button should be moved to action bar.
2017-02-03 12:43:57 +02:00
stoyanvi b24755d27d #327414 Change Profile view background according to wireframes 2017-02-03 10:45:30 +02:00
stoyanvi e110157894 #327414 Small adjustments to login layout 2017-02-03 10:01:58 +02:00
Georgi Prodanov 8055688450 #328087 Add ability to change event date vote and unregister from event altogether. 2017-02-02 19:51:03 +02:00
stoyanvi d5b6e24c26 #327414 Adding "zig zag" background to .no-image and profile view 2017-02-02 16:03:22 +02:00
Georgi Prodanov 541069d497 #327413 Patch tab-view bug on Android when restoring app on a screen with a tab-view component. 2017-02-02 11:59:06 +02:00
stoyanvi 406c59964a #327414 Change back button icon in Group Members view 2017-02-02 08:28:45 +02:00
Georgi Prodanov f2cf7414ee #328491 Fix clear of model when switching between register and login views. 2017-02-01 18:15:21 +02:00
Georgi Prodanov 464e4b006c #327413 Add title to group details screen. 2017-02-01 17:38:13 +02:00
Georgi Prodanov da1b59a6c2 #327413 Add cancel button to user edit screen. 2017-02-01 16:34:20 +02:00
Georgi Prodanov 03f73be7b2 Merge branch 'master' into gp/bugfixes-p2 2017-02-01 16:18:28 +02:00
Georgi Prodanov 0f28b8c2b4 Merge pull request #3 from telerik/sivanov/styles
Add styles for date option updates on the event details screen
2017-02-01 16:18:05 +02:00
stoyanvi 2c53d1b9c9 #327414 Add styles for date option updates on the event details screen 2017-02-01 15:36:16 +02:00
Georgi Prodanov f29da1b0fd Merge branch 'master' into gp/bugfixes-p2 2017-02-01 15:33:48 +02:00
Georgi Prodanov d83bae2ab2 #328445 #328019 Add DisplayName to registration screen. Sync username and email in edit user screen. 2017-02-01 15:33:23 +02:00
Georgi Prodanov d708675408 Merge pull request #2 from telerik/sivanov/styles
Add Event Participants and Group Members styles
2017-02-01 14:58:41 +02:00
stoyanvi 8d3a71685c #327414 Add Event Participants and Group Members styles 2017-02-01 14:39:51 +02:00