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

5117 commits

Author SHA1 Message Date
Lukas Reschke
2a9c3c1660 Merge pull request #2069 from owncloud/fix_sanitize_call 
use p() for the output and not for the comparison
 2013-03-04 03:41:47 -08:00
Björn Schießle
05aad21b99 Merge pull request #2070 from owncloud/fix_quota 
fix quota calculation for trash and versions
 2013-03-04 03:33:47 -08:00
Björn Schießle
21bad1fcc0 fix type in var name 2013-03-04 12:33:16 +01:00
Björn Schießle
94dab96dba fix quota calculation for trash and versions 2013-03-04 12:17:57 +01:00
Björn Schießle
ccc4102cd9 fix p() call 2013-03-04 12:12:27 +01:00
Björn Schießle
52919fa94b use p() for the output and not for the comparison 2013-03-04 12:01:45 +01:00
Arthur Schiwon
39a94a3edc LDAP: orthograophy fix 2013-03-04 11:44:34 +01:00
Arthur Schiwon
0703065e2a LDAP: typos in app description 2013-03-04 11:29:35 +01:00
Bart Visscher
de066beaaf Merge pull request #2044 from owncloud/fix_1779_including_permanent_shares 
Fix file actions including permanent shares
 2013-03-04 01:56:23 -08:00
raghunayyar
d3ddf03687 Datepicker height fixed. 
New id defined for files table for positioning.
 2013-03-04 09:21:38 +05:30
Jenkins for ownCloud
b738aaba2a [tx-robot] updated from transifex 2013-03-04 00:07:35 +01:00
Michael Gapczynski
0488968443 Merge pull request #2034 from owncloud/fix_bug47 
Fix #47 - Duplicate files create a (2) when multiples are uploaded
 2013-03-03 11:49:04 -08:00
Jörn Friedrich Dreyer
f4411b0243 durhurrrhurrr 2013-03-03 13:01:25 +01:00
Jenkins for ownCloud
844e18a8b1 [tx-robot] updated from transifex 2013-03-03 00:06:56 +01:00
Michael Gapczynski
e466d680fe Fix variable name in Shared_Updater 2013-03-02 13:11:57 -05:00
Michael Gapczynski
9b4d7d9925 Update ETag when file is shared 2013-03-02 12:57:29 -05:00
Brice Maron
dbb9b68331 Fix quoting of query for user_ldap ref #1983 2013-03-02 16:26:15 +01:00
Lukas Reschke
d3e88e6a8c Remove uneeded sanitizeHTML 2013-03-02 12:44:53 +01:00
Jenkins for ownCloud
6c96b93fd4 [tx-robot] updated from transifex 2013-03-05 00:19:07 +01:00
Lukas Reschke
fdb37d191b Merge pull request #2092 from owncloud/infieldlabels-placeholder 
explicitly add empty placeholder to inputs which use infield labels
 2013-03-04 13:31:21 -08:00
Frank Karlitschek
33c62bf110 Merge pull request #2090 from owncloud/fixing-2089-master 
fixes #2089
 2013-03-04 13:17:35 -08:00
Jan-Christoph Borchardt
07dee24cb2 explicitly add empty placeholder to inputs which use infield labels, fix #2049 2013-03-04 22:11:57 +01:00
Bernhard Posselt
10b108ed8a Merge pull request #2030 from j-ed/master 
suppress log messages like `include path for class ... starts with "apps/"`
 2013-03-04 12:59:39 -08:00
Thomas Mueller
a118906f26 fixes #2089 2013-03-04 21:45:21 +01:00
Bernhard Posselt
8c64484c5e Merge pull request #2082 from owncloud/fix-permissions-class 
Change remove() $user parameter to optional
 2013-03-04 09:03:09 -08:00
Bernhard Posselt
b3df526ef2 Merge pull request #2079 from owncloud/fix_expire_function 
fix expire function
 2013-03-04 09:01:58 -08:00
Michael Gapczynski
ec2a9169b9 Change remove() $user parameter to optional 2013-03-04 11:44:09 -05:00
Björn Schießle
70014d37dc fix expire function 2013-03-04 17:20:14 +01:00
raghunayyar
d9c11a93c6 Corrects Files Layout in Trashbin 2013-03-04 21:34:50 +05:30
Jan-Christoph Borchardt
afe7ea8ca2 fix files table CSS specificity issue causing multiselect bar overlap, fix #2075 2013-03-04 16:10:11 +01:00
j-ed
f96eef926e Update app.php 
replaced fixed path to app folder to support multiple apps pathes.
 2013-03-02 12:33:38 +01:00
