7659223d40
Revert "Revert "Merge pull request #843 from rtfd/merge-1.6""
...
This reverts commit 3545214c3f
2014-07-31 14:41:47 -07:00
3545214c3f
Revert "Merge pull request #843 from rtfd/merge-1.6"
...
This reverts commit c9602934fce67465175d
2014-07-31 14:39:01 -07:00
2efa00bb47
Merge branch 'allauth' into merge-py3-django16
...
Conflicts:
pip_requirements.txt
readthedocs/templates/core/header.html
readthedocs/templates/core/home-header.html
readthedocs/templates/registration/activate.html
readthedocs/templates/registration/activation_complete.html
readthedocs/templates/registration/activation_email.txt
readthedocs/templates/registration/logout.html
readthedocs/templates/registration/password_reset_email.html
readthedocs/templates/registration/registration_closed.html
readthedocs/urls.py
2014-06-14 13:07:21 -07:00
1442d58305
Merge branch '1.6-compat' into merge-py3-django16
...
Conflicts:
pip_requirements.txt
readthedocs/projects/models.py
readthedocs/restapi/urls.py
readthedocs/settings/base.py
readthedocs/templates/core/project_bar.html
readthedocs/templates/projects/project_edit_base.html
2014-06-01 19:28:21 -07:00
fd5197493e
Update settings and title.
2014-06-01 18:23:59 -07:00
c15c8d95f2
Move language changer lower in UI.
2014-01-17 15:15:58 +07:00
72d953be48
Show current lang in UI, and add URL properly
2014-01-17 15:13:37 +07:00
5cd5260c0b
Add a language picker to the footer.
2014-01-17 15:07:32 +07:00
a387190cc6
Avoid HTTPS redirect on github.com
2014-01-06 21:31:27 +01:00
d350e2de1f
Revert "Fix url tags"
...
This reverts commit 3a1e454fde
2013-11-24 11:41:51 -08:00
3a1e454fde
Fix url tags
2013-11-23 21:24:28 -08:00
4c87a033cf
Fix lots of small things
2013-11-23 20:36:33 -08:00
f8d2ec54f4
Try and trim size correctly
2013-10-24 14:56:12 -07:00
05c3573cd9
Fix code bits
2013-10-24 14:39:28 -07:00
3784a69442
Upgrading to Jquery 2.0.3 / adding cdn
2013-09-28 11:03:48 -07:00
9bf83532fc
Small style fix.
2013-08-01 19:34:30 -07:00
ac4da98c54
Update footer copyright.
...
The project has gotten a fair amount of work since 2010 (from some 66 different
people!), so update the footer to reflect that. We don't want people to think
rtfd is dead!
2013-07-31 23:14:04 -07:00
6743a3f70c
Fix typo in notification
...
While waiting for docs to be built, users receive a notication that should read
'Your docs,' not 'You docs.' The typo is being fixed in both the template and
the translation files.
It appears that there was also some trailing whitespace in the translation
files. Trimming it should be a trivial change.
2012-12-31 10:04:31 +01:00
9053d057ab
Use a local copy of jquery.
2012-12-17 23:49:11 -08:00
5b3f6b059d
add button (with dropdown options). apply to project_list_detailed.
2012-12-17 20:12:41 -08:00
38a1ecb2ba
bump jquery to 1.8
2012-12-14 11:31:22 -08:00
3c29b29a79
Lots of template rejiggering.
...
Things properly highlight now when they are selected in the UI.
This also standardized the UI of the Admin page and the project detail page.
2012-12-06 19:39:31 -08:00
fd8dde21b3
Add branding in a block in the base template.
...
This lets folks who are running a local install call it something else.
2012-11-29 10:31:17 -08:00
3a3bf40282
Kill en from template
2012-10-13 16:56:49 -07:00
a129260dff
Avoid unneeded whitespace in localizable texts.
2012-10-05 22:39:04 +02:00
186f315608
Fixed the mistakes pointed out by @julen
2012-10-03 22:53:10 +02:00
b9ee0bc49e
Merge branch 'master' of https://github.com/rtfd/readthedocs.org into static-i18n
...
Conflicts:
readthedocs/templates/core/project_details.html
2012-10-03 11:49:57 +02:00
f6420bac35
Rewrite rtd.js.
...
There was a mix of code that was used both for the site and for the
Sphinx theme:
- Site's code was only affecting the import page, so now it's included
only there.
- Sphinx theme's code has been placed in its own location too, and
variables are populated as if they were within a Jinja template
(notice the _t ending in the extension).
All the code has been largely rewritten as well, in order to avoid
using/poluting the global namespace.
2012-09-27 21:11:55 +02:00
f3e74a873a
fixed extend nodes
2012-09-27 17:38:37 +02:00
2ca281a58c
Merge git://github.com/macagua/readthedocs.org into static-i18n
...
Conflicts:
readthedocs/api/base.py
readthedocs/core/forms.py
readthedocs/core/management/commands/build_files.py
readthedocs/core/management/commands/sync_builds.py
readthedocs/core/management/commands/update_repos.py
readthedocs/core/management/commands/whitelist_users.py
readthedocs/projects/models.py
readthedocs/settings/base.py
readthedocs/templates/base.html
readthedocs/templates/builds/build_detail.html
readthedocs/templates/core/build_list_detailed.html
readthedocs/templates/core/project_bar.html
readthedocs/templates/core/project_details.html
readthedocs/templates/core/project_list_detailed.html
readthedocs/templates/projects/project_dashboard.html
readthedocs/templates/projects/project_import.html
readthedocs/templates/search/base_facet.html
readthedocs/templates/search/base_search.html
readthedocs/templates/search/faceted_project.html
2012-09-27 12:08:08 +02:00
51bf150fd5
Add thanks to enn.io for the SSL certs
2012-09-26 15:48:20 -07:00
294ffa8bff
Link to contributors/gittip in the footer too.
2012-09-21 08:23:23 -07:00
7c3af49895
More touchup of the homepage/footer
2012-09-21 08:19:49 -07:00
2e1d17c5e6
Update to use the RTD typekit account.
2012-07-29 14:17:08 -07:00
211531a7cb
Use typekit over ssl as well.
2012-06-11 20:01:20 -07:00
ca1d240b02
Fix google URLs as well.
2012-06-11 19:57:26 -07:00
36aa476726
Fix template typo.
2012-05-23 10:37:27 -07:00
dd470f54c8
Issue 164: AJAXify the build list and build detail pages
2012-04-01 20:49:58 -07:00
03d583f8c3
Fancify.
2012-03-30 20:49:00 -07:00
82e7b1993c
Made by humans.
2012-03-30 20:47:19 -07:00
30f742d600
Move scripts back to the top of the page to get rid of flicker on page load.
2012-03-28 15:40:19 -07:00
0b2de2e02e
remove the The's so it fits on 1 line.
2012-03-26 14:36:05 -07:00
e06393d365
Add DSF to sponsor footer as well.
2012-03-26 14:30:22 -07:00
1174cc2015
Add Lab305 to the footer.
2012-03-26 14:28:31 -07:00
19e4b90083
Add instantsearch.js into just the search pages.
...
Hopefully this will fix the flash on page load on RTD
2012-03-22 20:42:55 -07:00
1140a60697
Move javascript to near end of html for faster page loading; esp. external resource (e.g. typekit)
2012-03-15 16:13:00 -04:00
0edfdaf140
Added instant search!
2012-03-12 21:00:03 -07:00
29d3f3af12
Updates from upstream repo some i18n definitions
2012-01-12 11:31:37 -04:30
d21e880da2
Added a basic front-end for adding subprojects.
2011-10-16 19:11:12 -07:00
a84320e102
first version for i18n support and spanish translation
2011-07-25 13:03:49 -04:30
Eric Holscher
Anthony Johnson
Stein Magnus Jodal
David Adam Justice
xiongchiamiov
Andy Dirnberger
Chris Dickinson
Julen Ruiz Aizpuru
Jonas Obrist
Andrew Brookins
Craig Nagy
Mark Parncutt
Leonardo J .Caballero G