scratchfoundation/s2forums
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
501 commits 8 branches 0 tags 3.4 MiB
Commit graph

501 commits

This branch
This branch
All branches
Author SHA1 Message Date
Chinua Shaw
dd3683a83f This is now where settings for the djangobb_forums that are specific to us will go. 2012-10-15 10:52:16 -04:00
Chinua Shaw
4bc48b88ab better way to remove usertitle 2012-10-15 08:48:30 -04:00
Chinua Shaw
aaab6a8ed1 the hacky change to pull avatars from the scratch website. 2012-10-15 08:46:47 -04:00
Chinua Shaw
da46e48a8e completeness of profile menu option. 2012-10-15 08:20:40 -04:00
Chinua Shaw
ad39cdc10d Merge branch 'master' of https://github.com/lightnin/DjangoBB 2012-10-15 08:08:38 -04:00
Chinua Shaw
d61aaea2ae Made showing anything other than sig optional. 2012-10-15 08:07:19 -04:00
Amos Blanton
4966cfdbb0 Add readme. 2012-10-04 13:51:48 -04:00
Chinua Shaw
f7afc6772e attempt to make it notice change 2012-10-04 13:21:15 -04:00
Chinua Shaw
6952e51566 silly error 2012-10-04 13:15:50 -04:00
Chinua Shaw
1286df2d7d Merge branch 'master' of https://github.com/lightnin/DjangoBB 2012-10-04 13:10:20 -04:00
Chinua Shaw
9f01e0337c Fixes some theme issues resulting from the scratch theme not being copied over yet. 2012-10-04 13:09:28 -04:00
Amos Blanton
ce5ba252d1 Fix javascript error dialog box by adding slash. 2012-10-02 11:31:16 -04:00
Chinua Shaw
c7a16dfb8e for some reason a slash was dropped by the line I deleted. This should make it consistant. 2012-10-01 16:01:42 -04:00
Chinua Shaw
0924138144 Reintegrated templates to match Scratchr theme. Main changes were extending base.html, switching class="inbox" to class="inbox box-content", giving submit buttonsclass="small grey button" 2012-10-01 11:20:59 -04:00
Edward "Hades" Toroshchin
e29073695b Handle error in sending an email to a user. 2012-08-30 23:35:09 +02:00
Edward "Hades" Toroshchin
526a3b35d3 Fix UnicodeError in email sending. 2012-08-30 23:33:19 +02:00
slav0nic
c1d5211751 fix #255: add author field to rss; fix path in makefile 2012-08-30 11:27:45 +03:00
JensDiemer
c67ed01f3b add poll feature ref #13 as squash commit see also http://support.djangobb.org/topic/333/ (This is a combination of 9 commits.) 2012-08-10 11:12:52 +03:00
JensDiemer
725fecaedf disable logging 2012-08-08 16:03:01 +03:00
JensDiemer
1540c52880 * reimplement nick name copy&paste * use $("#id_body").focus(); to scroll down * bugfix for logging (IE) 2012-08-08 16:03:01 +03:00
JensDiemer
221d8d6609 disable "delete_selected" admin action only for DjangoBB models and not globaly. 2012-08-08 13:03:28 +03:00
JensDiemer
48ed192424 * Bugfix for double results in "show own posts" * Don't put user_id in GET -> use request.user * remove {% if results %} with {% for %}...{% empty %} * Refactor search() 
Fixed topic search results which returned nothing.
Return a list instead of a generator in TopicFromPostResult.__getitem__() so that the pagination can work correctly.
from: https://bitbucket.org/hsoft/djangobb/changeset/1b2f31c54c516c699a7b11a1d43b170742157df5

use the slow, but correct solution for display the result as topics

used fast solution with a work-a-round for double topics

respect sort order

count only one time

better solution, but slow with woosh and many hits

change info

make it DRY

remove debug imports

remove not needed tuple()

* add "show your topics/posts" search
* add link to switch between topics/posts search
* merge {% block controls %}
* make search_posts.html useable with queryset and SearchQuerySet

Add topic <-> post switch links to other type of search, too.

not really in GET needed.

* Use PostSearchForm() in normal search
* add switch links to normal search, too.

better docstring

better text?
 2012-08-08 11:00:28 +03:00
slav0nic
c566df87ed added a missing load 2012-08-07 17:09:38 +03:00
JensDiemer
35bdd7816b add auto subscribe topic feature: http://djangobb.org/ticket/175 
---
 djangobb_forum/forms.py                            |    7 +-
 .../0004_auto__add_field_profile_auto_subscribe.py |  180 ++++++++++++++++++++
 djangobb_forum/models.py                           |    1 +
 .../templates/djangobb_forum/add_post.html         |   35 +---
 .../djangobb_forum/includes/post_form.html         |   38 +++++
 .../djangobb_forum/profile/profile_essentials.html |   10 +-
 djangobb_forum/templates/djangobb_forum/topic.html |   32 +---
 djangobb_forum/views.py                            |   10 +-
 8 files changed, 244 insertions(+), 69 deletions(-)
 create mode 100644 djangobb_forum/migrations/0004_auto__add_field_profile_auto_subscribe.py
 create mode 100644 djangobb_forum/templates/djangobb_forum/includes/post_form.html
 2012-08-07 16:44:16 +03:00
