aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
3909 commits 1 branch 0 tags 51 MiB
Commit graph

221 commits

Author SHA1 Message Date
Fabio Bas
6d7baec37b Merge with master 2015-08-31 22:55:46 +02:00
Fabio Bas
5cfb034452 merged with master 2015-08-31 22:48:14 +02:00
Zach H
a8727d5a50 define URLs 2015-08-23 17:57:26 -04:00
woogerboy21
b0630b81ca Log old session out of server if logging in from a second location 2015-08-22 13:41:02 -04:00
marco
c6aba5a6d0 Renamed file + reduced window size + resfresh on change 2015-08-20 20:23:08 +02:00
marco
d3d6f70496 Removed 2nd arg from ShortcutsSettings::getShortcut 2015-08-16 21:53:59 +02:00
marco
be82472f35 Merge branch 'master' into Customizable-shortcuts 2015-08-16 14:01:48 +02:00
marco
beaa4e9383 Configurable shortcuts 2015-08-16 13:46:57 +02:00
woogerboy21
3f78e0bec3 Update Error 11 Clarity 2015-08-09 12:56:09 -04:00
marco
b0bf94e378 Shorcut read from settings 2015-08-09 12:16:52 +02:00
woogerboy21
afa2c67e87 Actually pass the generated client id. 2015-08-08 17:22:59 -04:00
Gavin Bisesi
481a57edf6 Show more informative error on registration failure 2015-08-08 09:55:23 -04:00
Gavin Bisesi
bf7cf61b85 Add more informative message on unrecognized login response 
When logging in and receiving a reply that isn't understood, show a more informative error message.

`tr() + tr()` for better translation flexibility.
 2015-08-08 09:48:18 -04:00
woogerboy21
bc99024e4f Added server side setting to allow the requirement of a client id from clients. 2015-08-08 08:52:19 -04:00
tooomm
94d4ff8c1b removed space 2015-08-06 10:11:00 +02:00
Matt Lowe
46f28f92b6 Changed app title when logged in 
As seen in this image, you cant see where you are logged in.

How it looks now:
 2015-07-27 16:19:19 +02:00
ctrlaltca
9b9db297b3 Revert "Confirmation dialog on close" 2015-07-16 14:30:12 +02:00
Zach H
ebd516fbf3 confirmation dialog on close 2015-07-15 18:34:21 -04:00
woogerboy21
a9acb3f1cc Total Max User Restriction 
Syntax correction.
 2015-07-13 17:54:03 -04:00
Zach H
e20c06b639 troubleshooting&faq 2015-07-05 20:11:42 -04:00
Zach H
1f9b3ed28f minor fix 2015-07-04 18:52:50 -04:00
Zach H
1d210e57bd show all rules 2015-07-03 23:54:14 -04:00
Fabio Bas
6b54d8cbfd Fixed issues 2015-06-30 21:40:39 +02:00
Fabio Bas
02dcaff356 Publish username rules in login failure, too 2015-06-30 18:44:40 +02:00
Fabio Bas
4c27304047 publish username rules in registration failure 2015-06-29 23:35:27 +02:00
Fabio Bas
f17dec29f6 Reorganized images in subfolders 
As per @daenyth’s comment:
https://github.com/Cockatrice/Cockatrice/pull/792#issuecomment-76593730
 2015-06-15 14:37:19 +02:00
Fabio Bas
6b8ebe54e9 Theme manager 
This is the first implementation of a theme manager. It’s a rebased and
revisited version of #792.
 2015-06-15 14:35:58 +02:00
woogerboy21
28ccec711e Merge pull request #1101 from ctrlaltca/registration 
[WIP] In-client Registration support
 2015-05-30 13:49:04 -04:00
Fabio Bas
471f6371b5 More work 
* Refactored code out of common/ into servatrice/
 * added smtp client library
 * disable registration when connected
 * validate email address
 * send activation token via email
 2015-05-24 23:02:51 +02:00