j-ed
20a45d547a Update app.php 
suppress log messages like `include path for class \"OCA\\Files_Versions\\Storage\" starts with \"apps\/\"`.
 2013-03-02 12:26:13 +01:00
j-ed
4c03c3a31d Update app.php 
suppress log messages like `include path for class \"OCA\\Files_Trashbin\\Hooks\" starts with \"apps\/\"`.
 2013-03-02 12:24:12 +01:00
j-ed
5352f1e65b Update app.php 
suppress log messages like `include path for class \"OCA\\Encryption\\Crypt\" starts with \"apps\/\"`.
 2013-03-02 12:18:28 +01:00
j-ed
d3e0a41dad Update app.php 
suppress log messages like `include path for class \"OC\\Files\\Storage\\Shared\" starts with \"apps\/\"`
 2013-03-02 12:14:52 +01:00
j-ed
2aaf38b5d3 Update app.php 
suppress log message `include path for class \"OC\\Files\\Storage\\SMB\" starts with \"apps\/\"`
 2013-03-02 12:12:33 +01:00
Jenkins for ownCloud
c9d9c381ec [tx-robot] updated from transifex 2013-03-02 00:05:42 +01:00
Thomas Mueller
4b9863fa7d Merge branch 'master' into from-insane-autoescape-to-p 
Conflicts:
	apps/files/templates/index.php
 2013-03-01 23:09:20 +01:00
Thomas Mueller
e3e4c28316 fixes #2001 - in case the user has no permissions to upload/create files/folders a clear warning is displayed 2013-03-01 21:43:34 +01:00
Bernhard Posselt
2e2cf28d30 Merge pull request #2005 from owncloud/trash_add_signals 
add post_moveToTrash and post_restore signals to the trash bin
 2013-03-01 09:41:07 -08:00
Georg Ehrke
ff9476b3e3 fix oc#47 2013-03-01 18:30:25 +01:00
Björn Schießle
a01540a300 fix getVersions() call for the history view 2013-03-01 13:55:10 +01:00
Björn Schießle
e81b6395d4 make sure that the version app always work on the users real home folder and not on the mount point 2013-03-01 13:54:26 +01:00
Björn Schießle
df2a9a3c60 add additional parameter to signal 2013-03-01 12:44:43 +01:00
Björn Schießle
7c360c2491 add post_moveToTrash and post_restore signals to the trash bin 2013-03-01 12:20:29 +01:00
Jenkins for ownCloud
d20fd7e9a6 [tx-robot] updated from transifex 2013-03-01 00:07:02 +01:00
Lukas Reschke
416607e559 Merge pull request #1979 from maelzx/patch-2 
Fix window.location mistakes in previous code
 2013-02-28 12:53:15 -08:00
Lukas Reschke
301d065686 Sed was wrong 2013-02-28 20:21:14 +01:00
Lukas Reschke
dee16deacd Merge master 2013-02-28 20:03:06 +01:00
Michael Gapczynski
b5989c933f Merge branch 'master' into shared-folder-etags 
Conflicts:
	apps/files_sharing/lib/sharedstorage.php
 2013-02-28 10:39:23 -05:00
Jan-Christoph Borchardt
6d4b344f5d Merge pull request #1397 from owncloud/trash_fileactions 
Enable fileactions while viewing trash
 2013-02-28 05:43:51 -08:00
Robin Appelman
12fd47af39 Trash: fix opening folders 2013-02-28 13:32:08 +01:00
maelzx
a319fa8d47 Fix window.location mistakes in previous code 
Sorry guys, I commit the incomplete code. It should be window.location.assign(url);

However this is just tested in google chrome.
 2013-02-28 11:26:42 +08:00
