haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-13 22:01:06 +00:00
Code Issues Releases Wiki Activity
13,877 Commits 144 Branches 460 Tags
8f04a770f70ce6f3522cdea2acac62bde2ee966c
Commit Graph

13877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xiez
8ef4c0aa62 Merge pull request #51 from HenriWahl/master 
improved german django.po
 2013-05-17 20:15:18 -07:00
zhengxie
8fbedb85f3 Merge branch 'dancewhale-master' 
Conflicts:
	media/css/seahub.css
	seahub/templates/myhome.html
	seahub/templates/wiki/personal_wiki.html
 2013-05-18 11:09:34 +08:00
zhengxie
4c8f674841 Merge branch 'feature/payment' 2013-05-18 11:08:47 +08:00
zhengxie
99f1c05096 Fixed api2 bugs 2013-05-18 11:01:33 +08:00
lins05
a0169f6389 improve .gitignore 2013-05-18 10:51:24 +08:00
HenriWahl
fb648d9629 improved german django.po 2013-05-17 20:09:55 +02:00
lins05
422435d8ef fixed settings.py for server release 
After migrating to django 1.5, seahub/settings.py becomes
seahub/seahub/settings.py
 2013-05-17 18:39:15 +08:00
zhengxie
8212dc3834 Added payment 2013-05-17 17:20:08 +08:00
plt
eb58367647 Move system admin functions to sysadmin.py 2013-05-17 13:41:37 +08:00
plt
e48fea29c8 Add pubfile support 2013-05-17 11:12:32 +08:00
plt
3049aaa61c Show user quota in admin user list 2013-05-16 20:12:14 +08:00
zhengxie
86827af4a9 Added account type 2013-05-14 16:12:57 +08:00
zhengxie
1b4b83ffbc Added missing import 2013-05-14 14:03:21 +08:00
zhengxie
021841b0f2 Enable adding group member when email service is not available. 2013-05-14 14:03:21 +08:00
zhengxie
2137085044 Update email_id cache when user has registered 2013-05-14 14:03:21 +08:00
llj
2ecb72c33d [events] redesign it 2013-05-14 12:08:11 +08:00
plt
1654696305 Improve icons for default user, group 2013-05-14 11:27:17 +08:00
plt
7c6f36fbab Improve default group and user icon 2013-05-11 20:48:50 +08:00
zhengxie
33a9493638 Merge branch 'client-mgmt' 2013-05-11 11:41:21 +08:00
killing
2a78f07900 Add client management interface. 2013-05-10 10:36:24 +08:00
zhengxie
842e931a51 Fixed small bugs in merging message 2013-05-09 11:25:48 +08:00
zhengxie
63da817049 Merge branch 'master' of git://github.com/dancewhale/seahub into dancewhale-master 2013-05-09 10:50:30 +08:00
dancewhale
556ce772e0 update views 2013-05-09 10:27:12 +08:00
dancewhale
47c9616076 fix a bug in view 2013-05-09 09:08:32 +08:00
dancewhale
0fd904cf02 update views 2013-05-09 08:31:23 +08:00
llj
61ed106fa0 [group discuss] reply submit: fixed ajax data bug & improved code 2013-05-08 19:35:27 +08:00
dancewhale
f2acc67b3a some change in html 2013-05-08 17:16:14 +08:00
dancewhale
41fb83ff8c some change in html 2013-05-08 17:13:55 +08:00
dancewhale
b553689027 add message module and two interface 2013-05-08 17:07:23 +08:00
zhengxie
79a93c587b Only list contacts and joined groups when sharing repo 2013-05-08 16:35:24 +08:00
zhengxie
27659629e5 Using lazy quantifier instead of greedy quantifier in wiki link parsing 2013-05-08 11:24:47 +08:00
zhengxie
53201b105d Move auth from thirdpart to seahub 2013-05-07 15:16:05 +08:00
zhengxie
312e5ba7bd Removed remaining contentType in ajax post 2013-05-07 10:23:04 +08:00
poetwang
92bdd49130 [api] Add api for creating empty file 2013-05-06 21:41:06 +08:00
zhengxie
c760d118e9 Removed duplicated urlconf in settings 2013-05-04 17:38:38 +08:00
zhengxie
507fadb42a Added missing seahub prefix in imports 2013-05-03 16:37:37 +08:00
zhengxie
11cfdce3e1 Improve mktemp, remove contentType in some ajax posts 2013-05-03 14:39:39 +08:00
zhengxie
a6578f864c Added csrf token to form 2013-05-03 11:37:57 +08:00
zhengxie
08b3e1115a Change code structure to fit django 1.5 2013-05-02 19:27:17 +08:00
xiez
d3a9bf1254 Merge pull request #44 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
0d687d1d71 discarded modification on fr po 2013-04-27 11:33:02 +08: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
llj
d81e9b65be [repo] fixed file-upload bug 2013-04-27 10:39:56 +08:00
llj
417f965256 [profile set] modified ui for other langs 2013-04-27 10:39:56 +08:00