Fabio Bas
ff1aed717e Added token generation, user activation command and response. 2015-05-24 00:37:45 +02:00
tooomm
8f64fd4a0b text works 
fixed welcome msg
added some articles
added database phrase to card updater
cosmetic changes to the description in edit sets
 2015-05-23 23:13:45 +02:00
Fabio Bas
5ace0dd892 Almost completed registration 
* added missing bits of serverside code;
 * added fronted in client;
 * removed demo python scripts;
 2015-05-23 20:13:03 +02:00
Fabio Bas
323537d08d Fix crash on server shutdown; fix #1105 2015-05-23 11:33:36 +02:00
Fabio Bas
227c18fc5a Fix card update under windows 
It failed if the path contained spaces.
 2015-05-21 21:39:51 +02:00
Fabio Bas
c356a6fc48 Run oracle from cockatrice 2015-05-01 16:38:31 +02:00
Zach H
a15a0c0385 gavin & translate update 
Add dev section

add report section
 2015-04-27 11:34:53 -04:00
Matt Lowe
a729bb076b Fixed server shutdown crash 
`serverShutdownMessageBox` was not assigned to 0 in the ctor.
 2015-04-26 23:39:20 +02:00
Matt Lowe
e646122f55 Updated server shutdown timer logic 
Will follow the following rules

+ send a message initially
+ send a message every 20 mins
+ send a message every min when time <= 5

Updated client popup

Updated client to close any previous popups and bring up a new one.

NEEDS TO BE TESTED

added missing include

Added delete on close
 2015-04-22 19:14:14 +02:00
Matt Lowe
d5a1264bcb Updated server to support "." 
Now uses regex.
Added "."
Updated login message
 2015-04-16 23:50:05 +02:00
ctrlaltca
997ca87377 Merge pull request #966 from ZeldaZach/remove_unnecessary_tr 
Fixing Shortcuts; Fix #476
 2015-04-16 08:12:26 +02:00
Matt Lowe
751315a413 updated second string 2015-04-15 19:03:59 +02:00
Matt Lowe
386cbcec7f Updated username dlg message 
updated
 2015-04-15 14:22:56 +02:00
Zach H
9be29641b0 apply QKeySequence & remove unnecessary tr 2015-04-14 17:17:01 -04:00
Matt Lowe
2336ee4f84 Updated invalid username dlg 
Relates to #964. We want to give a the correct reason for failed logins
and display the reason why.
 2015-04-14 09:59:29 +02:00
poixen
3bf3c7e94e Merge pull request #922 from poixen/sys_icon_fix 
Fixed double click sys icon
 2015-04-10 10:36:36 +02:00
poixen
ebcee34e0d Merge pull request #923 from poixen/popup_fix 
Fixed issue with clicking on PM/mention bubbles
 2015-04-10 10:36:20 +02:00
Matt Lowe
a7d41a322c Added connection dlg popup on server timeout 2015-04-08 21:00:33 +02:00
Matt Lowe
1c89b90cbb Fixed double click sys icon 
Was an issue with double clicking the icon when the app was full screen/
fullscreen + minimized.

Now works as expected.
 2015-04-08 10:12:41 +02:00
Matt Lowe
6b307469fe Fixed issue with clicking on PM bubbles 
Previously would not open the client if the window was minimized.
Added the same popup fix for mentions
 2015-04-07 23:32:13 +02:00
poixen
b8401592d4 Merge pull request #905 from poixen/socket_failure_dlg 
Reopen connection if socket failure
 2015-04-02 19:22:18 +02:00
Matt Lowe
9e6be7459d Reopen connection if socket failure 
Missed from #879
 2015-04-02 18:33:35 +02:00
Matt Lowe
986eab4d40 Default to one player 
I think the majority of players use this feature for
goldfishing/practicing. Defaulting to one player for convenience.
 2015-04-02 13:23:39 +02:00
