haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-04 00:20:07 +00:00
Code Issues Releases Wiki Activity
6,588 Commits 145 Branches 460 Tags
30f098a5c0b89998353e24fe0b51a06e7042ecc4
Commit Graph

187 Commits

Author SHA1 Message Date
zhengxie
d37144ef75 Merge branch '6.2' 
Conflicts:
	seahub/templates/base.html
	static/scripts/app/views/dir.js
	static/scripts/common.js
 2017-12-28 15:47:18 +08:00
llj
b16a829ead added transition to show/hide of feedback messages 2017-12-12 17:13:01 +08:00
llj
07dea7eca4 new design 2017-12-05 17:53:45 +08:00
llj
17d2e2f9c7 [misc] fix 2017-11-24 15:49:06 +08:00
llj
dd95460024 Statistic (#1749) 
* [system admin] added statistic for file operation

* [statistic] improvement

* [system admin] added statistic for 'total storage' & 'active users'

* [statistic] file: modification
 2017-08-10 10:16:03 +08:00
llj
2a8e40c3c0 [image] use thumbnail for magnificPopups, file_view page & shared_file_view page 2017-04-18 17:28:29 +08:00
llj
e2e9e6c127 [system admin] users: added 'set quota / delete users in batch' 2017-03-16 18:02:03 +08:00
zhengxie
d82df5fb52 Merge branch '6.0' 
Conflicts:
	media/js/base.js
	seahub/api2/views.py
	seahub/views/ajax.py
	tests/api/test_repo_user_folder_perm.py
 2017-02-17 17:11:33 +08:00
lian
2b43226d08 Merge pull request #1475 from haiwen/odf-view 
[ODF] modified file view for ODF; fix bugs
 2017-02-13 16:49:12 +08:00
llj
9fc46aa7d4 [ODF] modified file view for ODF; fix bugs 2017-02-08 17:34:31 +08:00
llj
72af4885f7 [sysadmin] single user page: delete 'owned' library with ajax 2017-01-18 11:17:52 +08:00
lian
072defd547 format size when admin set user quota 2017-01-06 18:50:14 +08:00
Daniel Pan
aac96ff4e6 Merge pull request #1379 from haiwen/md-add-file 
Markdown add file
 2016-11-18 12:05:45 +08:00
Daniel Pan
625573a669 Merge pull request #1361 from haiwen/fileupload 
Fileupload
 2016-11-18 11:29:52 +08:00
Daniel Pan
2c6070085a Merge pull request #1337 from haiwen/jstree-update 
[jstree] updated jstree to the latest v3.3.2, rewrote/modified relate…
 2016-11-18 11:27:11 +08:00
llj
9e48df9ca9 [video file view] use videojs 2016-11-10 17:21:26 +08:00
llj
6e0e306f93 [markdown edit] added 'add a file'; fixed UI for 'link', 'image' popup 2016-10-25 12:05:46 +08:00
llj
0128cc25ad [jstree] updated jstree to the latest v3.3.2, rewrote/modified related code, & bugfix 2016-10-25 11:39:52 +08:00
llj
7ecf62d970 [fileupload] upgrade fileupload plugin to the latest version 2016-09-19 20:41:54 +08:00
llj
9c913b525f [upload link] show specific error msg for fileupload 2016-08-18 16:24:32 +08:00
lian
c4fa072dc7 new share admin page (#1233) 2016-06-30 15:06:43 +08:00
llj
114b6dccf6 improved 'table' accessibility for 'non backbone' pages; bugfix for 'trash' 2016-04-24 18:21:46 +08:00
llj
59d4689e73 [notice, account] modification 2016-04-23 13:27:56 +08:00
Daniel Pan
6b0f05bd34 Rewrite notifications with popover class 2016-04-23 13:27:17 +08:00
llj
d4f5bc4817 [icons] modification 2016-04-12 15:53:51 +08:00
llj
3f23a1685e [icons] modification 2016-04-12 11:22:04 +08:00
llj
77aac3d811 redesigned all checkbox; bugfix & improvement; removed unused code & file 2016-04-07 11:06:48 +08:00
zhengxie
ec9be6975d Merge branch '5.0' 
Conflicts:
	seahub/api2/urls.py
	seahub/api2/views.py
	seahub/group/templates/group/group_discuss.html
	seahub/options/models.py
	seahub/templates/repo_folder_perm.html
	seahub/templates/repo_share_manage.html
	seahub/templates/snippets/shared_link_js.html
	seahub/test_utils.py
 2016-03-28 12:16:30 +08:00
llj
4ebf0d79ce [non backbone] upgrade jquery.js, bugfix for some pages 2016-03-18 17:05:36 +08:00
lian
0e43a099ff [api] update search user api 2016-01-14 13:10:24 +08:00
llj
5f3c030a52 ['search user'] select2: enable 'directly enter email' 
* the separator is 'Enter', i.e., clicking the Enter key
 2016-01-14 11:42:28 +08:00
llj
784e2f1a25 [sysadmin] rm icons in op btns; add datepicker files 2015-11-21 10:49:17 +08:00
llj
a6f86b6ea9 [markdown edit] modification 2015-11-11 15:42:33 +08:00
llj
b2313e1456 [markdown view/edit] use 'marked' for md/wiki view, use editormd for md edit 2015-11-10 10:26:55 +08:00
zhengxie
9af79be996 Refactor revert ops 2015-10-20 18:24:27 +08:00
llj
0dc31715d4 use 'POST' instead of 'GET' for some requests, and modified 'share' in repo, file view 2015-10-19 15:04:37 +08:00
zhengxie
5fca43ef89 Merge branch '4.3' 
Conflicts:
	seahub/api2/views.py
 2015-09-14 13:43:39 +08:00
llj
3f46441c44 [js] added 'form post' option to 'addConfirmTo' 2015-08-31 14:36:02 +08:00
zhengxie
73e2d97f26 [sysadmin] Update some user operations 2015-08-27 17:02:13 +08:00
llj
18d8a62c08 [share links] add 'sort Chinese file names by Pinyin' 2015-08-17 16:40:59 +08:00
llj
b1e9dd0360 remove 'seaf' file 2015-07-10 17:47:10 +08:00
Shuai Lin
88811b29ed remove unused pdf2html.js 2015-07-01 11:34:37 +08:00
llj
945648de4c [select2] modification for long name/email 2015-06-17 14:26:31 +08:00
llj
f9b2efbeea [group manage] modified 'add member/admin' 2015-06-16 16:47:09 +08:00
Daniel Pan
66d62441d9 [backbone] Remove unused files 2015-04-22 15:31:35 +08:00
zhengxie
0a494cd0d3 Show repo dirents on myhome page using router 2015-04-22 15:29:46 +08:00
zhengxie
05accf19e7 Use backbone.js 2015-04-22 15:29:46 +08:00
zhengxie
4113ec27a6 [js] Escape data-target when show confirm popup 2015-03-11 13:57:50 +08:00
lian
d1fb67c78f [repo-setting] Set folder perm 2015-01-21 11:14:34 +08:00
llj
f8409946d2 [fileupload] modified upload rate: use 'B' instead of 'bit' 2014-12-27 17:25:47 +08:00