Commit Graph

19654 Commits

Author SHA1 Message Date
Kyle Fiedler
9bd5fbab2d removed the sass cache 2012-03-19 14:51:39 -04:00
Calen Pennington
086b1bf08b Forcing bash for ci build 2012-03-19 13:15:25 -04:00
Calen Pennington
ca50fe027e Remove origin/ and replace '/' in branch names in tar file 2012-03-19 13:11:06 -04:00
Calen Pennington
7541737c15 Fix how the tar is built 2012-03-19 13:05:01 -04:00
Calen Pennington
faa34e2683 Make build script executable 2012-03-19 12:20:00 -04:00
Calen Pennington
8fe8bb6604 Adding folder for ci scripts, and initial script for packaging repo 2012-03-19 12:19:29 -04:00
Calen Pennington
71cc49184b Merge remote-tracking branch '3rdParty/master' 2012-03-19 11:10:49 -04:00
Calen Pennington
a445c2cc2b Merge remote-tracking branch 'templates/master' 2012-03-19 11:10:49 -04:00
Calen Pennington
8b620c32d5 Merge remote-tracking branch 'static/master' 2012-03-19 11:10:49 -04:00
Calen Pennington
562418504a Merge remote-tracking branch '3rdParty/master' into bridger-grades 2012-03-19 11:10:48 -04:00
Calen Pennington
1457c21f41 Merge remote-tracking branch '3rdParty/master' into pmitros-name-change 2012-03-19 11:10:48 -04:00
Calen Pennington
d862cb2232 Merge remote-tracking branch 'templates/bridger-grades' into bridger-grades 2012-03-19 11:10:48 -04:00
Calen Pennington
7954f9d482 Merge remote-tracking branch 'templates/pmitros-name-change' into pmitros-name-change 2012-03-19 11:10:48 -04:00
Calen Pennington
c04d49385c Merge remote-tracking branch 'static/master' into bridger-grades 2012-03-19 11:10:48 -04:00
Calen Pennington
6c9b8e727e Merge remote-tracking branch 'static/master' into pmitros-name-change 2012-03-19 11:10:48 -04:00
Calen Pennington
fdc5cd94a9 Move to subdirectory in prepartion for merge 2012-03-19 11:10:44 -04:00
Calen Pennington
522ee0584b Copying hgignore to gitignore 2012-03-19 11:10:44 -04:00
Calen Pennington
fc68777119 Fix up the symlinks to point to the right place 2012-03-19 11:10:44 -04:00
Calen Pennington
98dd48f9da Move to subdirectory in prepartion for merge 2012-03-19 11:10:44 -04:00
Calen Pennington
2f0b39189a Move to subdirectory in prepartion for merge 2012-03-19 11:10:44 -04:00
Calen Pennington
efb96251f8 Copying hgignore to gitignore 2012-03-19 11:10:44 -04:00
Calen Pennington
d094d8c1dd Copying hgignore to gitignore 2012-03-19 11:10:44 -04:00
Calen Pennington
317542ad19 Updating pointers to new merged repo locations 2012-03-19 11:10:44 -04:00
Calen Pennington
ceffe4a875 Updating pointers to new merged repo locations 2012-03-19 11:10:44 -04:00
Calen Pennington
816edd1904 Updating pointers to new merged repo locations 2012-03-19 11:10:44 -04:00
Calen Pennington
1bc3835fe6 Splitting files into subdirectories in preparation for merge 2012-03-19 11:10:44 -04:00
Calen Pennington
a20b01c081 Splitting files into subdirectories in preparation for merge 2012-03-19 11:10:44 -04:00
Calen Pennington
6dc7fd6ea5 Splitting files into subdirectories in preparation for merge 2012-03-19 11:10:44 -04:00
Calen Pennington
4f65c6e67a Remove file in 3rdParty 2012-03-19 11:10:43 -04:00
Calen Pennington
799816a31d Move to subdirectory in preparation for merge 2012-03-19 11:10:43 -04:00
Calen Pennington
70832c7db3 Import from hg 2012-03-19 11:05:25 -04:00
Piotr Mitros
0702a84587 Unknown changes/pre-git transition
--HG--
branch : pmitros-name-change
rename : activation_email.txt => emails/activation_email.txt
rename : activation_email_subject.txt => emails/activation_email_subject.txt
2012-03-19 09:26:16 -04:00
Piotr Mitros
9882b30c83 Unknown changes/pre-git transition
--HG--
branch : pmitros-name-change
2012-03-19 09:25:42 -04:00
Kyle Fiedler
5ceb79df9c Merged kf-titles 2012-03-15 16:48:31 -04:00
Kyle Fiedler
ea7e006a38 merged default
--HG--
branch : kf-titles
2012-03-15 16:47:59 -04:00
Kyle Fiedler
3a84bafa48 merged in kf-links 2012-03-15 16:33:30 -04:00
Kyle Fiedler
057185f69e Merged in default
--HG--
branch : kf-links
2012-03-15 16:32:55 -04:00
Kyle Fiedler
3da8b8133f Added minor ui changes 2012-03-15 16:28:36 -04:00
Piotr Mitros
7c73d7ef41 Non-working code; Cale needs a commit/push
--HG--
branch : pmitros-name-change
2012-03-15 15:50:15 -04:00
David Ormsbee
8949c5e6bf merged in session cache separation 2012-03-15 15:30:41 -04:00
David Ormsbee
d9253a0c0f remove unnecessary settings import
--HG--
branch : cache_separation
2012-03-15 15:25:39 -04:00
David Ormsbee
f4625003a7 change config to not cache by default, unless overridden by server-specific settings.py
--HG--
branch : cache_separation
2012-03-15 15:21:39 -04:00
David Ormsbee
e37eb49065 Shift wiki and course.xml caching to use newly defined 'general' cache, separate from sessions left in 'default'
--HG--
branch : cache_separation
2012-03-15 14:45:27 -04:00
Reda Lemeden
269334a839 Fixed the layout of the graph gradebook 2012-03-15 10:58:39 -04:00
Reda Lemeden
99f4f7324d Fixed the layout of the graph gradebook
--HG--
branch : bridger-grades
2012-03-15 10:57:59 -04:00
Piotr Mitros
cbfeb79eb6 Migration
--HG--
branch : pmitros-name-change
2012-03-14 23:04:56 -04:00
Piotr Mitros
0ea176f665 Adding name and e-mail changes
--HG--
branch : pmitros-name-change
2012-03-14 22:56:20 -04:00
Bridger Maxwell
d8b596148c Removed some accidental typing from gradebook.html
--HG--
branch : bridger-grades
2012-03-14 18:09:40 -04:00
Bridger Maxwell
a1f630470f Merged in default branch. Gradebook is now graphs with standard header/footer
--HG--
branch : bridger-grades
2012-03-14 18:03:46 -04:00
Kyle Fiedler
98a4b48e3d Merged css 2012-03-14 17:43:20 -04:00