Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,537 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

8537 Commits

Author SHA1 Message Date
James c561f36aa1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-24 15:26:27 -04:00
James baf5460e14 CC-4284: Calendar: AddContentToShow -> "Processing..." message pops up and never goes away 
- fixed
 2012-08-24 15:26:12 -04:00
denise 54db68bb26 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-24 12:40:39 -04:00
denise dc8e3da6db CC-4283: Password Reset: Please let user input username they want to reset 
-done
 2012-08-24 12:40:30 -04:00
Rudi Grinberg bc078b790d Merge branch 'cc-3936-2' into devel 2012-08-24 12:39:05 -04:00
Rudi Grinberg 7284770226 cc-3936: Changed setting of owner when modifying/inserting metadata. 2012-08-24 12:38:33 -04:00
Rudi Grinberg 5841cb7066 cc-3936: 
Made it so that identifer file is written before the file itself so that media monitor always
has the identifier file before the song itself.
 2012-08-24 12:37:16 -04:00
Rudi Grinberg e53c20bbcd cc-3936: added method to make it easier to get users of a certain type. 2012-08-24 12:36:20 -04:00
denise ffa4c131ee CC-4246: Smart Playlist: Click shuffle button will shuffle the contents multiple times 
-code refactor
 2012-08-24 11:50:02 -04:00
denise 2e505ee970 CC-4246: Smart Playlist: Click shuffle button will shuffle the contents multiple times 
-small code fix
 2012-08-24 11:47:32 -04:00
denise b8571be827 CC-4246: Smart Playlist: Click shuffle button will shuffle the contents multiple times 
- small code fix
 2012-08-24 11:45:56 -04:00
denise 5f1c6453a5 CC-4246: Smart Playlist: Click shuffle button will shuffle the contents multiple times 
-fixed
-disabled shuffle button
 2012-08-24 11:44:18 -04:00
denise 82f2b2e7c3 CC-4249: Playlist: Playlist's length doesn't update if it contains a smart playlist which the length is changed 
-fixed
 2012-08-24 11:12:31 -04:00
Rudi Grinberg 4efdf71aea cc-3936: Made phpName of foreign key conform to Fk prefix convention. 2012-08-24 11:10:05 -04:00
Rudi Grinberg 857be6b702 cc-3936: Removed manual path concatenation. Fixed setting owner of file. 2012-08-24 11:09:38 -04:00
denise 1f7a6fdc63 CC-4262: Smart Block: Characters do not get escaped properly 
-fixed
 2012-08-24 10:29:28 -04:00
Rudi Grinberg 19a5a8f992 cc-3936: fixed wrong argument order bug. 2012-08-24 10:20:59 -04:00
Rudi Grinberg 4ad983f63c cc-3936: applied schema changes 2012-08-24 10:20:59 -04:00
Rudi Grinberg c83fad2546 cc-3936: added owner to every file insert 2012-08-24 10:20:59 -04:00
Rudi Grinberg 60803e5146 cc-3936: 
Name of foreign key was given for easier access through propel. Also renamed phpName for ownerId
to fit the existing convention.
 2012-08-24 10:20:59 -04:00
Rudi Grinberg b0a61fc291 cc-3936: Added setting default owner_id for inserted files. 2012-08-24 10:20:59 -04:00
Rudi Grinberg 43ca0d21e6 cc-3936: removed unnecessary object creation 2012-08-24 10:20:59 -04:00
Rudi Grinberg dcc9c58577 cc-3936: Sexified equal signs. 2012-08-24 10:20:59 -04:00
Rudi Grinberg 50de229258 cc-3936: 
Refactored getUsers not to take multiple types of arguments.
 2012-08-24 10:20:59 -04:00
Rudi Grinberg 996dcfd35f cc-3936: Ran propgen to generate schema changes 2012-08-24 10:20:59 -04:00
Rudi Grinberg e2d9f220f8 cc-3936: 
Changed schema so that owner_id is not required for every file.
 2012-08-24 10:20:59 -04:00
Rudi Grinberg 36b344a910 cc-3936: remove unneeded garbage. 2012-08-24 10:20:59 -04:00
Rudi Grinberg dcfa865f7d cc-3936: 
Ran propel-gen to commit schema changes.
 2012-08-24 10:20:58 -04:00
Rudi Grinberg 4f88543de2 cc-3936: 
Updated schema so that every file has an owner.
 2012-08-24 10:20:58 -04:00
Rudi Grinberg f940c20701 cc-3936: 
Added success logging when identifier file has been written.
 2012-08-24 10:20:58 -04:00
Rudi Grinberg 23e3f6137d cc-3936: 
Sexified code. Added section for user handling.
 2012-08-24 10:20:58 -04:00
Martin Konecny 9893282e43 CC-4275: Enable debug mode where all Propel queries are displayed in raw SQL 
-add enablePropelLogging and disablePropelLogging functions
 2012-08-23 22:27:24 -04:00
Martin Konecny 7cbe037c7e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-23 21:58:39 -04:00
Martin Konecny 628bb6de1f CC-4275: Enable debug mode where all Propel queries are displayed in raw SQL 
-done
 2012-08-23 21:58:21 -04:00
Martin Konecny d06fda0329 fix indentation 2012-08-23 21:43:55 -04:00
denise 17d030a3f9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-23 17:41:20 -04:00
denise 0a851f3c96 CC-4263: Calendar: Can create one show contains another show (overlapping) 
-fixed
 2012-08-23 17:41:05 -04:00
Martin Konecny a9cf597f14 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-23 15:04:38 -04:00
Martin Konecny ea58ae9cc8 -remove unecessary logging 2012-08-23 15:03:59 -04:00
denise 9dfbd90e0f CC-4270: Media Library: Sample Rate is broken to 2 lines in context view 
-fixed
 2012-08-23 13:50:46 -04:00
denise 2f9ea4dc0b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-23 11:53:56 -04:00
denise bf69f23343 CC-4249: Playlist: Playlist's length doesn't update if it contains a smart playlist which the length is changed 
-fixed
 2012-08-23 11:53:44 -04:00
James a94039a0c6 CC-4268: Playlist: No "preview" button if a track of the playlist does not exist any more 
- fixed
 2012-08-23 11:32:37 -04:00
James a4c579f36e CC-4254: Library: advanced search on library 
- bug fix
 2012-08-23 10:59:34 -04:00
James c2d475e6d8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/controllers/PlaylistController.php
 2012-08-23 10:43:28 -04:00
James de0aeee594 CC-4254: Library: advanced search on library 
- initial commit
 2012-08-23 10:41:40 -04:00
denise 38173bd3a2 - small fix 2012-08-23 10:19:00 -04:00
Rudi Grinberg 5d40bd851d added upgrade.sql for 2.2.0 upgrade 2012-08-22 17:25:19 -04:00
Rudi Grinberg ff24c156e8 Merge branch 'cc-3936' into devel 2012-08-22 17:20:52 -04:00
Rudi Grinberg c7cf687e66 MM2: Imporoved some logging and error checking. 2012-08-22 17:01:39 -04:00