Jenkins for ownCloud
a93b5b47a1 [tx-robot] updated from transifex 2013-02-28 00:05:40 +01:00
Lukas Reschke
5f8bd07927 [Files] Use p() instead of echo 2013-02-27 23:40:30 +01:00
Lukas Reschke
b93ebe1860 Merge master 2013-02-27 23:36:52 +01:00
Lukas Reschke
0b5b495535 [user_webdavauth] From echo to p 2013-02-27 22:06:50 +01:00
Lukas Reschke
df1d90433d [user_ldap] From echo to p 2013-02-27 22:04:57 +01:00
Lukas Reschke
fc5331eaec [files_versions] From echo to p 2013-02-27 21:50:22 +01:00
Lukas Reschke
3ba8881bac [files_trashbin] From echo to p 2013-02-27 21:46:37 +01:00
Lukas Reschke
c9415e6529 [files] Unescape file size 2013-02-27 21:40:06 +01:00
Lukas Reschke
221ecf63ab [files_sharing] From echo to p 2013-02-27 21:37:14 +01:00
Lukas Reschke
236507a19f [files_external] From echo to p 2013-02-27 21:31:27 +01:00
Lukas Reschke
7f8eddffe4 [files_encryption] Use p() instead of echo() 2013-02-27 21:20:37 +01:00
Lukas Reschke
85209287bb [Files] Use htmlspecialchars() 2013-02-27 21:19:11 +01:00
Lukas Reschke
4860d03270 [Files] Use p() instead of echo 2013-02-27 21:14:15 +01:00
Robin Appelman
923c51773a Trash: disable text editor from trash for now 2013-02-27 20:37:50 +01:00
Robin Appelman
f497970e30 Trash: fix download.php 2013-02-27 20:31:21 +01:00
Robin Appelman
d2fe600789 Trash: fix trash when default quota is used 2013-02-27 20:29:49 +01:00
Robin Appelman
429bf42e98 Merge master into trash_fileactions 2013-02-27 20:29:19 +01:00
j-ed
1f9551a382 Update apps/files/templates/part.list.php 
prevent multiple slashes in a row when building URLs.
 2013-02-27 19:09:37 +01:00
Michael Gapczynski
766a301a6b Merge pull request #1031 from owncloud/external_storage_ui_feedback 
External Storage UI Improvements
 2013-02-27 10:00:22 -08:00
Björn Schießle
f8bcd38d4d remove admin settings from app.php 2013-02-27 15:53:08 +01:00
Björn Schießle
6cf147003f Merge branch 'master' into versions_cleanup 2013-02-27 15:50:08 +01:00
Björn Schießle
9b220d0b93 rename History to Versions 2013-02-27 15:46:49 +01:00
Björn Schießle
d9e75c2b92 remove admin settings for versions 2013-02-27 15:44:02 +01:00
Jenkins for ownCloud
fd654e9c2f [tx-robot] updated from transifex 2013-02-27 14:37:12 +01:00
Frank Karlitschek
49f2a2d25d Merge pull request #1953 from owncloud/escape_regular_expressions 
escape regular expressions; fix typo in variable name
 2013-02-27 04:29:17 -08:00
Bernhard Posselt
a54be4acc4 Merge pull request #1948 from owncloud/improve_user_sorting 
Sort after display name + LDAP server side sorting
 2013-02-27 02:39:22 -08:00
Thomas Müller
58b06c5c9a Merge pull request #1905 from owncloud/fix-share-icons 
Fix adding share icons to share action
 2013-02-27 02:31:52 -08:00
Björn Schießle
5c7e3cf2e2 escape regular expressions; fix typo in variable name 2013-02-27 10:51:32 +01:00
Michael Gapczynski
f26c477433 Merge pull request #1949 from owncloud/fix-dropbox 
Fix undefined root parameter in Dropbox storage
 2013-02-26 16:14:45 -08:00
Jenkins for ownCloud
348812f2ce [tx-robot] updated from transifex 2013-02-27 00:09:33 +01:00
Michael Gapczynski
25cf18f614 Fix undefined root parameter in Dropbox storage 2013-02-26 17:52:06 -05:00
Arthur Schiwon
64551ee06f LDAP: sort users on server-side 2013-02-26 22:27:09 +01:00
Jan-Christoph Borchardt
07e9f8d0d3 remove general CSS from IE specific rules, displays Shared state permanently again 2013-02-26 18:49:20 +01:00
Lukas Reschke
c94974cb97 Add missing echo 2013-02-26 16:10:52 +01:00
Björn Schießle
8c9d0d1f5b cleanPath needs to be public 2013-02-26 12:24:52 +01:00
Michael Gapczynski
ea83acedeb Fix target path and reuse mtime 2013-02-26 01:43:04 -05:00
Michael Gapczynski
8983465210 Correct parent folders' ETags for all users with access to a shared file 2013-02-26 01:21:48 -05:00
Michael Gapczynski
5b50bc8c0a Fix Dropbox and Google ui 2013-02-25 19:45:01 -05:00
Jenkins for ownCloud
63d9feb8c0 [tx-robot] updated from transifex 2013-02-26 00:06:26 +01:00
Michael Gapczynski
4a05e8820f Merge branch 'master' into external_storage_ui_feedback 2013-02-25 17:56:40 -05:00
Bernhard Posselt
1d83d76b45 fixed bug that prevented a newly created file to be opened with registered files actions 2013-02-25 17:50:17 +01:00
Frank Karlitschek
f50be25704 Merge pull request #1864 from owncloud/fix_display_default 
LDAP: simplify default for user home settings, fixes wrong display of de...
 2013-02-25 08:23:32 -08:00
