acontent.git
13 years agoremoved extra comma breaking SQL statement v1.1
Greg Gay [Mon, 22 Nov 2010 16:24:12 +0000 (16:24 -0000)]
removed extra comma breaking SQL statement

13 years agoupdate bundle to svn.atutor.ca location
Greg Gay [Mon, 22 Nov 2010 15:45:32 +0000 (15:45 -0000)]
update bundle to svn.atutor.ca location

13 years agoEnable and polish upgrader
Cindy Li [Fri, 19 Nov 2010 20:40:27 +0000 (20:40 -0000)]
Enable and polish upgrader

13 years ago1. in ContentOutputParser, skip attribute value "clsid:..." in <object>
Cindy Li [Wed, 20 Oct 2010 19:55:44 +0000 (19:55 -0000)]
1. in ContentOutputParser, skip attribute value "clsid:..." in <object>
2. apply alternatives to the content by default
3. fix the bug that when using alternative tool bar to switch, the alternative always append to the primary even though the user preference is set to replace.

13 years agoupdate version number to 1.1
Greg Gay [Tue, 19 Oct 2010 13:05:57 +0000 (13:05 -0000)]
update version number to 1.1

13 years agohttp://atutor.ca/atutor/mantis/view.php?id=4593
Harris Wong [Mon, 18 Oct 2010 19:28:40 +0000 (19:28 -0000)]
http://atutor.ca/atutor/mantis/view.php?id=4593

13 years ago1. Improved DAO.class.php, when no results returned for "select" sql, return false;
Cindy Li [Mon, 18 Oct 2010 19:11:34 +0000 (19:11 -0000)]
1. Improved DAO.class.php, when no results returned for "select" sql, return false;
2. On "import/export course" page, truncate folder/content titles in the drop down list box to 65 chars;
3. Only when content type is "html", parse content and extract primary resources
4. In output.inc.php -> provide_alternative(), don't call convert_amp() on content since the plain text would not have alternatives defined.

13 years agoApplied atutor changes for flowplayer and adapted content
Cindy Li [Mon, 18 Oct 2010 14:45:51 +0000 (14:45 -0000)]
Applied atutor changes for flowplayer and adapted content

13 years agohttp://atutor.ca/atutor/mantis/view.php?id=4588
Harris Wong [Fri, 15 Oct 2010 21:05:21 +0000 (21:05 -0000)]
http://atutor.ca/atutor/mantis/view.php?id=4588

13 years agoreplace htmlentities() with htmlentities_utf8()
Cindy Li [Fri, 15 Oct 2010 19:00:30 +0000 (19:00 -0000)]
replace htmlentities() with htmlentities_utf8()

13 years agohttp://atutor.ca/atutor/mantis/view.php?id=4580
Harris Wong [Thu, 14 Oct 2010 17:25:22 +0000 (17:25 -0000)]
http://atutor.ca/atutor/mantis/view.php?id=4580
- modified the dicussionTools and weblinks xsd to validate.
- added cc_profile specific metadata into test templates

13 years ago1. fixed function populate_a4a() to clean up alternatives from db when no resources...
Cindy Li [Tue, 12 Oct 2010 17:55:17 +0000 (17:55 -0000)]
1. fixed function populate_a4a() to clean up alternatives from db when no resources and to figure out content_base_href when it's not presented;
1. added missing controls files into flowplayer module.

13 years ago- changed to ContentUtility:convertYoutubePlayURLToWatchURL
Harris Wong [Tue, 12 Oct 2010 16:01:31 +0000 (16:01 -0000)]
- changed to ContentUtility:convertYoutubePlayURLToWatchURL

13 years agoshorten import path from OAuth to 6 hex characters long.
Harris Wong [Fri, 8 Oct 2010 20:39:49 +0000 (20:39 -0000)]
shorten import path from OAuth to 6 hex characters long.

http://atutor.ca/atutor/mantis/view.php?id=4506

13 years agohttp://atutor.ca/atutor/mantis/view.php?id=4578
Harris Wong [Fri, 8 Oct 2010 20:06:20 +0000 (20:06 -0000)]
http://atutor.ca/atutor/mantis/view.php?id=4578

13 years agofix bugs from merging atutor changes.
Cindy Li [Fri, 8 Oct 2010 20:06:16 +0000 (20:06 -0000)]
fix bugs from merging atutor changes.

13 years ago-fixed the caller to formatContent and convertYoutubePlayURLToWatchURL
Harris Wong [Fri, 8 Oct 2010 19:52:46 +0000 (19:52 -0000)]
-fixed the caller to formatContent and convertYoutubePlayURLToWatchURL

