wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
9489 commits 157 branches 562 tags 714 MiB
Commit graph

749 commits

Author SHA1 Message Date
Robin Appelman
207aa22d12 merge master into filesystem 2013-01-30 19:24:24 +01:00
Robin Appelman
95352fbc15 Files: Dont get maxUploadSize if the filecache needs to be upgraded 2013-01-30 19:19:19 +01:00
Jörn Friedrich Dreyer
263c3f3a42 attach on to filelist instead of individual td elements for file link behaviour 2013-01-30 17:10:40 +01:00
Jörn Friedrich Dreyer
22812c5f0d replace live() with on() in core js 2013-01-30 17:00:54 +01:00
Björn Schießle
9ca0a93847 make spinner title translatable 2013-01-30 16:20:13 +01:00
Björn Schießle
1592764a60 show a spinner instead of the delete button while moving files to the trash bin 2013-01-30 14:32:20 +01:00
Jan-Christoph Borchardt
284e690737 Merge branch 'master' into navigation 2013-01-30 13:53:43 +01:00
Jörn Friedrich Dreyer
81a398c22c use $.trim() for IE8 2013-01-30 13:29:24 +01:00
Jörn Friedrich Dreyer
99dfaee1f6 reset checkbox after getting selected files instead of ofter dragging, speed up revert 2013-01-30 12:59:35 +01:00
Jörn Friedrich Dreyer
1d0ee61f3a use post instead of get 2013-01-30 12:59:35 +01:00
Jörn Friedrich Dreyer
0089b17749 add multselect dnd 2013-01-30 12:59:34 +01:00
Thomas Müller
5761bd771f Merge pull request #1227 from owncloud/hideuploadprogresscancelinielt10 
hide upload progress bar and cancel action in IE < 10
 2013-01-30 02:48:12 -08:00
Jenkins for ownCloud
68266e70f2 [tx-robot] updated from transifex 2013-01-30 00:25:41 +01:00
Björn Schießle
d10e137939 icons added; empty trash bin message added 2013-01-29 10:03:04 +01:00
Michael Gapczynski
5143660cd3 Merge pull request #1324 from owncloud/permanent-share-icons 
Permanently display shared status icons
 2013-01-28 20:17:40 -08:00
Jenkins for ownCloud
8c4931a645 [tx-robot] updated from transifex 2013-01-29 00:06:20 +01:00
Robin Appelman
86e5a9cd73 Files: fix sharing newly uploaded files 2013-01-28 21:09:18 +01:00
Robin Appelman
7207211f3a change required ownCloud version to 4.91 2013-01-28 19:58:24 +01:00
Jan-Christoph Borchardt
01b3c088a9 fix color change on click 2013-01-28 19:47:51 +01:00
Robin Appelman
74f6f85628 merge master into filesystem 2013-01-28 19:37:58 +01:00
Jan-Christoph Borchardt
3bafa87a12 merge styles 2013-01-28 19:36:21 +01:00
Björn Schießle
320233ec3d merge conflict fixed 2013-01-28 15:10:00 +01:00
Björn Schießle
8067a1394e fix merge conflicts 2013-01-28 11:18:04 +01:00
Jan-Christoph Borchardt
329d965441 merge changes in navigation 2013-01-28 10:52:15 +01:00
Thomas Mueller
11e88f4939 call ajax scan only if a user is logged in - otherwise we'll get a 500 2013-01-28 09:48:03 +01:00
Thomas Mueller
03a1a20316 fixing href for folders 2013-01-28 09:46:52 +01:00
Thomas Müller
31d83fddc4 Merge pull request #1321 from owncloud/csp-fixes 
Files: CSP fixes
 2013-01-28 00:29:46 -08:00
Michael Gapczynski
10c428830e Add create permission, fixes #780 2013-01-27 23:31:31 -05:00
Robin Appelman
bca5ce724e Merge branch 'master' into filesystem 2013-01-28 02:35:51 +01:00
Jenkins for ownCloud
b655444709 [tx-robot] updated from transifex 2013-01-28 00:05:43 +01:00
Jenkins for ownCloud
00a28062e1 [tx-robot] updated from transifex 2013-01-27 00:06:21 +01:00
Robin Appelman
930b9b9cd0 merge master into filesystem 2013-01-26 18:49:45 +01:00
Lukas Reschke
2e42c6f54f Use HTML5 data attribute + fix undefined variable 2013-01-26 14:07:35 +01:00
Lukas Reschke
6c882d9806 Remove outdated comments 2013-01-26 14:03:17 +01:00
Thomas Müller
276d98b9dd Merge pull request #1059 from owncloud/fixing-998-master 
Fixing 998 master
 2013-01-26 04:15:40 -08:00