Björn Schießle
ede0e7d6bc Merge pull request #1890 from owncloud/trashbin_fix 
fix quota calculation for trash bin and versions
 2013-02-25 07:59:09 -08:00
Björn Schießle
3ef8c0bda3 Merge pull request #1892 from owncloud/files_remove_row_on_delete 
delete table row if file was deleted instead of just hide it
 2013-02-25 07:44:35 -08:00
Björn Schießle
dbf2bfc8cd delete table row if file was deleted instead of just hide it 2013-02-25 16:32:54 +01:00
Björn Schießle
b917646516 fix quota calculation 2013-02-25 16:12:44 +01:00
Björn Schießle
272f854ce6 fix getVersion call 2013-02-25 15:34:36 +01:00
Jörn Friedrich Dreyer
664e7a3fc2 use distance option to delay dragging in sane browsers 2013-02-25 15:08:14 +01:00
Björn Schießle
e30b3f64e0 fix line endings 2013-02-25 14:29:31 +01:00
Björn Schießle
4c980a4851 Merge branch 'master' into update-expire-function 
Conflicts:
	apps/files_trashbin/appinfo/version
	apps/files_trashbin/lib/trash.php
 2013-02-25 14:26:59 +01:00
Björn Schießle
a37577e007 Merge pull request #1810 from owncloud/trashbin_encryption 
Trashbin file encryption support
 2013-02-25 05:13:38 -08:00
Björn Schießle
7da97550df some final code clean-up 2013-02-25 14:12:56 +01:00
Björn Schießle
7ebbecd81f always use "===" 2013-02-25 14:09:20 +01:00
Bernhard Posselt
3f48bebe92 Merge pull request #1827 from owncloud/fix_getVersions 
fix getVersions(), we need to get the correct user and filename
 2013-02-25 04:59:47 -08:00
Thomas Müller
660670ec68 Merge pull request #1832 from owncloud/fix_1779 
use :hover pseudo class to set opacity
 2013-02-25 04:35:34 -08:00
Thomas Müller
7c30c1a2e8 Merge pull request #1833 from owncloud/fix_1465 
Fix 1465
 2013-02-25 04:34:13 -08:00
Björn Schießle
4dea6a6228 Merge branch 'master' into trashbin_encryption 
Conflicts:
	apps/files_trashbin/index.php
	apps/files_trashbin/lib/trash.php
 2013-02-25 12:14:51 +01:00
Björn Schießle
632ca9f06d Merge branch 'master' into update-expire-function 
Conflicts:
	apps/files_trashbin/lib/trash.php
 2013-02-25 11:14:06 +01:00
Frank Karlitschek
9ee5069f2a Merge pull request #1856 from owncloud/fix_error_handling_stream_copy 
don't use the number of written bytes as indicator if streamCopy() was successful
 2013-02-25 02:04:12 -08:00
Frank Karlitschek
8f65916904 Merge pull request #1882 from owncloud/required_version 
Set required owncloud version to 4.93
 2013-02-25 00:37:22 -08:00