13 years ago(no commit message)
Harris Wong [Fri, 8 Oct 2010 18:42:19 +0000 (18:42 -0000)]

13 years ago1. replace AT_INCLUDE_PATH with TR_INCLUDE_PATH
Cindy Li [Fri, 8 Oct 2010 18:42:04 +0000 (18:42 -0000)]
1. replace AT_INCLUDE_PATH with TR_INCLUDE_PATH
2. copy over the flowplayer handling from ATutor

13 years agohttp://atutor.ca/atutor/mantis/view.php?id=4574
Harris Wong [Fri, 8 Oct 2010 17:17:51 +0000 (17:17 -0000)]
http://atutor.ca/atutor/mantis/view.php?id=4574

13 years agoadd styles for icons on alternative toolbar
Cindy Li [Fri, 8 Oct 2010 14:59:32 +0000 (14:59 -0000)]
add styles for icons on alternative toolbar

13 years ago1. when download zip file, push down the download in chunks;
Cindy Li [Fri, 8 Oct 2010 14:22:46 +0000 (14:22 -0000)]
1. when download zip file, push down the download in chunks;
2. upgrade flowplayer;
3. in get.php, skip "Content-length" for mp3 & mp4 files.

13 years agohttp://atutor.ca/atutor/mantis/view.php?id=4276
Harris Wong [Fri, 24 Sep 2010 15:12:46 +0000 (15:12 -0000)]
http://atutor.ca/atutor/mantis/view.php?id=4276

13 years agohttp://atutor.ca/atutor/mantis/view.php?id=4527
Harris Wong [Fri, 3 Sep 2010 20:05:30 +0000 (20:05 -0000)]
http://atutor.ca/atutor/mantis/view.php?id=4527

13 years agotest commit with Id$
Cindy Li [Fri, 3 Sep 2010 17:26:50 +0000 (17:26 -0000)]
test commit with Id$

13 years agohttp://atutor.ca/atutor/mantis/view.php?id=4526
Harris Wong [Fri, 3 Sep 2010 17:20:41 +0000 (17:20 -0000)]
http://atutor.ca/atutor/mantis/view.php?id=4526

13 years agofix typo v1.0
Greg Gay [Thu, 26 Aug 2010 13:49:02 +0000 (13:49 -0000)]
fix typo

13 years ago1. remove .psd files from photoshop
Cindy Li [Wed, 25 Aug 2010 17:26:01 +0000 (17:26 -0000)]
1. remove .psd files from photoshop
2. put back logo.png that is packed into content package

13 years agoset "class" as a valid attribute in <a> tag using tinymce so that it's not stripped...
Cindy Li [Wed, 25 Aug 2010 15:06:11 +0000 (15:06 -0000)]
set "class" as a valid attribute in <a> tag using tinymce so that it's not stripped by tinymce