Jenkins for ownCloud
af4411e33d [tx-robot] updated from transifex 2013-01-26 00:10:07 +01:00
raghunayyar
a86da16a10 More Style Fixes 
Remove Repeating Background behind folder names in files app
part.breadcrumb.php
 2013-01-25 20:50:55 +05:30
Lukas Reschke
047f1988c3 Merge branch 'master' into no-inline-js 2013-01-25 16:11:07 +01:00
Jenkins for ownCloud
6832dddf39 [tx-robot] updated from transifex 2013-01-25 00:05:56 +01:00
Jenkins for ownCloud
3ff32eba25 [tx-robot] updated from transifex 2013-01-24 00:07:38 +01:00
Lukas Reschke
c8bbbb48d3 Merge master... 2013-01-23 11:30:40 +01:00
Jenkins for ownCloud
c986dbe573 [tx-robot] updated from transifex 2013-01-23 00:06:18 +01:00
Björn Schießle
367aadb3b7 rename 'publicListView' switch to 'disableSharing' because this is not only used for the public list view 2013-01-22 18:34:59 +01:00
Björn Schießle
16ae902e31 no undo notification for deleted file, we use the trash bin instead 2013-01-22 17:43:46 +01:00
Björn Schießle
1817c7895b allow to look into deleted directories 2013-01-22 15:33:54 +01:00
Björn Schießle
8259768732 introduce option to disable download action 2013-01-22 15:33:53 +01:00
Björn Schießle
dfab3d3d7f call the trash bin view 2013-01-22 15:33:53 +01:00
Björn Schießle
9bacb0e179 rename "publicListView" option to "disableSharing", this is more meaningful also because it is not only useful for the public list view 2013-01-22 15:33:53 +01:00
Björn Schießle
9d77317de8 add trash button to web interface 2013-01-22 15:32:57 +01:00
Lukas Reschke
bd5ff29716 Merge branch 'master' into no-inline-js 2013-01-22 11:50:33 +01:00
Robin Appelman
f2d0eeae83 Merge branch 'master' into filesystem 2013-01-22 00:19:44 +01:00
Lukas Reschke
8223117569 Remove closing tag 2013-01-21 22:29:27 +01:00
Robin Appelman
1762378f67 Files: don't load fileactions.js when upgrading filecache 2013-01-21 22:07:55 +01:00
Lukas Reschke
0d02caa684 No inline JS in apps 2013-01-21 20:34:28 +01:00
Jenkins for ownCloud
aede26d996 [tx-robot] updated from transifex 2013-01-21 00:05:34 +01:00
Robin Appelman
83d6221322 merge master into filesytem 2013-01-20 03:11:04 +01:00
Jenkins for ownCloud
ebc0c4b85b [tx-robot] updated from transifex 2013-01-20 00:06:40 +01:00
Thomas Mueller
5d6c1d52bd replace #notification with OC.Notification call 2013-01-19 21:37:05 +01:00
Thomas Mueller
b8318e6df4 Merge branch 'master' into fixing-998-master 
Conflicts:
	apps/files/js/files.js
 2013-01-19 15:58:15 +01:00
Lukas Reschke
53b95cb8fd Merge pull request #1230 from owncloud/remove-unused-autocomplete.php 
Remove uneeded file
 2013-01-19 05:56:27 -08:00
Jan-Christoph Borchardt
ae244972cb Merge pull request #1228 from owncloud/generating_zip_message 
Make the ZIP download information friendlier
 2013-01-19 04:33:39 -08:00
Lukas Reschke
02bd8dd45a Change the second part of the notification 2013-01-19 13:12:27 +01:00
Thomas Mueller
1dd70ac506 update used space percent after each ajax call and display the notification 2013-01-19 00:31:49 +01:00
Thomas Mueller
cdd07b3339 introducing class OCA/files/lib/Helper with new function to build an array with storage stats 
DRYing the code by using \OCA\files\lib\Helper::buildFileStorageStatistics()
now returning used space percent on each ajax call
 2013-01-19 00:31:09 +01:00
Jenkins for ownCloud
a17ca3a69a [tx-robot] updated from transifex 2013-01-19 00:05:38 +01:00
Thomas Mueller
afb5de955e Merge branch 'master' into fixing-998-master 
Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/files.js
 2013-01-18 23:22:34 +01:00
Lukas Reschke
f447e6469f Remove uneeded file 
I don't saw any usage of this file through the code, I assume it can
safely be removed.
 2013-01-18 23:07:11 +01:00
Thomas Müller
31cc9aa80d Merge pull request #986 from owncloud/fixing-784-master 
the maximum upload size is now part of the response of the upload and de...
 2013-01-18 14:06:00 -08:00