JensDiemer
a6c0eb1ffc * Bugfix: if selection used. * Copy&Paste only the post body and not "meta" lines 
---
 djangobb_forum/static/djangobb_forum/js/markup/bbcode/board.js |    4 ++--
 djangobb_forum/templates/djangobb_forum/topic.html             |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 2012-08-07 16:44:16 +03:00
JensDiemer
18a716d577 use uncompressed jQuery in DEBUG mode for better debugging 
---
 djangobb_forum/context_processors.py              |   15 ++++++++++++---
 djangobb_forum/templates/djangobb_forum/base.html |    6 +++++-
 2 files changed, 17 insertions(+), 4 deletions(-)
 2012-08-07 16:44:16 +03:00
JensDiemer
c28c3d425f merge reply / quote stuff 
---
 .../djangobb_forum/js/markup/bbcode/board.js       |   53 ++++++++++++--------
 djangobb_forum/templates/djangobb_forum/topic.html |   25 +++++----
 2 files changed, 43 insertions(+), 35 deletions(-)
 2012-08-07 16:44:16 +03:00
JensDiemer
f1aa0cbf6f auto code cleanup 
---
 djangobb_forum/templatetags/forum_extras.py |   40 +++++++++++++--------------
 1 file changed, 20 insertions(+), 20 deletions(-)
 2012-08-07 16:44:16 +03:00
JensDiemer
004c4bfb45 remove special template tag with normal template features. maybe it's simpler to put "markup" valiable into contexte! 
---
 djangobb_forum/templates/djangobb_forum/base.html  |   24 ++++++++++++--------
 .../djangobb_forum/includes/markup_editor.html     |    5 ++++
 djangobb_forum/templatetags/forum_extras.py        |   15 ------------
 3 files changed, 19 insertions(+), 25 deletions(-)
 create mode 100644 djangobb_forum/templates/djangobb_forum/includes/markup_editor.html
 2012-08-07 16:44:16 +03:00
JensDiemer
7f88192358 use jquery from django 
---
 djangobb_forum/templates/djangobb_forum/base.html |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 2012-08-07 16:44:16 +03:00
JensDiemer
d57b960401 Add JavaScript info. 
---
 djangobb_forum/templates/djangobb_forum/topic.html |    1 +
 1 file changed, 1 insertion(+)
 2012-08-07 16:44:16 +03:00
JensDiemer
151f94ef92 * Expand the [code XXX]...[/code] list in Maritup * Add a note under the quick post form 
---
 .../djangobb_forum/js/markitup/sets/bbcode/set.js       |   15 ++++++++++++++-
 djangobb_forum/templates/djangobb_forum/topic.html      |    1 +
 2 files changed, 15 insertions(+), 1 deletion(-)
 2012-08-07 16:44:16 +03:00
JensDiemer
b24ee8c74c remove tests 
---
 djangobb_forum/views.py |    6 ------
 1 file changed, 6 deletions(-)
 2012-08-06 11:47:39 +03:00
JensDiemer
f089e88011 Use django.contrib.messages for feedback 
---
 .../static/djangobb_forum/themes/default/style.css |   37 +++++++++++
 djangobb_forum/templates/djangobb_forum/base.html  |   20 +++++-
 djangobb_forum/views.py                            |   64 ++++++++++++++------
 3 files changed, 102 insertions(+), 19 deletions(-)
 2012-08-06 11:47:39 +03:00
slav0nic
eef26f36c4 drop print 2012-08-06 11:21:06 +03:00
slav0nic
e819a22640 drop extra @register.simple_tag 2012-08-03 13:54:45 +03:00
slav0nic
093140c64b gravatar ssl support. tnx marcinn 2012-08-03 13:51:11 +03:00
slav0nic
2590164ee1 add activate.html to basic_project 2012-08-01 11:02:42 +03:00
JensDiemer
b9b232784e [PATCH] see subscribers usernames in TopicAdmin 2012-07-30 10:49:59 +03:00
JensDiemer
69463855d1 add admin class for Attachment model 
---
 djangobb_forum/admin.py |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
 2012-07-30 10:44:50 +03:00
slav0nic
96a16ea0d6 merge with stable (after commit to stable not via default) 2012-06-16 12:50:09 +03:00
slav0nic
b80edde3c0 merge with default 
--HG--
branch : stable
 2012-06-16 12:48:33 +03:00
slav0nic
cb85d892b7 merge 
--HG--
branch : stable
 2012-06-16 12:46:30 +03:00
slav0nic
d7658490b3 reputation: check if post really belong to user 
--HG--
branch : stable
 2012-06-16 12:45:32 +03:00
slav0nic
c6d66aec4e update translations from Transifex 2012-06-07 12:27:24 +03:00
slav0nic
f1fc579732 merge for #182 2012-06-05 11:59:41 +03:00
Alex Buck
6e441f7672 fix #182: do not check access permissions for every searched topic. patch#2 2012-06-05 11:54:31 +03:00
slav0nic
f71ae27b11 fix ExtendedImageField for django > 1.0 2012-05-16 13:05:54 +03:00
slav0nic
dd85f88606 remove delete_avatar (unneeded) 2012-05-16 12:40:37 +03:00
slav0nic
717498a150 merge with default 
--HG--
branch : stable
 2012-05-15 14:28:06 +03:00