Commit Graph

Select branches

Hide Pull Requests

V2

master

0.1

0.2

Mono Color

• 1ec5df85dd Fixed spelling master Shane Frischkorn 2015-03-02 16:05:36 +10:00
• 138494c4b1 Merge V2 branch Shane Frischkorn 2015-02-24 14:05:43 +10:00
• aefd35676b Finishing updates V2 Shane Frischkorn 2015-02-24 13:37:55 +10:00
• 0462292aff Some changes to the crystals page Shane Frischkorn 2014-12-05 15:42:58 +10:00
• c83aebd7fb Bunch of new theory pages Shane Frischkorn 2014-12-02 16:20:52 +10:00
• 213308318f Fixed error in mineral details Shane Frischkorn 2014-11-24 15:52:23 +10:00
• 3dfe03216c Implemented erb101 menu Shane Frischkorn 2014-11-24 14:32:56 +10:00
• 7eccaa8bba Initial changes to add an erb101 area of the site Shane Frischkorn 2014-11-17 16:35:55 +10:00
• 5adaad5bf8 Added some new models and updated the documentation Shane Frischkorn 2014-11-10 17:32:43 +10:00
• 3b8a2bac4a Style Changes Shane Frischkorn 2014-03-07 10:07:20 +10:00
• d6b8f71d58 Added some extra text, and adjusted the appearance on the acknowledgements and home pages Shane Frischkorn 2014-03-05 16:18:03 +10:00
• e453f86c26 Fixed settings for production, and removed the entry to the self test module until it is ready Shane Frischkorn 2014-03-03 15:12:31 +10:00
• 9a32d99c23 Added pressure and temperature theory Shane Frischkorn 2014-03-03 13:08:12 +10:00
• 096e31d713 Updating wsgi file for deployment Shane Frischkorn 2014-03-03 13:01:40 +10:00
• 5368a6ceac Added a view counter to the models Shane Frischkorn 2014-03-03 12:55:46 +10:00
• 9fef71c877 Added a viewed count to the models Shane Frischkorn 2014-03-03 12:22:07 +10:00
• 5657a9cb38 Added glossary and acknowledgement pages, and reworked the structure of the theory pages. Shane Frischkorn 2014-03-01 23:08:25 +10:00
• adb505cc93 Added logos, two of the theory pages and some images. Also renamed some samples in the database so they work with linux Shane Frischkorn 2014-03-01 16:57:52 +10:00
• 65c0a155c9 Reworked settings to allow for easier deployment. Production should pick up the production settings automatically. Start the development server now with python manage.py runserver --settings=settings.dev Shane Frischkorn 2014-02-28 14:34:09 +10:00
• c7e9bcd866 Added Rock and Fossil pages Shane Frischkorn 2014-02-24 13:05:21 +10:00
• f8a12d58e8 Set mineral properties to use the correct font Shane Frischkorn 2014-02-24 10:02:03 +10:00
• 3ebb0e866a Fixed size of model window, and made the background transparent Shane Frischkorn 2014-02-22 14:26:54 +10:00
• 838112be0d Changes to the mineral practice page Shane Frischkorn 2014-02-22 13:38:18 +10:00
• 95abf5d7c3 Changes to the mineral practice page Shane Frischkorn 2014-02-21 23:38:18 +10:00
• 8c05629d51 Work on new ui layout Shane Frischkorn 2014-02-20 15:21:50 +10:00
• ef96af8d46 Iniital work for new UI Shane Frischkorn 2014-02-19 16:10:57 +10:00
• d72dbdd9b2 Fixed formatting of base page Shane Frischkorn 2014-01-23 20:36:05 +10:00
• f11e471840 Updated documentation to note dajaxice bug Shane Frischkorn 2014-01-22 10:55:24 +10:00
• 9509d788c0 Minerals now show their detail. The layout still needs work to get it showing correctly though. Shane Frischkorn 2014-01-21 23:54:09 +10:00
• d5867c8d4a Added seperate minerals detail page Shane Frischkorn 2014-01-21 21:43:23 +10:00
• 07c6260bde Sorted the order of the menu items Shane Frischkorn 2014-01-21 15:59:23 +10:00
• 4ffca36884 Added details for minerals and fixed use of the active flag Shane Frischkorn 2014-01-21 15:32:35 +10:00
• ad5ad01307 Add a mineral model to store details of minerals Shane Frischkorn 2014-01-20 23:28:08 +10:00
• c22f3b0aa1 Reduced image sizes 0.2 Shane Frischkorn 2013-12-04 12:26:16 +10:00
• e33d43f600 Updated display Shane Frischkorn 2013-12-04 00:07:00 +10:00
• a10757459c Updated documentation Shane Frischkorn 2013-12-03 21:45:07 +10:00
• 12d9333040 Updated Documentation Shane Frischkorn 2013-12-03 15:33:14 +10:00
• 79c42186c2 Updated documentation Shane Frischkorn 2013-12-03 14:40:35 +10:00
• b06afd90b0 Adjusted layout Shane Frischkorn 2013-11-29 20:33:27 +10:00
• 36b9a87c1e fixed mouse wheel scrolling Shane Frischkorn 2013-11-27 19:22:10 +10:00
• c6618614d9 fixed mouse wheel scrolling Shane Frischkorn 2013-11-27 19:21:41 +10:00
• b9c82f280b Added new model, cleaned up unneeded models and updated documentation Shane Frischkorn 2013-11-12 15:21:18 +10:00
• 2f49f55e72 Added photo to document Shane Frischkorn 2013-11-12 12:44:35 +10:00
• 0f78e17381 Merge branch 'master' of https://github.com/sfrischkorn/rockviewer Shane Frischkorn 2013-11-12 12:03:12 +10:00
• 80754bde30 Updated documentation Shane Frischkorn 2013-11-12 12:02:20 +10:00
• 77d872bd3d Temporarily fixing the size of the model viewer Shane Frischkorn 2013-11-12 11:31:51 +10:00
• 46bdb9832d Updated the database to add the new models to the webpage Shane Frischkorn 2013-11-12 11:19:20 +10:00
• 6f7291c2f2 Added new models Shane Frischkorn 2013-11-10 12:26:33 +10:00
• 211dc8bb3c Added new models Shane Frischkorn 2013-10-31 14:28:57 +10:00
• 748b431d7f Cleaned up entries Shane Frischkorn 2013-10-31 08:49:47 +10:00
• 49b543db0b Added models and updated documentation Shane Frischkorn 2013-10-25 11:28:24 +10:00
• 34d8e295e9 Fixed nesting in the tree menu Shane Frischkorn 2013-10-20 09:41:15 +10:00
• 156a14cddb Added New models Shane Frischkorn 2013-10-16 16:56:06 +10:00
• 1457cfce4f Added some new models and updated the documentation Shane Frischkorn 2013-10-11 11:19:57 +10:00
• 629071066f Added new models Shane Frischkorn 2013-10-09 17:35:40 +10:00
• 0297242975 Updated documentation Shane Frischkorn 2013-10-09 17:29:04 +10:00
• 68fd615584 Updated documentation Shane Frischkorn 2013-10-09 14:10:49 +10:00
• 3935f0f642 Updated Documentation Shane Frischkorn 2013-10-09 11:10:18 +10:00
• 8bd470b6f1 Updated Documentation Shane Frischkorn 2013-09-30 14:13:02 +10:00
• 3cada2fbb0 Fixing paths Shane Frischkorn 2013-09-29 15:19:53 +10:00
• 912c64ef0b Added Fabric Config Shane Frischkorn 2013-09-28 13:57:59 +10:00
• ef13263030 Updated documentation Shane Frischkorn 2013-09-28 12:28:07 +10:00
• 284a94c837 Updated documentation Shane Frischkorn 2013-09-18 17:23:01 +10:00
• ddf47e15de Updates to deployment doc Shane Frischkorn 2013-09-17 21:24:38 +10:00
• 5a1e39e2db Added initial document detailing the web site Shane Frischkorn 2013-09-17 14:44:48 +10:00
• 64f90d5075 Moved multiple choice questions to their own template Shane Frischkorn 2013-09-15 20:17:45 +10:00
• e5233f24cb Cleaning up static files Shane Frischkorn 2013-09-14 22:58:01 +10:00
• db9780699b Organising files Shane Frischkorn 2013-09-14 22:52:59 +10:00
• 7d83685d2c Added a base template Shane Frischkorn 2013-09-14 21:26:54 +10:00
• b541e1d516 fixing pylint recommendations Shane Frischkorn 2013-09-11 23:59:23 +10:00
• 6d40700cf3 Implemented tree view for selection of samples Shane Frischkorn 2013-09-11 23:44:40 +10:00
• 7f099bfca4 Some bootstrapping Shane Frischkorn 2013-09-10 10:11:48 +10:00
• 6057e403f6 Initial implementation of bootstrap Shane Frischkorn 2013-09-05 22:49:56 +10:00
• 9421656268 Added new samples Shane Frischkorn 2013-09-04 19:46:42 +10:00
• eff90b2391 Adjusting canvas size Shane Frischkorn 2013-09-04 19:45:59 +10:00
• bfe680697c Added new model Shane Frischkorn 2013-09-04 13:59:42 +10:00
• 478960396a Added new model Shane Frischkorn 2013-09-04 13:12:17 +10:00
• 60468f9fe8 Adding new model Shane Frischkorn 2013-08-28 14:55:38 +10:00
• 1934f3cf23 removing coverage config Shane Frischkorn 2013-08-25 23:04:15 +10:00
• 0c317a97a7 Adding coverage config Shane Frischkorn 2013-08-25 22:59:32 +10:00
• 3c5edd61b1 Added more unit tests Shane Frischkorn 2013-08-25 21:51:54 +10:00
• b2f436907a Added tests for ajax Shane Frischkorn 2013-08-25 21:41:53 +10:00
• ff050cc141 More unit testing Shane Frischkorn 2013-08-25 21:10:22 +10:00
• 5ab0b8c837 Fixing recommendations from pylint Shane Frischkorn 2013-08-25 20:16:20 +10:00
• 423101e829 Fixing pep8 recommendations Shane Frischkorn 2013-08-25 19:43:19 +10:00
• e4b18d98c2 Added some tests for models.py Shane Frischkorn 2013-08-24 23:53:30 +10:00
• 61c683b52f Configuring jenkins Shane Frischkorn 2013-08-24 23:16:53 +10:00
• cf25188d66 Fixing jenkins testing Shane Frischkorn 2013-08-24 22:34:51 +10:00
• a4da2240d7 implemented multiple choice question functionality Shane Frischkorn 2013-08-24 22:12:41 +10:00
• 685287c0c2 Implemented multiple choice question functionality Shane Frischkorn 2013-08-24 22:12:14 +10:00
• 654c118a36 Added document to outline model generation process Shane Frischkorn 2013-08-23 21:13:38 +10:00
• df664d4a68 Added jenkins support Shane Frischkorn 2013-08-18 22:42:02 +10:00
• 8358990e2b Removed commented out code Shane Frischkorn 2013-08-17 22:35:38 +10:00
• 59bab5fc10 Implemented dajax and moved models to media rather than static Shane Frischkorn 2013-08-17 21:12:21 +10:00
• 88fe7b7e79 Added description and question and answer models Shane Frischkorn 2013-08-07 22:47:31 +10:00
• 32bb90ca72 initial implementation of 3d viewer 0.1 Shane Frischkorn 2013-07-29 00:27:20 +10:00
• 4e635bec41 Adding code for displaying .ctm files Shane Frischkorn 2013-07-28 09:36:39 +10:00
• 08e36dacb1 changing namespace and urls Shane Frischkorn 2013-07-27 22:23:05 +10:00
• dd8614fdff Merge branch 'master' of https://github.com/sfrischkorn/rockviewer Shane Frischkorn 2013-07-27 09:58:51 +10:00
• 8de2cd413c added link to layoutit.com sample design Shane Frischkorn 2013-07-27 09:58:41 +10:00