Kyle Fiedler
|
1b2439c4a4
|
Added more styles for the askbot sidebar
--HG--
branch : kf-sidebar
|
2012-02-21 16:05:27 -05:00 |
|
Bridger Maxwell
|
0342a65054
|
Merged in bug fix and Reda's changes
|
2012-02-21 15:24:39 -05:00 |
|
David Ormsbee
|
7e79e9f34a
|
emergency move of askbot settings back into settings.py so staging doesn't blow up
|
2012-02-21 15:09:45 -05:00 |
|
Kyle Fiedler
|
182dc1a66f
|
fixed conflicts
--HG--
branch : kf-sidebar
|
2012-02-21 15:01:00 -05:00 |
|
Reda Lemeden
|
4838ab1ba8
|
Changed visual style of titles and filters
--HG--
branch : bridger-dev
|
2012-02-21 14:54:30 -05:00 |
|
David Ormsbee
|
2a5ba5d0c7
|
Force askbot config to draw all config values from askbotsettings.py, and not hit the database
|
2012-02-21 14:43:05 -05:00 |
|
Kyle Fiedler
|
5404e1228a
|
added styles for other headers inthe sidebars
--HG--
branch : kf-sidebar
|
2012-02-21 14:25:59 -05:00 |
|
Kyle Fiedler
|
ccc3c710b3
|
Added consistant sidebar headers and made textbook sidebar close
--HG--
branch : kf-sidebar
|
2012-02-21 13:08:35 -05:00 |
|
Reda Lemeden
|
76f98a17c8
|
Added autocomplete styles and removed commenting limit in Askbot
--HG--
branch : bridger-dev
|
2012-02-21 10:59:42 -05:00 |
|
Bridger Maxwell
|
2be705ca01
|
Fixed bug where wiki warned users even as they saved their changes.
--HG--
branch : bridger-dev
|
2012-02-20 21:59:26 -05:00 |
|
Bridger Maxwell
|
b923b59fc4
|
Merge
--HG--
branch : bridger-dev
|
2012-02-20 21:58:40 -05:00 |
|
Piotr Mitros
|
cdaed49a2b
|
Subtitle support working
--HG--
branch : pmitros-subtitles
|
2012-02-20 20:59:02 -05:00 |
|
Piotr Mitros
|
024da20b48
|
Subtitle support working
--HG--
branch : pmitros-subtitles
|
2012-02-20 20:58:47 -05:00 |
|
Kyle Fiedler
|
36005b0056
|
Added style for askbot-profile
|
2012-02-20 17:25:19 -05:00 |
|
Kyle Fiedler
|
3ce8557309
|
Merged heads
|
2012-02-20 17:24:56 -05:00 |
|
Kyle Fiedler
|
0e2216932a
|
Added more style for askbot profile page
|
2012-02-20 17:24:20 -05:00 |
|
Reda Lemeden
|
a75ba51c46
|
Merged and resolved conflicts
|
2012-02-20 17:14:57 -05:00 |
|
Reda Lemeden
|
6c9540fe4e
|
Minor styles changes and visual fixes to various parts of the app
|
2012-02-20 17:09:36 -05:00 |
|
Piotr Mitros
|
2416587c19
|
Minor cleanup
--HG--
branch : pmitros-section
|
2012-02-20 16:47:53 -05:00 |
|
Piotr Mitros
|
f83c492720
|
per-section rendering works, if unclean
--HG--
branch : pmitros-section
|
2012-02-20 16:35:12 -05:00 |
|
Piotr Mitros
|
086523e0fa
|
Bug in urls file
|
2012-02-20 16:10:55 -05:00 |
|
Piotr Mitros
|
9812fda559
|
Minor bug when restarting server with custom tags
This patch has limited testing w.r.t. whether the bug is completely
gone, but it appears to have no negative side effects, and fix at
least one case.
|
2012-02-20 15:46:31 -05:00 |
|
Kyle Fiedler
|
e844a6f006
|
Added styles for the profile page in askbot
|
2012-02-20 15:25:34 -05:00 |
|
Kyle Fiedler
|
02174ff62e
|
Merged heads
|
2012-02-20 15:24:54 -05:00 |
|
Kyle Fiedler
|
576643da7e
|
Added base styles for the askbot profile page
|
2012-02-20 15:24:35 -05:00 |
|
Reda Lemeden
|
b2d0b9b621
|
Merge with Head
|
2012-02-20 14:29:26 -05:00 |
|
Reda Lemeden
|
01ab182a8e
|
Fixed bugs in the answer and question editing forms
|
2012-02-20 14:28:30 -05:00 |
|
Piotr Mitros
|
c94d68683e
|
Merge
|
2012-02-20 13:26:39 -05:00 |
|
Piotr Mitros
|
0b3c9dc975
|
Integrate with mod-template (custom tags dir)
|
2012-02-20 13:25:34 -05:00 |
|
Piotr Mitros
|
349230c1fa
|
Merge with capa fixed
|
2012-02-20 13:24:33 -05:00 |
|
Piotr Mitros
|
0888eed906
|
Post-merge cleanup
|
2012-02-20 13:06:13 -05:00 |
|
Piotr Mitros
|
34affdabde
|
Merge with new settings
--HG--
rename : settings_new_askbot.py => settings.py
|
2012-02-20 12:14:48 -05:00 |
|
Piotr Mitros
|
8dec0aa7cd
|
Merging with fixes to Capa
|
2012-02-20 12:06:19 -05:00 |
|
Piotr Mitros
|
c16ac4fb4e
|
Merge with local template paths
|
2012-02-20 12:03:59 -05:00 |
|
Reda Lemeden
|
f6434f906c
|
Merge with Head
|
2012-02-20 11:38:20 -05:00 |
|
Reda Lemeden
|
b8dcbaf36c
|
Fixed visual bugs on the main question list + restyled author info in answer view
|
2012-02-20 11:37:39 -05:00 |
|
Piotr Mitros
|
7bd509b7ed
|
Beginning to merge new settings file
--HG--
branch : pmitros-dormsbee-settings2
rename : settings_new_askbot.py => settings.py
|
2012-02-20 11:29:12 -05:00 |
|
Kyle Fiedler
|
93c50f0aeb
|
Added styles for the bottom navigation on the textbook:
|
2012-02-20 11:19:37 -05:00 |
|
Kyle Fiedler
|
bf632da06f
|
Add textbook nav on the bottom of the page too
|
2012-02-20 11:18:58 -05:00 |
|
Kyle Fiedler
|
d83a4d22f3
|
Added messaging for users with javascript diabled
|
2012-02-20 10:51:39 -05:00 |
|
Kyle Fiedler
|
48a3133714
|
merged heads
|
2012-02-20 10:44:07 -05:00 |
|
Kyle Fiedler
|
db9ca0772f
|
Fix ie enrollment issues by hiding form
|
2012-02-20 10:43:46 -05:00 |
|
Kyle Fiedler
|
c7e72c28e0
|
merged heads
|
2012-02-20 09:54:13 -05:00 |
|
Kyle Fiedler
|
c423e17cc3
|
Added style to remove enrollment form for IE7 and below and added a paragraph explainaing why
|
2012-02-20 09:53:40 -05:00 |
|
Piotr Mitros
|
e57fc19045
|
Including namespace for sections
--HG--
branch : pmitros-mod-template
|
2012-02-20 07:16:22 -05:00 |
|
Piotr Mitros
|
2501b58305
|
Removed unnecessary symlinks. WARNING: Must update and push data before deploying
--HG--
branch : pmitros-mod-template
|
2012-02-20 07:13:16 -05:00 |
|
Piotr Mitros
|
47b0ca5564
|
Merge
--HG--
branch : pmitros-mod-template
|
2012-02-20 07:11:05 -05:00 |
|
Piotr Mitros
|
1befa20b12
|
Last commit tested and debugged
--HG--
branch : pmitros-mod-template
|
2012-02-20 07:08:22 -05:00 |
|
Piotr Mitros
|
0d9a24e4f4
|
Templates broken into namespaces
--HG--
branch : pmitros-mod-template
|
2012-02-19 20:12:34 -05:00 |
|
Piotr Mitros
|
5fe68e3a43
|
Merge to default for next developments
--HG--
branch : pmitros-mod-template
|
2012-02-19 19:34:36 -05:00 |
|