Jenkins for ownCloud
21f3291eee [tx-robot] updated from transifex 2013-02-25 00:06:17 +01:00
Robin Appelman
4e826b1673 Set required owncloud version to 4.93 2013-02-24 17:38:36 +01:00
Michael Gapczynski
36827d1549 Fix variable 2013-02-23 16:09:56 -05:00
Michael Gapczynski
00e28cf156 Return unknown free space for shared root folder so we can still upload partial files 2013-02-23 15:42:01 -05:00
Michael Gapczynski
b6a21cc4b5 Fix WebDAV uploading of partial shared files 2013-02-23 15:32:59 -05:00
Michael Gapczynski
09a2730f57 Include etag field for folder contents 2013-02-23 15:22:34 -05:00
Thomas Müller
a417028ccd Merge pull request #1862 from owncloud/whitespace-cleanup 
Whitespace cleanup
 2013-02-23 11:39:13 -08:00
Jenkins for ownCloud
6aa0ecc9b8 [tx-robot] updated from transifex 2013-02-23 00:05:33 +01:00
Arthur Schiwon
e4e915fa3b LDAP: simplify default for user home settings, fixes wrong display of default value in settings 2013-02-22 21:26:07 +01:00
Bart Visscher
bb75dfc021 Whitespace fixes 2013-02-22 19:05:36 +01:00
Björn Schießle
d8137fdf66 return both, count and result if the operation succeeded or failed. Maybe in some cases it is useful to know how much bytes where copied 2013-02-22 16:43:11 +01:00
Jörn Friedrich Dreyer
e8da90d0f4 Merge pull request #1711 from owncloud/style-cleanup 
Codestyle cleanup
 2013-02-22 07:02:51 -08:00
Björn Schießle
9edec542c5 mount users home before write/read file to it, necessary to deal with external homes 2013-02-22 13:15:47 +01:00
Björn Schießle
df76e0d1c3 use the same string lengths like the file cache 2013-02-22 10:05:08 +01:00
Bart Visscher
59582e0f3f Fix review issues 2013-02-22 00:21:06 +01:00
Jenkins for ownCloud
734a463297 [tx-robot] updated from transifex 2013-02-22 00:08:47 +01:00
Bart Visscher
19c5213b53 Join split translated strings 2013-02-21 23:47:56 +01:00
Bart Visscher
db8dbb9847 Style cleanup files_versions 2013-02-21 23:47:21 +01:00
Bart Visscher
fb7de77474 Style cleanup files_trashbin 2013-02-21 23:47:21 +01:00
Bart Visscher
59a3238d1a Style cleanup files_sharing 2013-02-21 23:46:50 +01:00
Björn Schießle
629097bee7 increase db fileds for usernames 2013-02-21 22:44:44 +01:00
Jörn Friedrich Dreyer
0dd7fd0599 IE8 does not support window.onclick 2013-02-21 17:38:25 +01:00
Jörn Friedrich Dreyer
859caee66a use :hover pseudo class to set opacity 2013-02-21 16:52:18 +01:00
Björn Schießle
89ef06cd79 rename app to 'deleted files' 2013-02-21 16:34:22 +01:00
Björn Schießle
0a5457c550 fix getVersions(), we need to get the correct user and filename 2013-02-21 14:40:16 +01:00
Björn Schießle
2436d01985 calculate trashbin size per user 2013-02-21 12:37:13 +01:00
Björn Schießle
c24ec867f9 calculate versions size per user 2013-02-21 12:20:29 +01:00
Jenkins for ownCloud
dcd93a53e4 [tx-robot] updated from transifex 2013-02-21 00:15:58 +01:00
Björn Schießle
6aed7abfbe Merge branch 'master' into trashbin_encryption 2013-02-21 00:05:30 +01:00
Björn Schießle
fc1fba2304 don't show empty trash bin message for sub folders 2013-02-21 00:02:52 +01:00
Thomas Mueller
3eb9cd035f Merge branch 'master' into trash_bin_delete_selected 2013-02-20 23:46:15 +01:00
Björn Schießle
c1847aaf51 change for loop to make it hopefully work with IE 2013-02-20 22:32:44 +01:00
Björn Schießle
2d6efae257 update path to deleted files 2013-02-20 22:19:23 +01:00
Björn Schießle
b685aa8bcb some fixes for the keyfile handling 2013-02-20 22:17:04 +01:00
Bernhard Posselt
3b9d9eea09 replaced for in loops with normal enumerating loops to fix #1803 2013-02-20 21:57:50 +01:00
Björn Schießle
5329c9ea31 update script which copies all trash bin related files to user/files_trashbin 2013-02-20 19:18:34 +01:00
Björn Schießle
5ce6d1fb57 reuse delete() function in expire() 2013-02-20 18:00:15 +01:00