oweals/karmaworld.git
11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Thu, 21 Mar 2013 18:29:23 +0000 (14:29 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoremoving remnants of server-side filtering, including school_name field from Course...
Charles Holbrow [Thu, 21 Mar 2013 18:28:36 +0000 (14:28 -0400)]
removing remnants of server-side filtering, including school_name field from Course model

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Thu, 21 Mar 2013 18:19:28 +0000 (14:19 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoupdating more js functionality for adding notes
Seth Woodworth [Thu, 21 Mar 2013 18:15:02 +0000 (14:15 -0400)]
updating more js functionality for adding notes

11 years agoprint errors on invalid forms?
Seth Woodworth [Thu, 21 Mar 2013 18:14:29 +0000 (14:14 -0400)]
print errors on invalid forms?

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Thu, 21 Mar 2013 16:54:50 +0000 (12:54 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoadding js script to detect arrival at course-detail page with #add-note fragment
Charles Holbrow [Thu, 21 Mar 2013 16:54:36 +0000 (12:54 -0400)]
adding js script to detect arrival at course-detail page with #add-note fragment

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Thu, 21 Mar 2013 16:46:48 +0000 (12:46 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoupdate lightboxupload javascript to work with new add-note partial
Seth Woodworth [Thu, 21 Mar 2013 16:46:03 +0000 (12:46 -0400)]
update lightboxupload javascript to work with new add-note partial

11 years agoadd style for add-note partial
Seth Woodworth [Thu, 21 Mar 2013 16:45:28 +0000 (12:45 -0400)]
add style for add-note partial

11 years agoimprove add-note partial layout
Seth Woodworth [Thu, 21 Mar 2013 16:45:07 +0000 (12:45 -0400)]
improve add-note partial layout

11 years agoadd TODO comment for NoteForm in view handling of invalid forms
Seth Woodworth [Thu, 21 Mar 2013 16:44:46 +0000 (12:44 -0400)]
add TODO comment for NoteForm in view handling of invalid forms

11 years agostyling upload button on course_list - turns orange on :hover instead of drawing...
Charles Holbrow [Wed, 20 Mar 2013 22:03:55 +0000 (18:03 -0400)]
styling upload button on course_list - turns orange on :hover instead of drawing border

11 years agorepositioning upload button, moving next, previous page links for dataTables to the...
Charles Holbrow [Wed, 20 Mar 2013 21:15:41 +0000 (17:15 -0400)]
repositioning upload button, moving next, previous page links for dataTables to the center

11 years agopointing the upload icon to <course-url>#add-note
Charles Holbrow [Wed, 20 Mar 2013 20:38:49 +0000 (16:38 -0400)]
pointing the upload icon to <course-url>#add-note

11 years agoadding upload button. Additional css for course_list
Charles Holbrow [Wed, 20 Mar 2013 20:24:05 +0000 (16:24 -0400)]
adding upload button. Additional css for course_list

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Wed, 20 Mar 2013 03:27:58 +0000 (23:27 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agofixing illegal font css shorthand for search bar
Charles Holbrow [Wed, 20 Mar 2013 03:27:51 +0000 (23:27 -0400)]
fixing illegal font css shorthand for search bar

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Wed, 20 Mar 2013 02:39:26 +0000 (22:39 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoadding Note.year for Academic year, not tested, status checkin, writing functionality...
Seth Woodworth [Wed, 20 Mar 2013 02:39:06 +0000 (22:39 -0400)]
adding Note.year for Academic year, not tested, status checkin, writing functionality to test now

11 years agomade new add-note-form and connected buttons to it, and rewrote css to match
Seth Woodworth [Wed, 20 Mar 2013 02:38:25 +0000 (22:38 -0400)]
made new add-note-form and connected buttons to it, and rewrote css to match

11 years agousing css instead of hard spaces to move the placeholder text to the right
Charles Holbrow [Wed, 20 Mar 2013 00:56:50 +0000 (20:56 -0400)]
using css instead of hard spaces to move the placeholder text to the right

11 years agoadding search icon to search bar
Charles Holbrow [Tue, 19 Mar 2013 20:36:39 +0000 (16:36 -0400)]
adding search icon to search bar

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Tue, 19 Mar 2013 17:01:41 +0000 (13:01 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoAdding support for FIltering by Date with the "Updated On" prefix. Also, re-formattin...
Charles Holbrow [Tue, 19 Mar 2013 17:01:29 +0000 (13:01 -0400)]
Adding support for FIltering by Date with the "Updated On" prefix. Also, re-formatting the date to match Nicks spec

11 years agotweak frontpage styling to match design
Seth Woodworth [Tue, 19 Mar 2013 01:06:32 +0000 (21:06 -0400)]
tweak frontpage styling to match design

11 years agofix search placeholder styling
Seth Woodworth [Tue, 19 Mar 2013 01:05:50 +0000 (21:05 -0400)]
fix search placeholder styling

11 years agoadding files noun from -- Pieter J. Smits, from The Noun Project
Seth Woodworth [Tue, 19 Mar 2013 00:21:02 +0000 (20:21 -0400)]
adding files noun from -- Pieter J. Smits, from The Noun Project

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Tue, 19 Mar 2013 00:03:20 +0000 (20:03 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agorenaming some css selectors for clarity and standarizing some spaces
Seth Woodworth [Tue, 19 Mar 2013 00:03:07 +0000 (20:03 -0400)]
renaming some css selectors for clarity and standarizing some spaces

11 years agofixing bug for list display -- sort by note count now working
Charles Holbrow [Mon, 18 Mar 2013 22:57:58 +0000 (18:57 -0400)]
fixing bug for list display -- sort by note count now working

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Mon, 18 Mar 2013 21:43:15 +0000 (17:43 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoappend "Notes" label to note count in tablesorter
Charles Holbrow [Mon, 18 Mar 2013 21:43:08 +0000 (17:43 -0400)]
append "Notes" label to note count in tablesorter

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Mon, 18 Mar 2013 21:32:39 +0000 (17:32 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

Conflicts:
karmaworld/assets/css/global.css

11 years ago90% done with note list styling
Seth Woodworth [Mon, 18 Mar 2013 21:31:04 +0000 (17:31 -0400)]
90% done with note list styling

11 years agoremove HOME from header
Seth Woodworth [Mon, 18 Mar 2013 21:30:38 +0000 (17:30 -0400)]
remove HOME from header

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Mon, 18 Mar 2013 20:51:17 +0000 (16:51 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoconverging on Nicks styling for course list
Charles Holbrow [Mon, 18 Mar 2013 20:51:03 +0000 (16:51 -0400)]
converging on Nicks styling for course list

11 years agoadding management command to strip existing Note.html into raw note.text for previews...
Seth Woodworth [Mon, 18 Mar 2013 20:39:12 +0000 (16:39 -0400)]
adding management command to strip existing Note.html into raw note.text for previews and search

11 years agoinclude font-awesome from cdn and restyle upload button
Seth Woodworth [Mon, 18 Mar 2013 17:19:44 +0000 (13:19 -0400)]
include font-awesome from cdn and restyle upload button

11 years agoMerge pull request #100 from LucianU/master
Seth Woodworth [Mon, 18 Mar 2013 16:48:49 +0000 (09:48 -0700)]
Merge pull request #100 from LucianU/master

All the work on the fabric tasks

11 years agocourse_detail a little more clean
Seth Woodworth [Mon, 18 Mar 2013 16:48:06 +0000 (12:48 -0400)]
course_detail a little more clean

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Mon, 18 Mar 2013 15:35:06 +0000 (11:35 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoadding rope to gitignore
Seth Woodworth [Mon, 18 Mar 2013 15:34:53 +0000 (11:34 -0400)]
adding rope to gitignore

11 years agoadding mroe to gitingore
Seth Woodworth [Mon, 18 Mar 2013 15:34:03 +0000 (11:34 -0400)]
adding mroe to gitingore

11 years agorestyling course page (note index)
Seth Woodworth [Mon, 18 Mar 2013 15:33:27 +0000 (11:33 -0400)]
restyling course page (note index)

11 years agoin progress global restyle
Seth Woodworth [Mon, 18 Mar 2013 15:32:43 +0000 (11:32 -0400)]
in progress global restyle

11 years agostyle fixes
Charles Holbrow [Thu, 14 Mar 2013 23:06:13 +0000 (19:06 -0400)]
style fixes

11 years agoworking on Nick\'s style on the main page
Charles Holbrow [Thu, 14 Mar 2013 17:45:22 +0000 (13:45 -0400)]
working on Nick\'s style on the main page

11 years agocourse add lightbox now dismisses correctly #95
Charles Holbrow [Thu, 14 Mar 2013 15:12:40 +0000 (11:12 -0400)]
course add lightbox now dismisses correctly #95

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Thu, 14 Mar 2013 14:42:59 +0000 (10:42 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoAdded Install instructions to the README. 100/head
Lucian Ursu [Fri, 8 Mar 2013 13:04:39 +0000 (15:04 +0200)]
Added Install instructions to the README.

11 years agoMade deployment work on local machines.
Lucian Ursu [Fri, 8 Mar 2013 13:04:10 +0000 (15:04 +0200)]
Made deployment work on local machines.

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Wed, 6 Mar 2013 23:15:20 +0000 (18:15 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoadd function so a course can return self.updated_at as a formatted string
Seth Woodworth [Wed, 6 Mar 2013 23:15:03 +0000 (18:15 -0500)]
add function so a course can return self.updated_at as a formatted string

11 years agospecify number of results in a course List page
Charles Holbrow [Fri, 1 Mar 2013 18:51:06 +0000 (13:51 -0500)]
specify number of results in a course List page

11 years agocourse list styling
Charles Holbrow [Fri, 1 Mar 2013 18:27:25 +0000 (13:27 -0500)]
course list styling

11 years agocourse list and and filter styling
Charles Holbrow [Fri, 1 Mar 2013 18:25:33 +0000 (13:25 -0500)]
course list and and filter styling

11 years agoremoving page length drop down selector on course_list, back to client side sorting
Charles Holbrow [Fri, 1 Mar 2013 17:01:24 +0000 (12:01 -0500)]
removing page length drop down selector on course_list, back to client side sorting

11 years agoAdded another task that handles the first deploy.
Lucian Ursu [Thu, 28 Feb 2013 19:27:32 +0000 (21:27 +0200)]
Added another task that handles the first deploy.

11 years agoChanged the deploy task to only deploy new changes and not handle initial setup.
Lucian Ursu [Thu, 28 Feb 2013 19:25:13 +0000 (21:25 +0200)]
Changed the deploy task to only deploy new changes and not handle initial setup.

11 years agoRenamed and fixed a task and added more tasks, all related to supervisor.
Lucian Ursu [Thu, 28 Feb 2013 18:46:31 +0000 (20:46 +0200)]
Renamed and fixed a task and added more tasks, all related to supervisor.

11 years agoSmall adjustments to the way celeryd and celerybeat are started.
Lucian Ursu [Thu, 28 Feb 2013 18:24:25 +0000 (20:24 +0200)]
Small adjustments to the way celeryd and celerybeat are started.

11 years agoFixed typos in config files.
Lucian Ursu [Thu, 28 Feb 2013 18:23:10 +0000 (20:23 +0200)]
Fixed typos in config files.

11 years agoUpgraded Fabric version.
Lucian Ursu [Thu, 28 Feb 2013 16:36:31 +0000 (18:36 +0200)]
Upgraded Fabric version.

11 years agoFixed supervisor version in requirements file.
Lucian Ursu [Thu, 28 Feb 2013 15:58:58 +0000 (17:58 +0200)]
Fixed supervisor version in requirements file.

11 years agoAdding redundant school_name field to courses to enable faster server side filtering...
Charles Holbrow [Wed, 27 Feb 2013 23:58:38 +0000 (18:58 -0500)]
Adding redundant school_name field to courses to enable faster server side filtering. requires: for c in Course.objects.all(): c.save()

11 years agoFiltering on the server side
Charles Holbrow [Wed, 27 Feb 2013 23:23:48 +0000 (18:23 -0500)]
Filtering on the server side

11 years agoinitial broken serverside datatables config
Seth Woodworth [Wed, 27 Feb 2013 19:38:11 +0000 (14:38 -0500)]
initial broken serverside datatables config

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Wed, 27 Feb 2013 18:23:03 +0000 (13:23 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoadding sublime text project to .gitignore
Charles Holbrow [Wed, 27 Feb 2013 18:22:57 +0000 (13:22 -0500)]
adding sublime text project to .gitignore

11 years ago Fixed missing {
bobcall [Wed, 27 Feb 2013 17:29:18 +0000 (12:29 -0500)]
 Fixed missing {

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
bobcall [Wed, 27 Feb 2013 17:26:21 +0000 (12:26 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agoAdded Bup-DB script
bobcall [Wed, 27 Feb 2013 17:26:02 +0000 (12:26 -0500)]
Added Bup-DB script

11 years agoSetting Column Widths in tablesorter
Charles Holbrow [Fri, 22 Feb 2013 20:29:18 +0000 (15:29 -0500)]
Setting Column Widths in tablesorter

11 years agoAdded tasks to manage the gunicorn process. Fixes #86.
Lucian Ursu [Fri, 22 Feb 2013 15:36:14 +0000 (17:36 +0200)]
Added tasks to manage the gunicorn process. Fixes #86.

11 years agoUsing a single, more general function to manage supervisor-managed processes.
Lucian Ursu [Fri, 22 Feb 2013 15:30:07 +0000 (17:30 +0200)]
Using a single, more general function to manage supervisor-managed processes.

11 years agoAdded Fabric tasks for celeryd. Fixes #87.
Lucian Ursu [Fri, 22 Feb 2013 15:23:06 +0000 (17:23 +0200)]
Added Fabric tasks for celeryd. Fixes #87.

11 years agoUpdated the 'update_code' task to also checkout the right branch.
Lucian Ursu [Fri, 22 Feb 2013 15:13:50 +0000 (17:13 +0200)]
Updated the 'update_code' task to also checkout the right branch.

11 years agoAlso specifying the branch in the environment-related tasks.
Lucian Ursu [Fri, 22 Feb 2013 15:11:39 +0000 (17:11 +0200)]
Also specifying the branch in the environment-related tasks.

11 years agoSpecifying the path to the conf files in the environment-related tasks.
Lucian Ursu [Fri, 22 Feb 2013 15:03:05 +0000 (17:03 +0200)]
Specifying the path to the conf files in the environment-related tasks.

11 years agoSplit the static files management into several tasks.
Lucian Ursu [Fri, 22 Feb 2013 14:35:37 +0000 (16:35 +0200)]
Split the static files management into several tasks.

11 years agoAdded a 'here' task which runs commands locally. Specifying the 'run' function as...
Lucian Ursu [Fri, 22 Feb 2013 13:59:21 +0000 (15:59 +0200)]
Added a 'here' task which runs commands locally. Specifying the 'run' function as an env var to achieve that. Also specifying the reqs file in env.

11 years agoRemoved the env.run variable, because it's not needed.
Lucian Ursu [Fri, 22 Feb 2013 13:41:09 +0000 (15:41 +0200)]
Removed the env.run variable, because it's not needed.

11 years agoUsing a single task to sync the db and run migrations.
Lucian Ursu [Fri, 22 Feb 2013 13:38:46 +0000 (15:38 +0200)]
Using a single task to sync the db and run migrations.

11 years agoAdded the 'task' decorator to some functions that are tasks.
Lucian Ursu [Fri, 22 Feb 2013 13:30:24 +0000 (15:30 +0200)]
Added the 'task' decorator to some functions that are tasks.

11 years agoRemoved unused command from fabfile.
Lucian Ursu [Fri, 22 Feb 2013 13:24:13 +0000 (15:24 +0200)]
Removed unused command from fabfile.

11 years agoAdded supervisor to requirements.
Lucian Ursu [Thu, 21 Feb 2013 15:23:52 +0000 (17:23 +0200)]
Added supervisor to requirements.

11 years agoRemoved gunicorn.py.ini, because it's not needed anymore.
Lucian Ursu [Thu, 21 Feb 2013 14:54:54 +0000 (16:54 +0200)]
Removed gunicorn.py.ini, because it's not needed anymore.

11 years agoAdded conf files for gunicorn and supervisord for production and staging.
Lucian Ursu [Thu, 21 Feb 2013 14:53:49 +0000 (16:53 +0200)]
Added conf files for gunicorn and supervisord for production and staging.

11 years agoAdded a 'var' directory to keep transient information.
Lucian Ursu [Thu, 21 Feb 2013 14:40:29 +0000 (16:40 +0200)]
Added a 'var' directory to keep transient information.

11 years agoremoving tablesorter css jpg and img in favor of DataTabeles
Charles Holbrow [Wed, 20 Feb 2013 20:30:35 +0000 (15:30 -0500)]
removing tablesorter css jpg and img in favor of DataTabeles

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Wed, 20 Feb 2013 20:06:34 +0000 (15:06 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agomodifying css and image links to support our altered folder structure
Charles Holbrow [Wed, 20 Feb 2013 19:58:29 +0000 (14:58 -0500)]
modifying css and image links to support our altered folder structure

11 years agoadding datatables files
Charles Holbrow [Wed, 20 Feb 2013 19:34:14 +0000 (14:34 -0500)]
adding datatables files

11 years agoMerge remote-tracking branch 'origin/test'
Seth Woodworth [Tue, 19 Feb 2013 21:11:20 +0000 (16:11 -0500)]
Merge remote-tracking branch 'origin/test'

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Charles Holbrow [Tue, 19 Feb 2013 18:23:54 +0000 (13:23 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agotablesorter options #83
Charles Holbrow [Tue, 19 Feb 2013 18:23:49 +0000 (13:23 -0500)]
tablesorter options #83

11 years agoPushed some of the newer os-install docs (still merging 2 copies)
bobcall [Tue, 19 Feb 2013 15:31:24 +0000 (10:31 -0500)]
Pushed some of the newer os-install docs (still merging 2 copies)

11 years agoadding first batch of tests for notes.models
Seth Woodworth [Wed, 13 Feb 2013 19:23:23 +0000 (14:23 -0500)]
adding first batch of tests for notes.models