Lukas Reschke
ad57db3e87 Make the message friendlier 2013-01-18 22:35:26 +01:00
Jörn Friedrich Dreyer
5e16510a53 hide upload progress bar and cancel action in IE < 10 2013-01-18 22:06:42 +01:00
Thomas Mueller
5ff29b4348 fixing indent 2013-01-18 20:09:03 +01:00
Jan-Christoph Borchardt
b81a7aa078 fix up content and content-wrapper merge ... 2013-01-18 19:58:50 +07:00
Thomas Mueller
130c9cad03 relative storage info without decimals 2013-01-17 16:52:57 +01:00
Thomas Mueller
b7d3bf5f81 rename space -> storage 2013-01-17 16:49:10 +01:00
Jenkins for ownCloud
433fa19268 [tx-robot] updated from transifex 2013-01-17 00:27:40 +01:00
Robin Appelman
bb43cf378b Files: make sure keybinds js is loaded after files js 2013-01-16 21:36:25 +01:00
Robin Appelman
5445b94416 merge master into filesystem 2013-01-16 19:04:50 +01:00
Bart Visscher
5bfe4adbaa Whitespace cleanup 2013-01-16 18:09:16 +01:00
Bart Visscher
a8f963d9cf Spaces to tabs 2013-01-16 18:09:16 +01:00
Jenkins for ownCloud
0398bfffca [tx-robot] updated from transifex 2013-01-16 00:21:21 +01:00
Robin Appelman
7debfac0dc Cache: more efficient upgrading 2013-01-15 19:11:12 +01:00
Robin Appelman
94068e5d08 Cache: show upgrade progress 2013-01-15 18:13:50 +01:00
Bart Visscher
0da06187f6 Merge pull request #1187 from owncloud/fixing-unused-and-undefined-in-master 
Fixing unused and undefined in master
 2013-01-15 07:45:51 -08:00
Robin Appelman
9bf367e7f8 merge master into filesystem 2013-01-15 14:57:23 +01:00
Jan-Christoph Borchardt
6182b1353b merge master into navigation 2013-01-15 20:40:38 +07:00
Jenkins for ownCloud
fdd667a83c [tx-robot] updated from transifex 2013-01-15 00:05:10 +01:00
Thomas Mueller
388bb6a5e1 Merge branch 'master' into fixing-unused-and-undefined-in-master 2013-01-14 23:41:34 +01:00
Lukas Reschke
9eb16e06f7 Merge pull request #1135 from owncloud/allow_default_click_behaviour 
allow default click behaviour
 2013-01-14 11:24:02 -08:00
Thomas Müller
51a4240051 Merge pull request #1170 from owncloud/correctIndention 
Remove ugly indentation - Trivial
 2013-01-14 04:59:53 -08:00
Jenkins for ownCloud
c29310aaef [tx-robot] updated from transifex 2013-01-14 00:18:21 +01:00
Lukas Reschke
2a7e5faa37 Remove ugly indentation 2013-01-13 01:02:11 +01:00
Jenkins for ownCloud
981fd5e424 [tx-robot] updated from transifex 2013-01-13 00:08:40 +01:00
Jenkins for ownCloud
ad64ce189d [tx-robot] updated from transifex 2013-01-12 00:10:58 +01:00
Thomas Mueller
e560cba76b adding a ajax call to get the current file storage stats like free space 
logic to call it every 5 minutes
make use of visibility API/jquery-visibility to perform the ajax call only if the browser is visible/in use
 2013-01-11 16:47:28 +01:00
Thomas Mueller
938254a1c0 load jquery-visibility 2013-01-11 16:45:32 +01:00
Thomas Mueller
362860c5b5 adding jquery-visibility 
https://github.com/mathiasbynens/jquery-visibility
MIT and GPL licensed
 2013-01-11 16:44:25 +01:00
Thomas Mueller
3d33e8f845 fixing indent - sorryy wrong setting on the IDE :-( 
replace missing calls to OC.Notification.show
 2013-01-11 15:02:34 +01:00
Thomas Mueller
9afdc14d40 adding accidentally removed line - THX @bartv2 2013-01-11 14:55:49 +01:00
Thomas Mueller
508b6a9fc7 displaying notification now centered 
The notification div has been moved to the user templates.
Correct display of the notification will only work with the use of OC.Notification.show() as on fadeIn() the css needs to be changed as this style required display: inline.
 2013-01-11 11:52:07 +01:00
Thomas Mueller
364b1cd391 Merge branch 'master' into fixing-998-master 
Conflicts:
	apps/files/js/files.js
 2013-01-11 10:00:12 +01:00