haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-16 23:29:49 +00:00
Code Issues Releases Wiki Activity
5,037 Commits 144 Branches 460 Tags
c70cdcc2d4643a7aa91d5ebc871a77bb7708b200
Commit Graph

5037 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lian
cca0f52a9d fix repo create error 2016-03-19 10:36:18 +08:00
Daniel Pan
fbfa175ece Merge pull request #1072 from haiwen/upgrade_jquery 
[non backbone] upgrade jquery.js, bugfix for some pages
 2016-03-18 18:21:47 +08:00
llj
4ebf0d79ce [non backbone] upgrade jquery.js, bugfix for some pages 2016-03-18 17:05:36 +08:00
Daniel Pan
b4b026ab8d Merge pull request #1071 from haiwen/5.0-nickname_cache 
Update nickname cache invalidation
 2016-03-18 16:54:00 +08:00
zhengxie
3d5d98ffb8 Update nickname cache invalidation 2016-03-18 16:23:39 +08:00
Daniel Pan
865429e5ec Merge pull request #1069 from haiwen/5.0-fix_target_blank 
Fix target blank, issue: https://github.com/haiwen/seahub/issues/1066
 2016-03-18 12:05:28 +08:00
zhengxie
eb55e86c4d Fix target blank, issue: https://github.com/haiwen/seahub/issues/1066 2016-03-18 11:58:48 +08:00
Daniel Pan
96f8e55633 Merge pull request #1068 from haiwen/fix-owa-api 
force convert UUID obj to JSON serializable obj
 2016-03-17 19:55:30 +08:00
lian
c4b8652507 force convert UUID obj to JSON serializable obj 2016-03-17 17:50:29 +08:00
zhengxie
3aa29e5b1f [inst] Add institution feature 2016-03-17 13:57:43 +08:00
Daniel Pan
0654cdab0a Merge pull request #1064 from haiwen/remember-sort 
update sort dirents
 2016-03-17 13:24:58 +08:00
Daniel Pan
c2f35dc4b9 Merge pull request #1065 from haiwen/code-improve 
Improve Moment related code
 2016-03-17 11:35:18 +08:00
lian
317477fc28 update sort dirents 
remember sort mode when view different folder
 2016-03-17 11:26:49 +08:00
Daniel Pan
2ac6a8859c Improve Moment related code 2016-03-17 11:15:28 +08:00
Daniel Pan
99e8c1c99d Merge pull request #1062 from haiwen/devices 
new devices page
 2016-03-17 10:24:55 +08:00
lian
50711071a6 improve devices page 2016-03-16 15:47:33 +08:00
Daniel Pan
49ac5b9ec2 Merge pull request #1061 from haiwen/render-dirents 
update render dirents
 2016-03-15 18:19:12 +08:00
lian
a43b3f969e new devices page 2016-03-15 18:19:12 +08:00
lian
e4a468eb8f update render dirents 2016-03-15 12:04:31 +08:00
llj
585b48e3c4 Merge pull request #1056 from haiwen/code-clean 
clean code and icons
 2016-03-14 19:57:08 +08:00
llj
b51dab76eb [code clean] clean & fix 2016-03-14 19:51:09 +08:00
zhengxie
eb799b516e [tests] Add password change test 2016-03-14 16:45:41 +08:00
llj
6cc1aa7d94 Merge pull request #1059 from haiwen/lib-icon 
Improve library icon
 2016-03-14 12:18:14 +08:00
llj
6f0fcd6cb1 [lib list] modification about 'icon_title' 2016-03-14 12:15:28 +08:00
Daniel Pan
e00f0054c2 Merge pull request #1058 from haiwen/details 
Details
 2016-03-11 21:07:03 +08:00
llj
2e1d8facdc [lib setting] folder perm: replaced 'plus' icon 2016-03-11 15:18:19 +08:00
llj
37ed9678c3 [details] improved UI details, cleaned up CSS 2016-03-11 14:42:03 +08:00
Daniel Pan
0931bd0103 Improve library icon 2016-03-11 13:41:51 +08:00
llj
d6dffbab73 [lib setting] 'folder perm', 'share link': add 'min-height' 2016-03-10 18:02:32 +08:00
llj
565c05ee66 Merge pull request #1055 from haiwen/mode-switch-icon 
Improve icon for grid/list mode switch in folder share link
 2016-03-10 16:21:34 +08:00
llj
b741ef8b60 [clean] removed 'seafile-font' & etc. 2016-03-10 15:55:00 +08:00
llj
91c3f75251 [lib setting] folder perm: open the jstree 2016-03-10 15:11:21 +08:00
llj
6fce263e42 [details] modified 'grid view', 'share popup', 'repo folder perm', 'select2' & etc. 2016-03-10 13:56:00 +08:00
Daniel Pan
cf41dd6be2 Merge pull request #1057 from haiwen/5.0-owa-api 
5.0 owa api
 2016-03-10 10:55:35 +08:00
lian
d750019b84 [api2] update err msg of owa api 2016-03-10 10:46:51 +08:00
lian
9642fd129d [api2] add new owa file api 2016-03-10 10:46:42 +08:00
Daniel Pan
8f368f3231 Merge pull request #1036 from haiwen/restore-file-dir-api 
add dir revert api & update file revert api
 2016-03-10 10:36:24 +08:00
Daniel Pan
1f7af8b68a clean sub-library related code 2016-03-09 21:28:05 +08:00
Daniel Pan
936898bfe7 Remove more icons 2016-03-09 21:18:48 +08:00
Daniel Pan
f0e40d9120 Clean public library related code 2016-03-09 20:54:33 +08:00
Daniel Pan
b75e8e8d9c clean code and icons 2016-03-09 15:12:53 +08:00
Daniel Pan
ca2bef6e73 Improve icon for grid/list mode switch in folder share link 2016-03-09 14:05:01 +08:00
Daniel Pan
8c59095071 Merge pull request #1054 from haiwen/new-file-dir-api 
[api-v2.1] add new file/dir api according to old file/dir api
 2016-03-09 13:43:34 +08:00
lian
49ed1fd386 [api-v2.1] add new file/dir api according to old file/dir api 2016-03-09 10:12:16 +08:00
xiez
969537931b Merge pull request #1052 from haiwen/user-options 
update get user option
 2016-03-08 11:01:29 +08:00
zhengxie
e844735cc2 [tests] Update tests 2016-03-08 10:59:46 +08:00
lian
4197393268 update user options 2016-03-07 18:14:35 +08:00
zhengxie
56ad0d3f04 Fix travis config, and send share link api 2016-03-07 16:41:26 +08:00
zhengxie
72d30b2495 Merge branch '5.0' 
Conflicts:
	seahub/api2/endpoints/dir_shared_items.py
	seahub/api2/urls.py
	seahub/templates/repo.html
	seahub/utils/http.py
	seahub/views/__init__.py
	seahub/views/ajax.py
	seahub/views/repo.py
	tests/seahub/views/test_libraries.py
 2016-03-07 16:04:36 +08:00
lian
7823d500e5 add dir revert api & update file revert api 2016-03-07 15:30:28 +08:00