Commit Graph
61 Commits
Author SHA1 Message Date
Raphael Michel ccb0dc9682 Merge 2015-01-07 17:02:10 +01:00
Raphael Michel c87f36e027 Merge branch 'master' of github.com:tixl/tixl
Conflicts:
	src/locale/de/LC_MESSAGES/django.po
2015-01-07 17:02:03 +01:00
Raphael Michel c810a86895 Fix an untranslated string 2015-01-07 16:56:10 +01:00
Raphael Michel 3ec770a73a Change data model to versioned tables 2015-01-06 16:38:15 +01:00
Raphael Michel 02c0fcbd1e Restrictions UI 2014-10-26 19:21:16 +01:00
Raphael Michel 94d3d4c6f3 Variation matrix: CSS sugar 2014-10-25 11:55:04 +02:00
Raphael Michel 3d8ea6095d We don't need the 2-d layout, as it is only a special case of the n-d layout 2014-10-25 11:45:00 +02:00
Raphael Michel d25cc20031 UI consistency 2014-10-25 11:42:26 +02:00
Raphael Michel d54068272c CSS: Unified submit control 2014-10-25 11:36:11 +02:00
Raphael Michel 4d2deca1bb Very basic quota control 2014-10-25 11:16:53 +02:00
Raphael Michel da24aa3f6e Python 3 style type hinting 2014-10-21 10:15:42 +02:00
Raphael Michel b8a9c63b07 Try SauceLabs for Selenium tests 2014-10-18 20:48:36 +02:00
Raphael Michel 29b1352377 Optimize number of database queries 2014-10-17 22:44:37 +02:00
Raphael Michel 4f368a4661 Fix wrong keyword argument 2014-10-17 22:26:48 +02:00
Raphael Michel 49c93f95af Fix bug with zero-dimensional items 2014-10-17 16:55:22 +02:00
Raphael Michel 23cd98050f Render logic for ItemVariation field 2014-10-17 16:52:52 +02:00
Raphael Michel c311052ffd VariationField form logic 2014-10-17 15:55:07 +02:00
Raphael Michel a7beb46c94 Minor refactoring 2014-10-17 10:25:29 +02:00
Raphael Michel 912b0b4211 Bootstrap the form magic for inline restriction formset variation
controls
2014-10-14 00:45:42 +02:00
Raphael Michel 0c6326270c Basic restriction control 2014-10-13 21:52:19 +02:00
Raphael Michel d004d7c49a Adding a bunch of Unit Tests 2014-10-07 17:12:06 +02:00
Raphael Michel 07245b89e5 Fix settings URL in tests 2014-10-07 12:48:39 +02:00
Raphael Michel 3bae6a6819 Plugin registry 2014-10-07 12:21:13 +02:00
Raphael Michel 1ec224049d Introduce VariationDict to reduce duplicate code 2014-10-07 10:25:29 +02:00
Raphael Michel 7ded9e88d8 Fix deprecation warning 2014-10-06 23:29:34 +02:00
Raphael Michel 5e04dd4e9f Control UI for questions 2014-10-05 13:21:39 +02:00
Raphael Michel e0e2ccb1c3 Unit tests for the authentication forms 2014-10-04 21:16:08 +02:00
Raphael Michel e10267ebd0 Manage item properties 2014-10-04 19:42:36 +02:00
Raphael Michel 36eaa81204 Add missing files 2014-09-29 22:56:36 +02:00
Raphael Michel 844c5d6545 Categories management 2014-09-29 21:52:29 +02:00
Raphael Michel ffd3e52584 Optimize number of SQL queries (now constant) 2014-09-29 18:57:18 +02:00
Raphael Michel a6b5b58451 Manage variations for items with any number of properties 2014-09-29 18:42:50 +02:00
Raphael Michel ea7eff3d3b Removed unused variable 2014-09-29 14:23:59 +02:00
Raphael Michel 8a50b1d98a Manage variations for items with exactly two properties 2014-09-29 14:22:26 +02:00
Raphael Michel 72de56493e Manage variations for items with exactly one property 2014-09-29 12:44:06 +02:00
Raphael Michel d831980f1e Item update: restrict choices 2014-09-29 11:14:19 +02:00
Raphael Michel 675688d5df Basic item settings 2014-09-27 12:36:56 +02:00
Raphael Michel a64f69ad24 Simplified tixlcontrol.urls 2014-09-17 00:23:38 +02:00
Raphael Michel 4c43f58761 Control: Event settings: success message 2014-09-15 20:16:07 +02:00
Raphael Michel 2bc33a8f52 Basic event settings 2014-09-15 20:14:33 +02:00
Raphael Michel 0226b12840 Event slugs are only unique among one organizer 2014-09-14 14:26:41 +02:00
Raphael Michel 33efa75de0 Show "log out" text in navi when collapsed 2014-09-12 22:14:04 +02:00
Raphael Michel d04cb41507 Fix whitespace 2014-09-12 22:11:12 +02:00
Raphael Michel b47c6e14fa Base structure for event-specific control 2014-09-12 22:10:37 +02:00
Raphael Michel 1b579a7e45 Basic permission logic 2014-09-12 21:51:50 +02:00
Raphael Michel f20cec3caf Add Bootstrap JavaScript and jQuery 2014-09-12 21:36:48 +02:00
Raphael Michel b2b653e57e Event list 2014-09-12 21:32:14 +02:00
Raphael Michel b77264dc47 Merge branch 'master' of github.com:tixl/tixl 2014-09-12 16:24:27 +02:00
Raphael Michel 6e91c115ce Login view doc 2014-09-12 16:24:17 +02:00
Raphael Michel 2883950b7e Logout help text 2014-09-11 21:10:36 +02:00