mirror/Anthias
1
0
Fork 0
mirror of https://github.com/Screenly/Anthias.git synced 2026-05-05 22:05:14 -04:00
Code Issues Packages Projects Releases Wiki Activity
197 Commits 105 Branches 55 Tags
47dfdee1afa4549901c01b4fbbdb765f5740dfda
Commit Graph

197 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zachary Jones
47dfdee1af Add time to Add Asset form. 
The start and end date/time of the Asset is now saved to the database.
 2013-01-29 16:03:23 -06:00
Zachary Jones
9a243eab74 Add bootstrap-timepicker.js 2013-01-29 14:36:43 -06:00
Zachary Jones
f911cdff4a Start adding the start and end dates to the Asset add form. 
Planning to use JavaScript widgets to help with entering dates and times.
 2013-01-28 21:49:15 -06:00
Zachary Jones
1b37c2dacc Add bootstrap-datepicker.js 2013-01-28 21:30:12 -06:00
Zachary Jones
a72a6d72f1 Realized the URI was not being saved to the database. 2013-01-28 18:56:24 -06:00
Zachary Jones
9e9d4a583f Preliminary Add Asset functionality. 
Actually adds to the database now. However, we're using a regular POST form to create the new asset and return a redirect back to the index page. Uploading files with Backbone to an API is apparently tricky and there are complicated best practices I don't fully understand yet.
 2013-01-26 19:29:17 -06:00
Zachary Jones
74727d5506 Remove 'resolution' key from Asset object. 
Since we're not actually using resolution for anything at this point (it's not saved to the database), it's wasted. Awaiting further clarification.
 2013-01-26 19:05:59 -06:00
Zachary Jones
a6a1c28116 Rename argument for consistency 2013-01-26 18:40:06 -06:00
Zachary Jones
2d02514e17 Initial filled out version of the Add Asset form. 2013-01-26 18:09:17 -06:00
Zachary Jones
a1fcc80f9d Start writing tests using Jasmine. 
Should have been started earlier but I am still new to JavaScript development and its testing and best practices. This will need filling out further in the future.
 2013-01-26 15:43:55 -06:00
Zachary Jones
aebddd0dad Start work on creating an API that can be used to create new Assets via Backbone models. 2013-01-25 14:33:57 -06:00
Zachary Jones
81768050ac Merge branch 'master' into screenly-ui 
Conflicts:
	server.py
 2013-01-24 14:59:17 -06:00
Zachary Jones
cc3a29de66 Updates for code readability and PEP 8. 2013-01-24 14:55:52 -06:00
Zachary Jones
9c65cec2ac Starting work on Add Assets modal 2013-01-24 14:33:37 -06:00
Viktor Petersson
7587b58b45 Merge branch 'master' of github.com:wireload/screenly-ose 2013-01-24 16:26:46 +01:00
Viktor Petersson
73cddaada4 Added upgrade script. 2013-01-24 16:25:45 +01:00
Zachary Jones
d05c730036 Add Bootstrap libraries for animation and modal dialogs. 2013-01-23 20:18:10 -06:00
Zachary Jones
264edc78a9 Add "Add Asset" button. 2013-01-23 20:17:39 -06:00
Zachary Jones
176b984443 Merge branch 'master' into screenly-ui 
Conflicts:
	requirements.txt
	server.py
 2013-01-23 17:16:46 -06:00
Zachary Jones
e913e2f0f5 get_assets() is deprecated and no longer needed. 
fetch_assets() performs the same function with more flexibility and should be used instead.
 2013-01-23 16:37:22 -06:00
Alexander Ljungberg
282376a465 More tests. Simplify code. 2013-01-23 16:37:36 +00:00
Alexander Ljungberg
27c8051fe7 Document how to run the unit tests. 2013-01-23 16:22:15 +00:00
Alexander Ljungberg
cf64aa32b2 Fix unit test for get_playlist. 2013-01-23 16:21:56 +00:00
Alexander Ljungberg
4bf6267781 Unused imports. 2013-01-23 16:16:47 +00:00
Alexander Ljungberg
06eef90343 Only create asset folder when running as main script. 
This commit makes it so that merely importing server.py doesn't cause the assets folder to be created, something which might be undesired in for example unit tests.
 2013-01-23 10:27:07 +00:00
