Download as
Browse Code »

Commit 5fc33e8862b0dff78e0a27feaeb0980d51510ec9

Authored by Luan
2 parents 711f9da1 cea5c644
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Merge branch 'master' into adding_api

Showing 6 changed files with 98 additions and 16 deletions   Show diff stats
src/accounts/forms.py
  Diff comments   View file @5fc33e8
... ... @@ -62,7 +62,7 @@ class UserUpdateForm(UserForm):
62 62 model = User
63 63 fields = ('first_name', 'last_name',
64 64 'institution', 'role', 'twitter', 'facebook',
65   - 'google_talk', 'identi_ca', 'webpage', 'bio')
  65 + 'google_talk', 'github', 'webpage', 'bio')
66 66  
67 67 twitter = SocialAccountField(url='https://twitter.com/', required=False)
68 68 facebook = SocialAccountField(url='https://graph.facebook.com/', required=False)
... ...
src/accounts/migrations/0010_auto__del_field_user_identi_ca__add_field_user_github.py 0 → 100644
  Diff comments   View file @5fc33e8
... ... @@ -0,0 +1,79 @@
  1 +# -*- coding: utf-8 -*-
  2 +import datetime
  3 +from south.db import db
  4 +from south.v2 import SchemaMigration
  5 +from django.db import models
  6 +
  7 +
  8 +class Migration(SchemaMigration):
  9 +
  10 + def forwards(self, orm):
  11 + # Deleting field 'User.identi_ca'
  12 + db.delete_column(u'accounts_user', 'identi_ca')
  13 +
  14 + # Adding field 'User.github'
  15 + db.add_column(u'accounts_user', 'github',
  16 + self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True),
  17 + keep_default=False)
  18 +
  19 +
  20 + def backwards(self, orm):
  21 + # Adding field 'User.identi_ca'
  22 + db.add_column(u'accounts_user', 'identi_ca',
  23 + self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True),
  24 + keep_default=False)
  25 +
  26 + # Deleting field 'User.github'
  27 + db.delete_column(u'accounts_user', 'github')
  28 +
  29 +
  30 + models = {
  31 + u'accounts.user': {
  32 + 'Meta': {'object_name': 'User'},
  33 + 'bio': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
  34 + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
  35 + 'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
  36 + 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
  37 + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
  38 + 'github': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
  39 + 'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
  40 + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
  41 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  42 + 'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
  43 + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
  44 + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
  45 + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
  46 + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
  47 + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
  48 + 'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
  49 + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
  50 + 'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
  51 + 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
  52 + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
  53 + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
  54 + 'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
  55 + 'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
  56 + },
  57 + u'auth.group': {
  58 + 'Meta': {'object_name': 'Group'},
  59 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  60 + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
  61 + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
  62 + },
  63 + u'auth.permission': {
  64 + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
  65 + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
  66 + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
  67 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  68 + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
  69 + },
  70 + u'contenttypes.contenttype': {
  71 + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
  72 + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
  73 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  74 + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
  75 + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
  76 + }
  77 + }
  78 +
  79 + complete_apps = ['accounts']
0 80 \ No newline at end of file
... ...
src/accounts/models.py
  Diff comments   View file @5fc33e8
... ... @@ -20,8 +20,8 @@ class User(AbstractUser):
20 20 twitter = models.CharField(max_length=128, null=True, blank=True)
21 21 facebook = models.CharField(max_length=128, null=True, blank=True)
22 22 google_talk = models.EmailField(null=True, blank=True)
23   - identi_ca = models.CharField(max_length=128, null=True, blank=True,
24   - verbose_name=u'identi.ca')
  23 + github = models.CharField(max_length=128, null=True, blank=True,
  24 + verbose_name=u'github')
25 25 webpage = models.CharField(max_length=256, null=True, blank=True)
26 26 verification_hash = models.CharField(max_length=32, null=True, blank=True)
27 27 modified = models.DateTimeField(auto_now=True)
... ...
src/accounts/templates/accounts/user_detail.html
  Diff comments   View file @5fc33e8
