Commit graph

1167 commits

Author SHA1 Message Date
Absurdon
624da53bb6 Added possibility for Admins to check on votes wo querying the database manually 2017-03-24 00:07:39 +01:00
Absurdon
50f74810ec Added possibility for Admins to check on votes wo querying the database manually 2017-03-24 00:07:39 +01:00
Absurdon
c882419af2 Merge remote-tracking branch 'origin/master' 2017-03-21 16:04:14 +01:00
Absurdon
9c43c5cb8d Merge remote-tracking branch 'origin/master' 2017-03-21 16:04:14 +01:00
Absurdon
4e319ed5e9 Disabled Google calender as it seems broken right now 2017-03-21 16:01:30 +01:00
Absurdon
fedf1473d3 Disabled Google calender as it seems broken right now 2017-03-21 16:01:30 +01:00
Absurdon
e50ba391fe Updated the contact page 2017-03-19 02:37:44 +01:00
Absurdon
bc01a9fbb5 Updated the contact page 2017-03-19 02:37:44 +01:00
Absurdon
4ebb95ca3a Fixed link formatting error 2017-03-15 13:53:18 +01:00
Absurdon
946342bffb Fixed link formatting error 2017-03-15 13:53:18 +01:00
Absurdon
b1e451030c fixed reactivating teams in a contest failed 2017-03-08 20:31:10 +01:00
Absurdon
cafd421d0a fixed reactivating teams in a contest failed 2017-03-08 20:31:10 +01:00
Absurdon
9989e840aa fixed logical flaw in last commit 2017-03-08 02:21:49 +01:00
Absurdon
839aae732a fixed logical flaw in last commit 2017-03-08 02:21:49 +01:00
Absurdon
035f15648a fixed error for old bans that don't have a creator
validation failed on editing older bans that do not have a creator. Added a check to make sure this is still working.
2017-03-08 01:45:33 +01:00
Absurdon
4ce05f2563 fixed error for old bans that don't have a creator
validation failed on editing older bans that do not have a creator. Added a check to make sure this is still working.
2017-03-08 01:45:33 +01:00
Absurdon
a3a7e92789 Merge pull request #101 from Absurdon/master
Added Button to show user history for admins
2017-03-07 01:50:57 +01:00
Absurdon
5f3b56a9bb Merge pull request #101 from Absurdon/master
Added Button to show user history for admins
2017-03-07 01:50:57 +01:00
Absurdon
91d585f378 Added Button to show user history for admins 2017-03-07 01:45:39 +01:00
Absurdon
7b32035f67 Added Button to show user history for admins 2017-03-07 01:45:39 +01:00
Absurdon
7d60a90d69 Merge pull request #100 from Absurdon/master
Gave Gathermods simple banning permissions
2017-03-06 02:37:31 +01:00
Absurdon
dc4ee1c28f Merge pull request #100 from Absurdon/master
Gave Gathermods simple banning permissions
2017-03-06 02:37:31 +01:00
Absurdon
569122862f Gave Gathermods simple banning permissions 2017-03-06 02:33:12 +01:00
Absurdon
39758ff86c Gave Gathermods simple banning permissions 2017-03-06 02:33:12 +01:00
Absurdon
303fbf9587 Merge pull request #99 from Absurdon/master
Made bans show who created them
2017-03-04 22:57:42 +01:00
Absurdon
3ef0f8aac6 Merge pull request #99 from Absurdon/master
Made bans show who created them
2017-03-04 22:57:42 +01:00
Absurdon
5fac74f715 added creator field to ban/show.html.erb 2017-03-04 22:50:36 +01:00
Absurdon
662f4129eb added creator field to ban/show.html.erb 2017-03-04 22:50:36 +01:00
Absurdon
9a0d2c6a25 Added creator to ban modell 2017-03-04 22:45:05 +01:00
Absurdon
c6a0ed106f Added creator to ban modell 2017-03-04 22:45:05 +01:00
Absurdon
eefde7277a Merge pull request #98 from Absurdon/master
Fixed issue#97
2017-03-03 14:14:53 +01:00
Absurdon
229dc827c5 Merge pull request #98 from Absurdon/master
Fixed issue#97
2017-03-03 14:14:53 +01:00
Absurdon
f3baf7e896 Fixed issue#97 2017-03-03 14:09:14 +01:00
Absurdon
888f7ad9e2 Fixed issue#97 2017-03-03 14:09:14 +01:00
Absurdon
038d9b37d5 Merge pull request #96 from Absurdon/master
Fixing constants to reflect new organisational structure
2017-02-27 23:26:12 +01:00
Absurdon
b22a16dfd1 Merge pull request #96 from Absurdon/master
Fixing constants to reflect new organisational structure
2017-02-27 23:26:12 +01:00
Absurdon
f17af42bfd Update to new rules and updated categories 2017-02-27 23:21:59 +01:00
Absurdon
4a863ee5f4 Update to new rules and updated categories 2017-02-27 23:21:59 +01:00
Absurdon
bb0845f9bd Merge remote-tracking branch 'upstream/master' 2017-02-27 17:14:03 +01:00
Absurdon
4bfe5132fa Merge remote-tracking branch 'upstream/master' 2017-02-27 17:14:03 +01:00
Absurdon
b87d2aaadd Merge pull request #90 from Lavode/bugfix/fix-user-api-specs
Adjust user API specs to expect users without assigned teams.
2017-02-24 21:00:40 +01:00
Absurdon
73c4b46bf8 Merge pull request #90 from Lavode/bugfix/fix-user-api-specs
Adjust user API specs to expect users without assigned teams.
2017-02-24 21:00:40 +01:00
Michael Senn
38ac72f01e Adjust user API specs to expect users without assigned teams.
In  d5d804a56f, the user API was changed to
also return users without an assigned team, but specs were not adjusted.
2017-02-24 17:53:25 +01:00
Michael Senn
f390c1b38c Adjust user API specs to expect users without assigned teams.
In  d5d804a56f, the user API was changed to
also return users without an assigned team, but specs were not adjusted.
2017-02-24 17:53:25 +01:00
Absurdon
e0710c9efc Fixed new PMs not highlighted 2017-02-16 21:58:52 +02:00
Absurdon
a8451f1466 Fixed new PMs not highlighted 2017-02-16 21:58:52 +02:00
Absurdon
cdb77d27a7 Fixed new PMs not highlighted 2017-02-16 01:41:36 +01:00
Absurdon
11a300871f Fixed new PMs not highlighted 2017-02-16 01:41:36 +01:00
Absurdon
472cad9155 Merge pull request #88 from Absurdon/master
fixed gathercount not getting loaded immediatly
2017-02-13 00:03:29 +01:00
Absurdon
dab26d0759 Merge pull request #88 from Absurdon/master
fixed gathercount not getting loaded immediatly
2017-02-13 00:03:29 +01:00