Commit Graph
26 Commits
Author SHA1 Message Date
Flamefire 03b9ea8e49 Rename File/Folder name variables to distinguish them from real (full) paths
Make sure full path is used everywhere (if I didn't miss anything)
2014-08-08 17:27:36 +02:00
Flamefire 6686c15864 Fix bug with avatar not having filename
Use a nicer name for the avatar chooser
2014-04-09 18:41:39 +02:00
Flamefire eba5deba2b Make CSettings contain only constant values to avoid accidental misuse. Everything changeable is in CConfig 2014-03-19 19:54:55 +01:00
Flamefire 898819fcf5 Fix code issues (naming, unused stuff) 2014-03-12 09:41:34 +01:00
Flamefire 149026ec32 IMPORTANT: Format of all files with Resharper
NO functional changes. If you have problems merging your changes, merge/rebase on previous commit then merge this. Conflicts can easily be resolved (take yours if in doubt)
After that merge next commits
2014-02-26 00:36:00 +01:00
Florian Küpper d24c47012c Revert "Revert PartyNames-changes on develop-branch."
This reverts commit 43545ac47f.

Conflicts:
	VocaluxeLib/Menu/CNameSelection.cs
2013-12-26 13:02:06 +01:00
Florian Küpper 5449d985ef Revert PartyNames-changes on develop-branch. 2013-12-26 13:02:00 +01:00
Florian Küpper 14f5c12d9e Added draft for NameSelection in party-modes. Just extend CMenuPartyNameSelection in a screen.
Developer could use it or not, using it would make creating party-modes much easier.
More additions to this screen will come.
2013-12-26 13:01:58 +01:00
Florian Küpper 352b0181fa Changed GuestProfile-option on profiles to UserRole. UserRole could now be set from Vocaluxe. 2013-12-19 08:54:27 +01:00
lukeIam 252ef113ce Webserver: -fix: used PasswordHash instead of PasswordSalt once 2013-12-13 18:03:21 +01:00
lukeIam ad717ea56e Webserver: -fix: problems setting the password and login 2013-12-13 18:03:20 +01:00
lukeIam 304529f396 Webserver: -fix: Password and Roles are not saved. 2013-12-13 18:03:19 +01:00
lukeIam 3126d5aaf0 User/Roles for webserver 2013-12-13 17:43:13 +01:00
lukeIam 28da5b776f WCF-Server inital commit (Wenserver without usermanagement and with some pages) 2013-12-13 17:34:07 +01:00
Flamefire 73e4a9fa74 Merge branch 'release-0.3' into develop
Conflicts:
	Vocaluxe/Base/CConfig.cs
	Vocaluxe/Lib/Playlist/CPlaylistFile.cs
	Vocaluxe/Screens/CScreenSong.cs
	VocaluxeLib/CHelper.cs
	VocaluxeLib/Menu/CMenu.cs
	VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
	VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
2013-10-19 00:42:56 +02:00
Flamefire 3a8acecd5c Use always the same xml writer settings 2013-10-18 23:40:23 +02:00
Flamefire 370964ee99 Fix file headers and indentations 2013-09-20 18:09:32 +02:00
flokuep afdd3cae62 Profiles could be in different folders now, vocaluxe loads profiles from main-folder and user-folder, new profiles will be saved in user-folder. 2013-08-31 13:42:31 +02:00
Flamefire 11398dbb2f Cleanups after merge 2013-05-19 18:38:50 +02:00
Flamefire f83496d66a Fixed merge errors 2013-05-19 18:03:29 +02:00
Alexander Eckart e70ce5ad68 rewrite of CProfiles.cs, some optimizations in CScreenProfiles.cs, added IsCapturing() to Webcam/IWebcam.cs 2013-05-09 22:01:29 +02:00
Alexander Eckart 8ab93db26f functional async profile adding 2013-05-07 19:18:46 +02:00
Alexander Eckart 19339c6888 reconstructed CProfiles (preparing for async profile adding) 2013-05-07 16:56:23 +02:00
Alexander Eckart bde99ff2aa some more reconstructions on avatars 2013-05-07 00:23:44 +02:00
Alexander Eckart d6a57da73f some reconstructions, there is still a lot to do 2013-05-06 23:38:59 +02:00
Alexander Eckart ec5bdb7742 SProfile => CProfile; SAvatar => CAvatar 2013-05-06 23:29:31 +02:00