Matt Lowe
5bd37e1d06 tray icon is now hidden and then removed 
I noticed that sometimes I would have lots of icons in the sys tray. I
would have to mouse over them to make then be removed. This also happens
with some other programs too. I have added some code to hide() the sys
icon when the client is close, it seems to be helping with the issue.
Hard to reproduce, might also only be a windows issue.
 2015-03-31 22:05:02 +02:00
Matt Lowe
12716e43d3 Failed logins reopen login dlg 
If you fail a login you are returned to the login dialog
 2015-03-26 21:05:21 +01:00
Matt Lowe
81a8141fe5 Added system tray icon 
+ Can be used for setting client size and closing the client.

Will expand on by sending client alerts to the tray.

Updated to push message notifactions to the toolbar

Preview image:

Added setting to enable/disable message popups

Added functionality

+ updated popup message and translation
+ Double clicking tray icon will now bring up the app/minimize it
+ can now be alerted of mentions
+ added setting to set if you want mentions on desktop
+ clicking mention message will take you to the main chat
+ added translations for icon menu
+ removed maximize/minimize/restore from menu, not needed.

Added disconnect

+ Disconnects any previous message slots/signals from the system icon
message bubble
 2015-03-26 18:37:57 +01:00
Matt Lowe
4cbffc3f6d Added username to window title 
While having more than 1 client open I found it hard to know which user
was which. I have added the user name to the title bar so you know who
you are logged in as.
 2015-03-03 13:09:41 +01:00
Fabio Bas
061fd5a830 Workaround for duplicated dialogs on close 2015-02-25 18:32:33 +01:00
Fabio Bas
399d4bf516 cockatrice: ask to save modified decks on close; fix #759 2015-02-21 15:21:26 +01:00
Fabio Bas
cbd391b1b8 Second attempt based on feedback 
re-split the menus, but rename the cockatrice one to “actions”
 2015-02-08 00:38:04 +01:00
Fabio Bas
5646a76ee7 OSX: merge the duplicate cockatrice menu in the main one 2015-02-07 23:13:32 +01:00
Matt Lowe
d065236ce9 Added separator 
Its been annoying me for a long time.
 2015-01-30 13:57:16 +01:00
Fabio Bas
2101ed7096 Merge remote-tracking branch 'upstream/master' into pixmap_memory_2nd_attempt 
Conflicts:
	cockatrice/src/dlg_settings.cpp
	cockatrice/src/dlg_settings.h
 2015-01-05 22:46:12 +01:00
Jaeic Lee
be973879d0 Added Korean Translation 2015-01-01 22:58:35 +09:00
Fabio Bas
dd88476796 Changed parameter name to something more meaningful 2014-12-27 15:02:20 +01:00
Fabio Bas
15e4c852dd Fix crash on close #255 2014-12-26 16:03:59 +01:00
Fabio Bas
b96104bed4 Expose QPixmapCache's cache limit size as an user preference 2014-12-24 16:16:34 +01:00
Antony Woods
b381298981 Added 'auto connect' checkbox to connect dialog. When the main window becomes active for the first time and auto connect is set to true, it will call connectToServer at that point. 2014-08-27 21:25:11 +01:00
James Turner
f06d2123fc Remove invalid character 2014-08-19 17:39:05 -04:00
woogerboy21
00ec84db2a Stale Comment Removal 
Removed stale commented lines from about window code.
 2014-07-02 23:30:12 -04:00
woogerboy21
0a1fe7f5a8 Requested Cleanup 
Corrected tab to 4 space (per request)
Moved regonly option under authentication ini location (per request)
 2014-07-02 22:27:05 -04:00
woogerboy21
d246fa39fe Registered Only Server 
Implemented the ability to set the server to only allow registered
users.  Also updated client to reflect the log-in rejection as well as
put a check in place for the server to not start if db connection is not
available yet registration is required.
 2014-07-02 20:52:22 -04:00
