1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-05-13 18:35:20 +00:00
Commit Graph

1885 Commits

Author SHA1 Message Date
zhengxie
08b3e1115a Change code structure to fit django 1.5 2013-05-02 19:27:17 +08:00
xiez
d3a9bf1254 Merge pull request from Pi3R1k/master
js quote problem
2013-05-01 23:09:46 -07:00
zhengxie
aa911dee9c Remove org 2013-05-02 14:08:16 +08:00
Pi3R1k
488d6d42b2 resolve js quote problem on share page 2013-05-01 22:53:28 +02:00
llj
06b5e22f22 discard modification on fr po 2013-04-27 11:24:49 +08:00
zhengxie
66f87d0326 Added plan check 2013-04-27 11:16:52 +08:00
llj
490d2c5b31 [repo] fixed file-upload bug 2013-04-27 10:56:53 +08:00
llj
75c2e896f1 [profile set] modified ui for other langs 2013-04-27 10:56:53 +08:00
llj
4ad9d23a1e modified js str with 'trans' for french; improved some code 2013-04-27 10:56:53 +08:00
zhengxie
2c23d4646d Merge branch '1.6' 2013-04-26 16:58:45 +08:00
zhengxie
68494a0390 Clean .po file in it/ru. Removed strings from django 2013-04-25 16:29:45 +08:00
zhengxie
d8a16cf28e Updated contributors 2013-04-25 16:21:21 +08:00
xiez
700732ce2c Merge pull request from Pi3R1k/master
Translation 1.6 french OK
2013-04-25 01:18:12 -07:00
lins05
aa0dc23b0f wrap tempfile.mkstemp to work on windows
The path returned by tempfile.mkstemp is encoded in system locale,
since we need to pass it through rpc, we need it to be encoded in UTF-8
2013-04-25 13:43:12 +08:00
zhengxie
cfaa97d61c Modified personal wiki title 2013-04-25 11:33:26 +08:00
zhengxie
b4565d0577 Fixed table bug in wiki 2013-04-24 19:31:25 +08:00
poetwang
11ec7ed43f Update script for init seahub_settings.py in Windows 2013-04-24 17:31:12 +08:00
poetwang
dda14cbd61 Write pid to file in windows 2013-04-24 17:31:12 +08:00
poetwang
c8b1449c21 Port to Windows 2013-04-24 17:31:12 +08:00
zhengxie
585c22feac Fixed js string bug when editing personal wiki page 2013-04-24 16:30:03 +08:00
Pi3R1k
f73972e6b0 add base/locale/fr/LC_MESSAGES/django.po and remove duplicate lines 2013-04-23 16:31:17 +02:00
Pi3R1k
6a82cb8345 Correct somes details 2013-04-23 15:41:11 +02:00
Pi3R1k
c5fae691a5 Modify share to shares for match HenriWahl commit : 40b17dc28a 2013-04-23 15:25:25 +02:00
Pi3R1k
b0d1cc85a6 add Bytes to Octet translation 2013-04-23 15:19:22 +02:00
Pi3R1k
da494a984c add time from base/templatetags/seahub_tags.py entries 2013-04-23 15:13:33 +02:00
Pi3R1k
84e4b8fb96 add /thirdpart/auth/locale/fr/LC_MESSAGES/django.po 2013-04-23 15:08:44 +02:00
Pi3R1k
af4274dddd add /profile/locale/fr/LC_MESSAGES/django.po 2013-04-23 14:47:32 +02:00
Pi3R1k
06fb8fb904 add organizations/locale/fr/LC_MESSAGES/django.po 2013-04-23 14:42:14 +02:00
Pi3R1k
f03a54c1c9 add /notifications/locale/fr/LC_MESSAGE/django.po 2013-04-23 12:55:56 +02:00
Pi3R1k
98cc1712b2 add /contacts/locale/fr/LC_MESSAGE/django.po 2013-04-23 12:44:04 +02:00
Pi3R1k
a211229d16 add /group/locale/fr/LC_MESSAGE/django.po 2013-04-23 12:22:31 +02:00
Pi3R1k
647111eb37 /locale/ Rewrite from Zh_CN 2013-04-23 12:17:39 +02:00
zhengxie
d0e9dbd86d Disable shared link in encrypt repo, and fix bug when deleteing home page in personal wiki. 2013-04-23 17:19:26 +08:00
llj
08e1ab63aa [useradmin] improved user-add, set/revoke admin, user-delete 2013-04-23 10:25:44 +08:00
zhengxie
105e51575f Merge branch 'develop'
Conflicts:
	templates/base.html
2013-04-22 20:19:40 +08:00
xiez
a4d347e855 Merge pull request from vIiRuS/genpassword
INIT_PASSWD can now be a function
2013-04-22 05:03:38 -07:00
plt
e5ddc4bd07 Improve sys admin 2013-04-20 14:34:40 +08:00
llj
1fe5406127 [sf editor] fixed bugs and cleaned up code
* fixed 'font menu no content when lang is zh-cn' bug
* added back necessary '.btn-into' styles
* rm no used js/css
2013-04-20 12:11:46 +08:00
llj
b45ab7cb53 [discuss to group] fixed '.msg-main top border missing sometimes' in chrome 2013-04-20 12:11:45 +08:00
zhengxie
33fe53076b Removed api 2013-04-20 11:31:17 +08:00
plt
579cf52d63 Merge pull request from vIiRuS/develop
added possibility to add branding to seahub
2013-04-19 03:26:09 -07:00
Phillip Thelen
591ea8ae5b fixed indentation and html 2013-04-19 11:50:57 +02:00
zhengxie
d4b8c01d07 Merge branch 'develop'
Conflicts:
	utils/__init__.py
2013-04-19 16:57:57 +08:00
xiez
2fa830d027 Merge pull request from vIiRuS/3dpreview
Users now can preview stl and obj files in the browser
2013-04-19 01:43:44 -07:00
llj
49f9367a40 [sf editor] fixed bugs and cleaned up code
* fixed 'font menu no content when lang is zh-cn' bug
* added back necessary '.btn-into' styles
* rm no used js/css
2013-04-19 13:36:27 +08:00
llj
d270a3bcf3 [discuss to group] fixed '.msg-main top border missing sometimes' in chrome 2013-04-19 13:34:39 +08:00
plt
64437f948a Merge pull request from HenriWahl/master
More tiny German fixes and change from "Share" to "Shares"
2013-04-18 22:32:25 -07:00
Phillip Thelen
4ada8ac2b3 added comment that describes how to set INIT_PASSWD 2013-04-18 15:14:20 +02:00
Phillip Thelen
c692ee8ec2 added possibility to let resetted passwords be generated 2013-04-18 15:13:04 +02:00
zhengxie
c51c11534b Encode email in group manage 2013-04-18 16:21:44 +08:00