Zachary Jones
47a6cdabeb Fix some HTML markup mistakes. 2013-01-22 23:01:51 -06:00
Zachary Jones
bbaaeee55b Use the new json_dump method with support for datetime 2013-01-22 22:51:15 -06:00
Zachary Jones
a6a97ec3e1 Start work on views. 
Active and Inactive assets views are now dynamically rendered based on the assets which are retrieved via Backbone. The "Activate" and "Deactivate" links will actually move an asset from one section to another but nothing actually happens on the backend yet.
 2013-01-22 22:50:56 -06:00
Zachary Jones
02c8c1ed4f Augment the JSON dumper to turn datetimes into ISO strings. 2013-01-22 22:42:36 -06:00
Zachary Jones
7d97db38bb Update bottle-haml to 0.1.4. I pushed a slight change. 2013-01-22 21:36:22 -06:00
Zachary Jones
4181c88732 Merge branch 'master' into screenly-ui 2013-01-22 20:46:41 -06:00
Zachary Jones
24222006d0 Make get_playlist() use our fetch_assets() method. 
Increasing dogfooding and first steps towards a more DRY, extensible way of handling database models.
 2013-01-22 20:32:17 -06:00
Zachary Jones
df905d4a9a Make tests runnable by just python-ing the file. 2013-01-22 19:28:35 -06:00
Zachary Jones
0c83d42b2b Add mock to requirements.txt as it is needed for tests. 2013-01-22 19:24:59 -06:00
Viktor Petersson
02d325c546 Closes #41. Removes file from disk if it was an uploaded asset. 2013-01-22 19:38:14 +01:00
Viktor Petersson
dcdedd67e0 Closes #25. Adds support for configuring the listening address in screenly.conf. Default address is 0.0.0.0:8080. 2013-01-22 19:25:05 +01:00
Zachary Jones
af542ba69e Change variable name since we're now using the get_assets_grouped() method. 
@vpetersson This is like the reason for the rendering bug.
 2013-01-22 11:27:20 -06:00
Viktor Petersson
ea0240fbfa Minor update to README. 2013-01-22 16:21:20 +01:00
Viktor Petersson
a18be8ad94 Introducing ScreenlyApp.com. Screenly's official website. The source code for Screenly OSE will still be hosted at Github, but more information, along with a live demo is now available. 2013-01-21 23:43:50 +01:00
Zachary Jones
aedd5e9bbe Remove unneeded variable. 2013-01-21 15:23:44 -06:00
Zachary Jones
1f77a40965 Create Backbone collections for Assets, ActiveAssets, and InactiveAssets. 
These are populated automatically via AJAX on page load.
 2013-01-21 15:11:58 -06:00
Zachary Jones
d0ab9451be Add simple API for obtaining a list of Assets. 2013-01-21 15:10:52 -06:00
Zachary Jones
1924bab249 Add asset_id key to the asset objects returned in the playlist. Closes #42. Special thanks to @crl-42 for reporting. 2013-01-21 13:42:44 -06:00
Zachary Jones
481e3de23f Start Javascript for interactive index page. 2013-01-21 13:35:05 -06:00
Viktor Petersson
53c81e786d Improved installation script to user requirements.txt instead of hardcoded packages in install.sh. 2013-01-21 20:20:29 +01:00
Zachary Jones
707c916dd4 Add Underscore and Backbone, which we'll need for the interactive index page. 2013-01-21 12:49:58 -06:00
Zachary Jones
ab36c74558 Use the new get_assets_grouped() method to get a list of the active and inactive assets for use in rendering the index template. 2013-01-21 12:23:39 -06:00
Zachary Jones
1d0c753204 Improve documentation and code style 2013-01-21 12:22:48 -06:00
Zachary Jones
90da2524ec Merge branch 'master' into screenly-ui 2013-01-21 12:03:16 -06:00
Zachary Jones
2775322502 Start restructuring the methods which communicate with the database to be a little more flexible and DRY. 2013-01-20 16:46:00 -06:00