... ... @@ -69,8 +69,8 @@
69 69 <li><span class="icon-google-plus icon-fixed-width" title="{% trans 'Google talk account' %}"></span> {{ user_.google_talk }}</li>
70 70 {% endif %}
71 71  
72   - {% if user_.identi_ca %}
73   - <li><span class="icon-comments icon-fixed-width" title="{% trans 'Identi.ca account' %}"></span> <a target="_blank" href="https://identi.ca/{{ user_.identi_ca }}">{{ user_.identi_ca }}</a></li>
  72 + {% if user_.github %}
  73 + <li><span class="icon-github icon-fixed-width" title="{% trans 'Github account' %}"></span> <a target="_blank" href="https://github.com/{{ user_.github }}">{{ user_.github }}</a></li>
74 74 {% endif %}
75 75  
76 76 {% if user_.webpage %}
... ...
src/locale/pt_BR/LC_MESSAGES/django.mo
View file @5fc33e8
No preview for this file type
src/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @5fc33e8
... ... @@ -7,7 +7,7 @@ msgid &quot;&quot;
7 7 msgstr ""
8 8 "Project-Id-Version: PACKAGE VERSION\n"
9 9 "Report-Msgid-Bugs-To: \n"
10   -"POT-Creation-Date: 2013-12-17 11:15+0000\n"
  10 +"POT-Creation-Date: 2013-12-19 11:20+0000\n"
11 11 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 13 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -29,35 +29,35 @@ msgstr &quot;Permissões&quot;
29 29 msgid "Important dates"
30 30 msgstr "Datas importantes"
31 31  
32   -#: accounts/forms.py:24
  32 +#: accounts/forms.py:25
33 33 msgid "Social account does not exist"
34 34 msgstr "Conta social não existe"
35 35  
36   -#: accounts/forms.py:55 accounts/templates/accounts/user_detail.html:34
  36 +#: accounts/forms.py:56 accounts/templates/accounts/user_detail.html:34
37 37 msgid "Bio"
38 38 msgstr "Bio"
39 39  
40   -#: accounts/forms.py:56
  40 +#: accounts/forms.py:57
41 41 msgid "Write something about you in 200 characters or less."
42 42 msgstr "Escreva algo sobre você em 200 caracteres ou menos."
43 43  
44   -#: accounts/forms.py:72
  44 +#: accounts/forms.py:76
45 45 msgid "Mailing lists"
46 46 msgstr "Listas de e-mail"
47 47  
48   -#: accounts/forms.py:79
  48 +#: accounts/forms.py:83
49 49 msgid "Password"
50 50 msgstr "Senha"
51 51  
52   -#: accounts/forms.py:81
  52 +#: accounts/forms.py:85
53 53 msgid "Password confirmation"
54 54 msgstr "Confirmação de senha"
55 55  
56   -#: accounts/forms.py:83
  56 +#: accounts/forms.py:87
57 57 msgid "Enter the same password as above, for verification."
58 58 msgstr "Digite a mesma senha que acima, para verificação."
59 59  
60   -#: accounts/forms.py:101
  60 +#: accounts/forms.py:105
61 61 msgid "Password mismatch"
62 62 msgstr "Senhas diferentes"
63 63  
... ... @@ -158,8 +158,8 @@ msgid &quot;Google talk account&quot;
158 158 msgstr "Conta Google"
159 159  
160 160 #: accounts/templates/accounts/user_detail.html:73
161   -msgid "Identi.ca account"
162   -msgstr "Conta Identi.ca"
  161 +msgid "Github account"
  162 +msgstr "Conta Github"
163 163  
164 164 #: accounts/templates/accounts/user_detail.html:77
165 165 msgid "Personal webpage"
... ... @@ -1056,6 +1056,9 @@ msgstr &quot;Vontade de ajudar&quot;
1056 1056 msgid "INTERLEGIS COMMUNITIES"
1057 1057 msgstr "COMUNIDADES INTERLEGIS"
1058 1058  
  1059 +#~ msgid "Identi.ca account"
  1060 +#~ msgstr "Conta Identi.ca"
  1061 +
1059 1062 #~ msgid "Biography"
1060 1063 #~ msgstr "Biografia"
1061 1064  
... ...