zhengxie
ea17fdfa7b
[pubuser] Fixed duplicated search records
2014-01-20 19:55:17 +08:00
llj
b3821ddfd6
[pubuser] add ui for user search
2014-01-20 18:58:27 +08:00
zhengxie
b79eac041a
[pubuser] search pubuser
2014-01-20 18:58:27 +08:00
llj
81e2f8a81a
[shared file view] improved ui/interaction of 'download'
2014-01-20 16:22:33 +08:00
llj
56db61b6af
[grp pubfile] modified css for file download
2014-01-20 15:24:15 +08:00
llj
d00ad83cd2
[organization libs] added 'repo create' btn back
2014-01-20 14:43:15 +08:00
llj
2e36717861
[personal/shares --> repos] improved urls for repo, cleaned up code for share/repos
2014-01-20 13:50:03 +08:00
dev
3e1153ba3e
Fixed events time zone bug
2014-01-20 10:46:38 +08:00
poetwang
8b72fd5846
[api] Make api semantic consistent
2014-01-18 15:51:08 +08:00
poetwang
2604f849fe
[api] Add user which is not contact but send message
2014-01-18 15:37:27 +08:00
zhengxie
56349dd7c3
Merge branch '2.1'
2014-01-18 12:23:55 +08:00
zhengxie
8e28ed4c88
Revert "WIP: multi-tenancy"
...
This reverts commit 37d57c1639
2014-01-18 12:20:38 +08:00
poetwang
a8beff8dfc
[api2] Add apis for contacts and user messages
2014-01-17 23:27:45 +08:00
llj
47e55d8373
[wiki improve] index: show tip & create btn when no index; improved img ui
2014-01-17 17:47:36 +08:00
llj
7dc74e8ccb
[wiki index] improved ui
2014-01-17 17:47:36 +08:00
llj
a33a971bed
[wiki] improvement & bug fix for header links, index, & creating wiki by choosing a lib
2014-01-17 17:47:36 +08:00
swpd
8cfd795ef3
Squashed commit of the following:
...
commit 1e791a50186ae10df65cf2f72b723f85301bf36a
Author: swpd <swpdtz@gmail.com >
Date: Mon Dec 23 21:29:42 2013 +0800
[group] allow staff to choose an existing group library to be used as group wiki
commit 23a3bc6ee4e95997ea402076d01980661a6aa2f4
Author: swpd <swpdtz@gmail.com >
Date: Mon Dec 23 13:59:58 2013 +0800
[wiki] allow user to choose an existing personal library to be used as personal wiki
commit fa3df2cf76b79a0593bb1eda2b413774c63b2676
Author: swpd <swpdtz@gmail.com >
Date: Sun Dec 22 02:39:20 2013 +0800
[wiki] generate within-page anchors for h1 and h2 tags automatically
commit 034a75626f825186a48b398e231f73185a54635c
Author: swpd <swpdtz@gmail.com >
Date: Sun Dec 15 16:40:42 2013 +0800
[group] allow group user to create wiki hierarchy index
commit 590b5c1488573d83eab636b0747d4f64d5f9d589
Author: swpd <swpdtz@gmail.com >
Date: Sun Dec 15 16:23:46 2013 +0800
[wiki] allow user to create personal wiki hierarchy index
2014-01-17 17:47:36 +08:00
llj
68721d87d3
[message] fixed 'attachment unshown' bug, and only allow files as attachment
2014-01-17 15:15:58 +08:00
zhengxie
a37b91b2ae
Merge branch 'avatar'
2014-01-17 11:10:19 +08:00
dev
98c3112393
Fixed events time bug
2014-01-16 10:10:43 +08:00
zhengxie
451eb06bc4
Merge branch '2.1'
2014-01-15 16:39:40 +08:00
zhengxie
715bdd7303
Fixed events grouping bug
2014-01-15 16:37:43 +08:00
zhengxie
37d57c1639
WIP: multi-tenancy
2014-01-15 16:21:11 +08:00
llj
1d75bc079c
[xss] improvement
2014-01-14 18:05:45 +08:00
zhengxie
26557ab2e6
Update source language file
2014-01-11 13:49:28 +08:00
zhengxie
d477951816
[api2] Remove inappropriate asserts
2014-01-10 15:35:28 +08:00
zhengxie
537c1fdc97
Fixed bug in message replies
2014-01-10 14:23:37 +08:00
zhengxie
91db55caaa
Update translation and version
2014-01-10 14:20:25 +08:00
zhengxie
d74fb09e1f
Show error when anonymous user posting a reply.
2014-01-10 14:07:46 +08:00
zhengxie
c3f08f11b8
[api2] Comment out regdevice
2014-01-10 11:36:27 +08:00
zhengxie
63f4229f53
Merge branch '2.1'
...
Conflicts:
seahub/api2/views.py
2014-01-10 11:33:20 +08:00
zhengxie
dcf48cda77
Merge branch '2.0'
...
Conflicts:
seahub/api2/views.py
2014-01-10 11:26:43 +08:00
zhengxie
112cb87db4
Merge branch 'SharedFiles' of git://github.com/urg/seahub into urg-SharedFiles
...
Conflicts:
seahub/api2/urls.py
seahub/api2/views.py
2014-01-10 11:12:28 +08:00
zhengxie
50ed2d4f27
Merge branch 'VirtualRepos' of git://github.com/urg/seahub into urg-VirtualRepos
...
Conflicts:
seahub/api2/urls.py
seahub/api2/views.py
2014-01-10 11:08:54 +08:00
zhengxie
711f70ad07
Merge branch 'DirDownload' of git://github.com/urg/seahub into urg-DirDownload
...
Conflicts:
seahub/api2/urls.py
seahub/api2/views.py
2014-01-10 11:05:42 +08:00
zhengxie
a9f1275206
Merge branch 'DirShare' of git://github.com/urg/seahub into urg-DirShare
...
Conflicts:
seahub/api2/urls.py
seahub/api2/views.py
2014-01-10 11:02:17 +08:00
zhengxie
59640c3c69
Merge branch 'FileRevert' of git://github.com/urg/seahub into urg-FileRevert
...
Conflicts:
seahub/api2/urls.py
seahub/api2/views.py
2014-01-10 10:56:42 +08:00
zhengxie
214dd67146
Merge branch 'FileRevision' of git://github.com/urg/seahub into urg-FileRevision
...
Conflicts:
seahub/api2/urls.py
seahub/api2/views.py
2014-01-10 10:53:52 +08:00
zhengxie
3d672841c5
Merge branch '2.0'
...
Conflicts:
seahub/api2/urls.py
seahub/api2/views.py
2014-01-10 10:49:12 +08:00
xiez
29426c7038
Merge pull request #128 from urg/SubRepo
...
Add Dir SubRepo api call
2014-01-09 18:41:32 -08:00
xiez
0594794d89
Merge pull request #126 from urg/SharedLinks
...
Add Shared Links api call
2014-01-09 18:40:20 -08:00
xiez
bcd4b78dff
Merge pull request #120 from urg/ViewFileHistory
...
Add View File History api call
2014-01-09 18:32:52 -08:00
xiez
684b17a802
Merge pull request #119 from urg/ViewRepoHistory
...
Add View Repo History api call
2014-01-09 18:27:14 -08:00
xiez
4bb238b31d
Merge pull request #129 from urg/FixValidTokenWithoutUser
...
Fix for if token is valid format, but user with that token does not exist
2014-01-09 18:25:12 -08:00
zhengxie
f82af2aaa1
Modified login form
2014-01-09 15:42:22 +08:00
lins05
0b249ee310
[api] include virtual repos when listing repos
2014-01-09 14:08:13 +08:00
zhengxie
805e44e6a1
Fixed a few typos
2014-01-09 13:53:02 +08:00
zhengxie
2e793eb34a
Modified account delete
2014-01-09 11:13:20 +08:00
zhengxie
4cbbaa93ca
Added username validation
2014-01-08 18:24:16 +08:00
llj
5b9cb34e92
[xss] added tag_whitelist for wiki/md
2014-01-08 17:16:56 +08:00