13 years agoskip the url conversion if the url is inside double quotes (") because this url could...
Cindy Li [Wed, 25 Aug 2010 14:44:09 +0000 (14:44 -0000)]
skip the url conversion if the url is inside double quotes (") because this url could be a part of <a href="..."></a>

13 years ago1. .flv conversion to use flowplayer must come after url conversion in makeClickable()
Cindy Li [Tue, 24 Aug 2010 20:24:55 +0000 (20:24 -0000)]
1. .flv conversion to use flowplayer must come after url conversion in makeClickable()
2. clean up output.inc.php to remove the functions that are not in use

13 years agoreplace ampersand separators with SEP
Greg Gay [Tue, 24 Aug 2010 20:04:35 +0000 (20:04 -0000)]
replace ampersand separators with SEP

13 years agoreplace ampersand separators with SEP
Greg Gay [Tue, 24 Aug 2010 19:54:02 +0000 (19:54 -0000)]
replace ampersand separators with SEP

13 years agoreplace ampersand separators with SEP
Greg Gay [Tue, 24 Aug 2010 19:52:41 +0000 (19:52 -0000)]
replace ampersand separators with SEP

13 years agoreplace ampersand separators with SEP
Greg Gay [Tue, 24 Aug 2010 19:52:13 +0000 (19:52 -0000)]
replace ampersand separators with SEP

13 years agoremove commented code for old search field
Greg Gay [Tue, 24 Aug 2010 19:37:56 +0000 (19:37 -0000)]
remove commented code for old search field

13 years agoadjust space option
Greg Gay [Tue, 24 Aug 2010 19:35:22 +0000 (19:35 -0000)]
adjust space option

13 years agoadjust space option
Greg Gay [Tue, 24 Aug 2010 19:28:17 +0000 (19:28 -0000)]
adjust space option

13 years agoadjust space option
Greg Gay [Tue, 24 Aug 2010 19:27:00 +0000 (19:27 -0000)]
adjust space option

13 years agoremove referecne to google fonts
Greg Gay [Tue, 24 Aug 2010 19:23:31 +0000 (19:23 -0000)]
remove referecne to google fonts

13 years agoAdjust top nav padding for IE7/8 compatibility
Greg Gay [Tue, 24 Aug 2010 19:12:58 +0000 (19:12 -0000)]
Adjust top nav padding for IE7/8 compatibility

13 years agoadd space between top nav tabs in IE
Greg Gay [Tue, 24 Aug 2010 19:07:48 +0000 (19:07 -0000)]
add space between top nav tabs in IE

13 years agoadjust search-top width for new categories menu
Greg Gay [Tue, 24 Aug 2010 19:04:32 +0000 (19:04 -0000)]
adjust search-top width for new categories menu

13 years agostyle tweaks
Greg Gay [Tue, 24 Aug 2010 19:00:03 +0000 (19:00 -0000)]
style tweaks

13 years agostyle tweaks
Greg Gay [Tue, 24 Aug 2010 17:44:04 +0000 (17:44 -0000)]
style tweaks

13 years agomake_clickable(): improve regular expression of converting URL to ignore the beginnin...
Cindy Li [Tue, 24 Aug 2010 14:20:57 +0000 (14:20 -0000)]
make_clickable(): improve regular expression of converting URL to ignore the beginning " or ending )

13 years agohttp://atutor.ca/atutor/mantis/view.php?id=4506
Harris Wong [Mon, 23 Aug 2010 22:04:31 +0000 (22:04 -0000)]
http://atutor.ca/atutor/mantis/view.php?id=4506

13 years agoremove unused images
Greg Gay [Mon, 23 Aug 2010 20:32:29 +0000 (20:32 -0000)]
remove unused images

13 years agochanged delete lesson icon
Greg Gay [Mon, 23 Aug 2010 20:29:37 +0000 (20:29 -0000)]
changed delete lesson icon

13 years agodelete unused images
Greg Gay [Mon, 23 Aug 2010 20:25:33 +0000 (20:25 -0000)]
delete unused images

13 years agofix the bug that once the a content is deleted from the lesson via "delete content...
Cindy Li [Mon, 23 Aug 2010 19:33:35 +0000 (19:33 -0000)]
fix the bug that once the a content is deleted from the lesson via "delete content" icon, the page is still viewing the deleted content which caused the error.

13 years agoapply the changes in atutor to fix the issue that the export puts the items into...
Cindy Li [Mon, 23 Aug 2010 17:26:47 +0000 (17:26 -0000)]
apply the changes in atutor to fix the issue that the export puts the items into a new folder which results in a path too long error after some rounds of import/export

Also fix:
http://www.atutor.ca/atutor/mantis/view.php?id=4498
http://www.atutor.ca/atutor/mantis/view.php?id=4499

13 years agocase insensitive on the image extensions from the imported package
Cindy Li [Fri, 20 Aug 2010 20:10:26 +0000 (20:10 -0000)]
case insensitive on the image extensions from the imported package

13 years agofix the bug that clr_dir() is not from FileUtility
Cindy Li [Fri, 20 Aug 2010 19:13:57 +0000 (19:13 -0000)]
fix the bug that clr_dir() is not from FileUtility

13 years agocreate the default HowTo lesson in installer
Cindy Li [Fri, 20 Aug 2010 18:55:29 +0000 (18:55 -0000)]
create the default HowTo lesson in installer

13 years agofix indentation
Cindy Li [Fri, 20 Aug 2010 13:32:06 +0000 (13:32 -0000)]
fix indentation

13 years agoapply latest change from atutor
Cindy Li [Tue, 17 Aug 2010 18:58:09 +0000 (18:58 -0000)]
apply latest change from atutor

13 years agohttp://www.atutor.ca/atutor/mantis/view.php?id=4492
Cindy Li [Tue, 17 Aug 2010 18:46:55 +0000 (18:46 -0000)]
www.atutor.ca/atutor/mantis/view.php?id=4492

13 years agoadded local droid fonts
Greg Gay [Tue, 17 Aug 2010 18:24:54 +0000 (18:24 -0000)]
added local droid fonts

13 years agohttp://www.atutor.ca/atutor/mantis/view.php?id=4489
Cindy Li [Tue, 17 Aug 2010 18:00:36 +0000 (18:00 -0000)]
www.atutor.ca/atutor/mantis/view.php?id=4489
show tool icons "add sibling folder" and "add sibling page" when viewing top page/folder

13 years agohttp://www.atutor.ca/atutor/mantis/view.php?id=4473
Cindy Li [Tue, 17 Aug 2010 17:18:53 +0000 (17:18 -0000)]
www.atutor.ca/atutor/mantis/view.php?id=4473
1. create an author account
2. suggest user to login with admin or author account

13 years agoapply the changes in ATutor for CC import/export into AContent
Cindy Li [Tue, 17 Aug 2010 14:31:33 +0000 (14:31 -0000)]
apply the changes in ATutor for CC import/export into AContent

13 years agomore improvement on make_clickable() function to make the plain text URL and emails...
Cindy Li [Mon, 16 Aug 2010 18:46:17 +0000 (18:46 -0000)]
more improvement on make_clickable() function to make the plain text URL and emails clickable

13 years agore-do the make_clickable() function on making the plain text URL and emails clickable
Cindy Li [Mon, 16 Aug 2010 13:36:43 +0000 (13:36 -0000)]
re-do the make_clickable() function on making the plain text URL and emails clickable

13 years agoadded plus sign to icons to indicate add
Greg Gay [Thu, 12 Aug 2010 20:21:18 +0000 (20:21 -0000)]
added plus sign to icons to indicate add

13 years agolimit category names in search category picker to 28 chars
Cindy Li [Thu, 12 Aug 2010 20:03:40 +0000 (20:03 -0000)]
limit category names in search category picker to 28 chars

13 years agorearrange category picker
Greg Gay [Thu, 12 Aug 2010 19:52:14 +0000 (19:52 -0000)]
rearrange category picker

13 years agorearrange category picker
Greg Gay [Thu, 12 Aug 2010 19:51:45 +0000 (19:51 -0000)]
rearrange category picker

13 years agoadjust subnav styles to work with IE7
Greg Gay [Thu, 12 Aug 2010 18:23:14 +0000 (18:23 -0000)]
adjust subnav styles to work with IE7

13 years agohttp://www.atutor.ca/atutor/mantis/view.php?id=4485
Cindy Li [Thu, 12 Aug 2010 17:54:22 +0000 (17:54 -0000)]
www.atutor.ca/atutor/mantis/view.php?id=4485

13 years agoreplace broken table markup with div
Greg Gay [Thu, 12 Aug 2010 17:24:37 +0000 (17:24 -0000)]
replace broken table markup with div

13 years agoadjust add questions styles
Greg Gay [Thu, 12 Aug 2010 16:31:25 +0000 (16:31 -0000)]
adjust add questions styles

13 years agoadjust add questions styles
Greg Gay [Thu, 12 Aug 2010 16:31:19 +0000 (16:31 -0000)]
adjust add questions styles

13 years agohttp://www.atutor.ca/atutor/mantis/view.php?id=4484
Cindy Li [Thu, 12 Aug 2010 15:43:02 +0000 (15:43 -0000)]
www.atutor.ca/atutor/mantis/view.php?id=4484
1. limit category names in the category picker to 28 characters;
2. adjust "delete this lesson" icon

13 years agoproof documentation
Greg Gay [Thu, 12 Aug 2010 15:10:07 +0000 (15:10 -0000)]
proof documentation

13 years agoproof documentation
Greg Gay [Thu, 12 Aug 2010 15:00:21 +0000 (15:00 -0000)]
proof documentation

13 years agonew bookmark image adjustments
Greg Gay [Thu, 12 Aug 2010 14:30:06 +0000 (14:30 -0000)]
new bookmark image adjustments

13 years agofix the bug that the click on buttons of "add/remove lesson from my lesson list"...
Cindy Li [Thu, 12 Aug 2010 14:05:39 +0000 (14:05 -0000)]
fix the bug that the click on buttons of "add/remove lesson from my lesson list" at side menu "my lessons" directs page to wrong URL.

13 years agoadd new bookmark icons
Greg Gay [Thu, 12 Aug 2010 13:23:58 +0000 (13:23 -0000)]
add new bookmark icons

13 years agohttp://www.atutor.ca/atutor/mantis/view.php?id=4462
Cindy Li [Wed, 11 Aug 2010 19:38:17 +0000 (19:38 -0000)]
www.atutor.ca/atutor/mantis/view.php?id=4462

13 years agohttp://www.atutor.ca/atutor/mantis/view.php?id=4460
Cindy Li [Tue, 10 Aug 2010 18:26:10 +0000 (18:26 -0000)]
www.atutor.ca/atutor/mantis/view.php?id=4460

13 years agohttp://www.atutor.ca/atutor/mantis/view.php?id=4458
Cindy Li [Tue, 10 Aug 2010 18:08:47 +0000 (18:08 -0000)]
www.atutor.ca/atutor/mantis/view.php?id=4458

13 years agohttp://www.atutor.ca/atutor/mantis/view.php?id=4475
Cindy Li [Tue, 10 Aug 2010 17:00:34 +0000 (17:00 -0000)]
www.atutor.ca/atutor/mantis/view.php?id=4475

Fix a mysql error at "add questions" to a test

13 years agohttp://www.atutor.ca/atutor/mantis/view.php?id=4457
Cindy Li [Tue, 10 Aug 2010 15:20:37 +0000 (15:20 -0000)]
www.atutor.ca/atutor/mantis/view.php?id=4457
1. commented out the search section from the index page
2. increased the number of lessons displayed on the index page to 15
3. On index page, use term "Results" if the request is from search.php, otherwise, use term "Lessons"

13 years agofix coding style like indentation, spaces etc.
Cindy Li [Tue, 10 Aug 2010 14:52:56 +0000 (14:52 -0000)]
fix coding style like indentation, spaces etc.

13 years agohttp://www.atutor.ca/atutor/mantis/view.php?id=4457
Cindy Li [Tue, 10 Aug 2010 14:32:31 +0000 (14:32 -0000)]
www.atutor.ca/atutor/mantis/view.php?id=4457

13 years agohttp://www.atutor.ca/atutor/mantis/view.php?id=4459
Cindy Li [Tue, 10 Aug 2010 13:48:15 +0000 (13:48 -0000)]
www.atutor.ca/atutor/mantis/view.php?id=4459

13 years agoremove message table styles
Cindy Li [Mon, 9 Aug 2010 19:47:25 +0000 (19:47 -0000)]
remove message table styles

13 years agoBypass the php error from file_get_contents() when the release tag branch does not...
Cindy Li [Mon, 9 Aug 2010 19:14:41 +0000 (19:14 -0000)]
Bypass the php error from file_get_contents() when the release tag branch does not exist. The error can be by-passed because in this case the scripts modified by updater are considered as "locally modified" anyway.

13 years agoupdate location of UPDATE_SERVER
Cindy Li [Mon, 9 Aug 2010 19:11:54 +0000 (19:11 -0000)]
update location of UPDATE_SERVER

13 years agohttp://www.atutor.ca/atutor/mantis/view.php?id=4472
Cindy Li [Mon, 9 Aug 2010 18:36:35 +0000 (18:36 -0000)]
www.atutor.ca/atutor/mantis/view.php?id=4472

13 years agohttp://www.atutor.ca/atutor/mantis/view.php?id=4474
Cindy Li [Mon, 9 Aug 2010 18:29:34 +0000 (18:29 -0000)]
www.atutor.ca/atutor/mantis/view.php?id=4474

13 years agoadjust updater styles
Greg Gay [Mon, 9 Aug 2010 16:17:11 +0000 (16:17 -0000)]
adjust updater styles

13 years agoadjust updater styles
Greg Gay [Mon, 9 Aug 2010 16:17:03 +0000 (16:17 -0000)]
adjust updater styles

13 years agoAdmin user group needs to have "updater" module enabled by default.
Cindy Li [Mon, 9 Aug 2010 15:56:17 +0000 (15:56 -0000)]
Admin user group needs to have "updater" module enabled by default.

13 years agohttp://www.atutor.ca/atutor/mantis/view.php?id=4469
Cindy Li [Mon, 9 Aug 2010 14:47:12 +0000 (14:47 -0000)]
www.atutor.ca/atutor/mantis/view.php?id=4469

13 years agohttp://www.atutor.ca/atutor/mantis/view.php?id=4465
Cindy Li [Mon, 9 Aug 2010 14:27:27 +0000 (14:27 -0000)]
www.atutor.ca/atutor/mantis/view.php?id=4465

13 years agohttp://www.atutor.ca/atutor/mantis/view.php?id=4466
Cindy Li [Mon, 9 Aug 2010 14:12:04 +0000 (14:12 -0000)]
www.atutor.ca/atutor/mantis/view.php?id=4466

13 years agoreplace import/export icon
Greg Gay [Sun, 8 Aug 2010 23:52:04 +0000 (23:52 -0000)]
replace import/export icon

13 years agotweak
Greg Gay [Sun, 8 Aug 2010 23:10:50 +0000 (23:10 -0000)]
tweak