Gavin Bisesi
fb4a7b3274 Give more friendly login error message 2014-07-01 12:04:33 -04:00
Matt Kelly
1bc48a7849 Convert rest of source to 4-space indent 2014-02-11 11:14:19 -05:00
Mark Morschhäuser
1bf4f74a50 Fixed duplicate case compile error 2013-04-02 12:04:37 +02:00
Daenyth
af09d0d294 Reject more invalid usernames from clients. 
Specifically this should cover people connecting with a username of
"\u200C"
 2012-07-25 00:12:35 -04:00
Max-Wilhelm Bruker
87584a3a76 updated Spanish; adjusted details for release 2012-06-24 16:40:05 +02:00
Max-Wilhelm Bruker
cc516823d7 deck editor is tab, replay viewer is tab, deck editor shown by default, cache window geometry between sessions, 'open this deck in deck editor' open in game 2012-04-22 12:23:33 +02:00
Max-Wilhelm Bruker
38cf2621b4 preliminary changes to make deck editor a tab 2012-04-22 05:06:51 -04:00
Max-Wilhelm Bruker
95cd293b9c context menu for a message sender's name in chat; also display the user level icon next to the name; minor consistency and type-safety changes 2012-04-08 23:48:02 +02:00
Max-Wilhelm Bruker
13b992cf12 show ban duration in client 2012-03-31 12:07:25 +02:00
Max-Wilhelm Bruker
d251078feb fixed user list bug in threaded client, fixed buddy list crash in server 2012-03-26 00:54:44 +02:00
Max-Wilhelm Bruker
fd5be3d525 added option --debug-output to redirect client output to file 2012-03-25 19:48:50 +02:00
Max-Wilhelm Bruker
eced4e2340 merge 2012-03-25 17:06:48 +02:00
Max-Wilhelm Bruker
95dd3fc04c added credits for Swedish translation 2012-03-25 16:40:54 +02:00
Max-Wilhelm Bruker
3b70ad8c66 minor fixes wrt commit 4e4a7563db 2012-03-25 14:41:52 +02:00
Max-Wilhelm Bruker
4e4a7563db The remote client now runs in an extra thread, fixing issue #29 2012-03-25 13:19:40 +02:00
Max-Wilhelm Bruker
89bb8e72ee use 'git describe' to generate version info for the about box and servatrice. fixes issue #20 2012-02-21 01:08:16 +01:00
Max-Wilhelm Bruker
a1bcd9854f preliminary client-side replay support, works in principle 2012-02-21 00:09:03 +01:00
Max-Wilhelm Bruker
ff3eb9b5f4 display reason for ban to banned user 2012-01-01 19:38:52 +01:00
Max-Wilhelm Bruker
d5c628966f PB: everything compiles except for deck storage 2012-01-01 02:48:24 +01:00
Max-Wilhelm Bruker
c4eb7ba6cf PB: more client files compile 2011-12-30 22:29:57 +01:00
Max-Wilhelm Bruker
d3b96b1a88 PB: server compiles again, standalone RemoteClient is able to log in 2011-12-30 21:50:25 +01:00
Max-Wilhelm Bruker
f115342e47 local mode is working again 2011-12-18 23:30:53 +01:00
Max-Wilhelm Bruker
314f17091d protobuf client->server communication almost working 2011-12-18 18:35:14 +01:00
unknown
8877bfe71c translation fix 2011-10-10 15:57:22 +02:00
Max-Wilhelm Bruker
a4c3d48389 server shutdown function 2011-06-24 18:45:39 +02:00
Max-Wilhelm Bruker
009000d130 fixed cz -> cs language code, added slovak translation stub 2011-06-18 12:47:24 +02:00
Max-Wilhelm Bruker
f6f5abccca added Czech translation stub 2011-06-18 11:42:32 +02:00
Max-Wilhelm Bruker
bfce7509c1 added Arnaud Faes to translators, updated french translation 2011-03-09 03:35:26 +01:00
Max-Wilhelm Bruker
7038166d8f Changed name of jp translator; fixed game scene rearrange bug 2011-03-06 17:44:59 +01:00