Commits · c8d59eec5e80949109a8ee4fb5302593edce1b6c · Donald Haase / Cockatrice

21 Aug, 2015 8 commits
- Refactred settings to use settingscache & ini files · c8d59eec
  marco authored Aug 21, 2015
  
  c8d59eec
- Merge pull request #1394 from Fizztastic/fix_1387 · 9c28cdd1
  Zach authored Aug 20, 2015
```
Add LineEditCompleter to Tab_Game
```
  9c28cdd1
- Merge lines · 50e0b6dd
  Jeff authored Aug 20, 2015
  
  50e0b6dd
- Fix first word completion · 97d0cfa3
  Jeff authored Aug 20, 2015
  
  97d0cfa3
- Fix Conflicts · 05f2bc83
  Jeff authored Aug 20, 2015
  
  05f2bc83
- Merge branch 'master' into fix_1387 · e9bad2ca
  Jeff authored Aug 20, 2015
```
Conflicts:
	cockatrice/CMakeLists.txt
	cockatrice/src/tab_game.h
	cockatrice/src/tab_room.cpp
```
  e9bad2ca
- Merge remote-tracking branch 'Cockatrice/master' into fix_1387 · b3d96cc5
  Jeff authored Aug 20, 2015
  
  b3d96cc5
- Merge pull request #1382 from marcofernandezheras/Customizable-shortcuts · b2ab2c6e
  Zach authored Aug 20, 2015
```
Customizable shortcuts
```
  b2ab2c6e
20 Aug, 2015 1 commit
- Renamed file + reduced window size + resfresh on change · c6aba5a6
  marco authored Aug 18, 2015
  
  c6aba5a6
19 Aug, 2015 1 commit
- Add LineEditCompleter to Tab_Game · a64ea173
  Jeff authored Aug 18, 2015
  
  a64ea173
18 Aug, 2015 2 commits
- Merge pull request #1389 from Cockatrice/schema_level_correction · 1ef90418
  woogerboy21 authored Aug 18, 2015
```
Corrected miss-matched schema versions
```
  1ef90418
- Corrected miss-matched schema versions · 65635bcd
  woogerboy21 authored Aug 18, 2015
```
Schema version should be 7 (not 6) for current commit level.  Not sure exactly why it wasn't updated.
```
  65635bcd
17 Aug, 2015 1 commit
- Merge pull request #1386 from Fizztastic/fix_1383 · 8c072295
  Zach authored Aug 17, 2015
```
Fix linked cardwidget not showing PT/Loyalty
```
  8c072295
16 Aug, 2015 12 commits
- Fix linked cardwidget not showing PT/Loyalty · f3c43cb5
  Jeff authored Aug 16, 2015
  
  f3c43cb5
- Removed 2nd arg from ShortcutsSettings::getShortcut · d3d6f704
  marco authored Aug 16, 2015
  
  d3d6f704
- Moved counters to a new tab · 1ca89e0b
  marco authored Aug 16, 2015
  
  1ca89e0b
- Merge pull request #1379 from woogerboy21/room_userlevel · 487cbb23
  woogerboy21 authored Aug 16, 2015
```
Add permission levels to rooms
```
  487cbb23
- Customizable shorcuts · 713a8148
  marco authored Aug 16, 2015
  
  713a8148
- Merge branch 'master' into Customizable-shortcuts · be82472f
  marco authored Aug 16, 2015
  
  be82472f
- Merge branch 'master' into Customizable-shortcuts · 4cb53cca
  marco authored Aug 16, 2015
  
  4cb53cca
- Configurable shortcuts · beaa4e93
  marco authored Aug 09, 2015
  
  beaa4e93
- Updated response block to look better · 702f9491
  woogerboy21 authored Aug 15, 2015
  
  702f9491
- Define permission levels for rooms · 3e94c9d2
  woogerboy21 authored Aug 15, 2015
  
  3e94c9d2
- Merge pull request #1378 from woogerboy21/last_login · 5634b564
  woogerboy21 authored Aug 15, 2015
```
Add last_login column to user table and populate upon login
```
  5634b564
- Merge pull request #1356 from Fizztastic/ChatRoomCompleter · 98fa9eb1
  Zach authored Aug 15, 2015
```
Username Completer in server room
```
  98fa9eb1
15 Aug, 2015 1 commit
- Add last_login column to user table and populate upon login · bb0b626c
  woogerboy21 authored Aug 15, 2015
  
  bb0b626c
14 Aug, 2015 6 commits
- Merge pull request #1374 from woogerboy21/ban_by_clientid · 0f4dc180
  woogerboy21 authored Aug 14, 2015
```
Ban by client ID
```
  0f4dc180
- Merge pull request #1376 from Fizztastic/customsets_option · 4b0ccc30
  Zach authored Aug 14, 2015
  
  4b0ccc30
- Add ability to ban by client id · b102a05a
  woogerboy21 authored Aug 12, 2015
  
  b102a05a
- Add option to open customsets folder · 386716b8
  Jeff authored Aug 13, 2015
  
  386716b8
- Username Completer in server room · 50d67467
  Jeff authored Aug 10, 2015
```
Adds QCompleter in server room and a setting to enable/disable it.
```
  50d67467
- Merge pull request #1343 from tooomm/readme-toc-change · 26e63a9a
  Zach authored Aug 13, 2015
```
readme adjustments
```
  26e63a9a
13 Aug, 2015 1 commit
- remove arrows with link to top · d5c00b0c
  tooomm authored Aug 13, 2015
  
  d5c00b0c
12 Aug, 2015 2 commits
- Merge pull request #1365 from woogerboy21/add_clientid_tosessions · 8bf58af7
  woogerboy21 authored Aug 12, 2015
```
Add clientid field to sessions table.
```
  8bf58af7
- Merge pull request #1307 from poixen/hostselection · 9bf3178b
  poixen authored Aug 12, 2015
```
Previous server connection history
```
  9bf3178b
11 Aug, 2015 5 commits
- Merge pull request #1369 from ZeldaZach/fix_1360 · 54ff4ef4
  Zach authored Aug 11, 2015
```
remove max screen default
```
  54ff4ef4
- remove max screen default · b57a316b
  Zach H authored Aug 11, 2015
  
  b57a316b
- Merge pull request #1361 from woogerboy21/servatrice_disable_replaystorage · 1c3e1310
  Zach authored Aug 11, 2015
```
Add option to servatrice to disable replay storage.
```
  1c3e1310
- Merge pull request #1367 from woogerboy21/add_script_maintcountrycodes · 26b95607
  Zach authored Aug 11, 2015
```
Added lower case country code on correction.
```
  26b95607
- Added lower case country code on correction. · 7c81f8a6
  woogerboy21 authored Aug 11, 2015
  
  7c81f8a6