mlowe
|
3365e0461c
|
Merge pull request #2083 from Cockatrice/connect_dlg
updated login
|
2016-07-15 16:46:39 +02:00 |
|
poixen
|
69e8db441c
|
updated login
|
2016-07-15 15:41:51 +02:00 |
|
ctrlaltca
|
0939cd8b21
|
Merge pull request #2082 from ctrlaltca/fix_2081
Remove newlines from Deck name in TabDeckEditor
|
2016-07-15 11:14:13 +02:00 |
|
Fabio Bas
|
b0efcf9f89
|
Remove newlines from Deck name in TabDeckEditor
|
2016-07-15 10:57:42 +02:00 |
|
Zach
|
81006d5342
|
Merge pull request #2080 from ZeldaZach/fix_reset
show buddyOnly on filter clear
|
2016-07-14 17:39:25 -04:00 |
|
Zach H
|
edd50a7571
|
show buddyOnly on filter clear
|
2016-07-14 16:56:17 -04:00 |
|
ctrlaltca
|
cbff59ae59
|
Merge pull request #2078 from skwerlman/patch-1
fix typo in sample servatrice ini
|
2016-07-14 09:06:47 +02:00 |
|
skwerlman
|
deb8a2c954
|
fix typo in sample servatrice ini
|
2016-07-14 03:01:11 -04:00 |
|
ctrlaltca
|
0c731e378a
|
Merge pull request #2077 from ctrlaltca/webclient_ui
Some web client UI fixes
|
2016-07-13 09:01:33 +02:00 |
|
Fabio Bas
|
1a38e4ef98
|
Some web client UI fixes
|
2016-07-12 23:15:42 +02:00 |
|
mlowe
|
8cd5803556
|
Merge pull request #2071 from Cockatrice/game_view_time
Game Viewer Update
|
2016-07-12 11:34:44 +02:00 |
|
poixen
|
a729b1c966
|
updated game created coloumn text
|
2016-07-12 09:31:27 +02:00 |
|
tooomm
|
8ac1469fdb
|
typo fix
|
2016-07-10 11:05:54 +02:00 |
|
ctrlaltca
|
a11e57503e
|
CONTRIBUTING: Syntax highlight, protobuf
|
2016-07-10 11:01:15 +02:00 |
|
ctrlaltca
|
35df6485ab
|
CONTRIBUTING: C++11, nullptr, Database migrations
|
2016-07-10 10:47:19 +02:00 |
|
ctrlaltca
|
d4ced6f6af
|
Merge pull request #2067 from ctrlaltca/fix_2066
Fix compilation warning
|
2016-07-09 10:31:55 +02:00 |
|
Fabio Bas
|
430f1baf2f
|
make gcc an happy puppy
|
2016-07-09 10:18:12 +02:00 |
|
tooomm
|
e29230953d
|
Changes to recommended DL + chat link (#2064)
* Changes to recommended DL + chat link
* wording update
|
2016-07-08 21:07:41 +02:00 |
|
ctrlaltca
|
6a152ffbac
|
Merge pull request #1991 from ctrlaltca/websockets
Implementation of websockets in servatrice and test js client
|
2016-07-05 14:45:31 +02:00 |
|
ctrlaltca
|
07bc215b3e
|
Merge pull request #2021 from ZeldaZach/color_list
Colors to deck editor
|
2016-07-05 14:45:09 +02:00 |
|
mlowe
|
b64ff6f930
|
Merge pull request #2052 from Cockatrice/metion_fix
Fixed mention bug
|
2016-07-04 21:06:19 +02:00 |
|
poixen
|
3717c7440a
|
Fixed mention bug
|
2016-07-04 20:23:32 +02:00 |
|
ctrlaltca
|
066aff96d7
|
Merge pull request #2049 from Cockatrice/filterBuddiesOnly
filter buddies only
|
2016-07-03 23:08:44 +02:00 |
|
poixen
|
089edc53d0
|
filter buddies only
|
2016-07-03 21:48:21 +02:00 |
|
Gavin Bisesi
|
e038534a51
|
Merge pull request #2045 from Cockatrice/timestamps
added additional timestamps in game
|
2016-07-02 19:49:34 -04:00 |
|
Gavin Bisesi
|
b61e023267
|
Merge pull request #2047 from Cockatrice/autoadmin
Enable admin features on login and remove "are you sure" prompt
|
2016-07-02 19:49:02 -04:00 |
|
poixen
|
2a11466779
|
auto admin
|
2016-07-02 22:34:45 +02:00 |
|
poixen
|
60f457827f
|
added more in game timestamps
|
2016-07-02 21:45:38 +02:00 |
|
Zach
|
277d7e2173
|
Merge pull request #2039 from Cockatrice/tooomm-log_dlg_title
log ui window: title change
|
2016-06-30 11:32:28 -04:00 |
|
tooomm
|
c095daa282
|
log ui window title change
While translating I realized that `View Debug Log` for the menu is perfectly fine, the dialog window should just say `Debug Log` though...
|
2016-06-30 17:15:37 +02:00 |
|
ctrlaltca
|
7f2e39500e
|
Merge pull request #2038 from ctrlaltca/translations
Translations update
|
2016-06-30 15:27:55 +02:00 |
|
Fabio Bas
|
670f55bc28
|
Translations update
|
2016-06-30 15:26:52 +02:00 |
|
ctrlaltca
|
a045cf1c41
|
Merge pull request #2037 from Cockatrice/tooomm-tx_charts
readme: fix transifex charts
|
2016-06-30 11:22:38 +02:00 |
|
tooomm
|
b032f71b22
|
fix transifex charts
|
2016-06-30 10:33:48 +02:00 |
|
ctrlaltca
|
9807bcb48f
|
Merge pull request #2025 from ctrlaltca/logui
Log UI
|
2016-06-29 13:56:46 +02:00 |
|
ctrlaltca
|
60ada0c278
|
Merge pull request #2036 from ctrlaltca/fix_2031
Fix openssl detection on win64
|
2016-06-29 13:54:59 +02:00 |
|
Fabio Bas
|
204f351a61
|
Fix openssl detection on win64
|
2016-06-29 09:53:50 +02:00 |
|
Fabio Bas
|
8db10be892
|
Log UI
|
2016-06-27 22:18:39 +02:00 |
|
Fabio Bas
|
5b21dc8cde
|
Implementation of websockets in servatrice and test js client
|
2016-06-26 19:38:53 +02:00 |
|
ctrlaltca
|
c19f225806
|
Merge pull request #2015 from Cockatrice/tooomm-tr_tags
fix hardcoded strings
|
2016-06-26 18:52:37 +02:00 |
|
ctrlaltca
|
7282aa7eea
|
Merge pull request #2014 from Cockatrice/tooomm-patch-1
properly differentiate between singular and plural
|
2016-06-26 18:52:17 +02:00 |
|
Gavin Bisesi
|
e81a6d497b
|
Don't mention-bot Psithief
per request
|
2016-06-21 08:49:32 -04:00 |
|
Zach H
|
79fc24769a
|
Colors to list
|
2016-06-21 00:48:03 -04:00 |
|
ctrlaltca
|
287bed7e6d
|
Merge pull request #2016 from Cockatrice/tooomm-fix_travis_compile
fix travis debug error
|
2016-06-17 18:12:16 +02:00 |
|
tooomm
|
85c6bcdfa7
|
fix travis debug error
introduced in https://github.com/Cockatrice/Cockatrice/pull/2011
|
2016-06-17 17:34:07 +02:00 |
|
tooomm
|
57f9b2c200
|
add tr() tags
|
2016-06-17 17:03:42 +02:00 |
|
tooomm
|
1782096805
|
add tr() tags
|
2016-06-17 16:56:08 +02:00 |
|
tooomm
|
bfbbedd604
|
pluralisation
|
2016-06-17 16:12:41 +02:00 |
|
ctrlaltca
|
f6a3551168
|
Merge pull request #2011 from ctrlaltca/fix_2010
Fix some translation issues
|
2016-06-15 22:18:34 +02:00 |
|
Fabio Bas
|
1bc56e1c86
|
Fix some translation issues
Fix #2010
|
2016-06-15 22:17:31 +02:00 |
|