mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,980 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

5229 Commits

Author SHA1 Message Date
raghunayyar 5dd1f7d764 Using max-width instead of width for filename. 2013-03-30 00:13:47 +05:30
raghunayyar 024b60decc Adds a fixed width to the filename to prevent horizontal scroll. 2013-03-29 16:26:03 +05:30
Jörn Friedrich Dreyer 7ecbaef16c use css browser switch instead of deprecated jquery browser detection 2013-03-28 19:13:37 +01:00
Jörn Friedrich Dreyer dac875eb9c '#upload' is actually '#uploadprogresswrapper', fix css and js to show cancel button correctly 2013-03-28 18:50:49 +01:00
Jörn Friedrich Dreyer e31d74037a use local variable to walk DOM only once 2013-03-28 18:20:03 +01:00
Jörn Friedrich Dreyer 868d7b956d use === to compare empty string '' 2013-03-28 18:20:03 +01:00
Jörn Friedrich Dreyer 831b7ca803 don't update progress bar in ie < 10 2013-03-28 18:20:03 +01:00
Jörn Friedrich Dreyer c1a944a655 return created table row, use as context in fileupload events 2013-03-28 18:17:18 +01:00
Jörn Friedrich Dreyer 4dd4167f80 refactor files.js, make proper use of fileupload events 2013-03-28 18:17:18 +01:00
Jörn Friedrich Dreyer 0968eb0a65 return original filename to fileupload 2013-03-28 18:03:52 +01:00
Jörn Friedrich Dreyer df31ee5a90 Merge pull request #2575 from owncloud/fixing-1461-master 
Fix upload progressbar in IE8 and IE9
 2013-03-28 10:01:39 -07:00
Arthur Schiwon 599778b153 Files External: show display names instead of internal user names in Settings UI 2013-03-27 19:07:33 +01:00
Jenkins for ownCloud 0c666cb764 [tx-robot] updated from transifex 2013-03-27 00:11:05 +01:00
Thomas Mueller 586a47b186 fixes #1463 - file size is now displayed correctly in IE8 2013-03-26 21:28:01 +01:00
Thomas Mueller cf50e67e1b prevent to fire delete ajax a second time. 
Before the click on a single file delete icon fired two different handlers - one of them is for multiple deletion only
 2013-03-26 16:27:56 +01:00
Thomas Mueller 3817922c93 fixes #2125 - the warning is now displayed with a disabled button 2013-03-26 15:44:35 +01:00
Thomas Mueller e0e5cb73bf fixes #1461 2013-03-26 14:14:30 +01:00
Björn Schießle d121180d46 Merge pull request #2270 from owncloud/fix_json_encoded_pubic_download 
let public link download handle json encoded file lists [master]
 2013-03-26 01:56:47 -07:00
Björn Schießle c2a49b5c1f the old path no longer exists after rename, update the parent folder instead 2013-03-25 14:21:06 +01:00
Arthur Schiwon 8b3dd87846 LDAP: fix wrong return value 2013-03-25 12:33:10 +01:00
Björn Schießle abd48496d2 fix indention 2013-03-25 12:33:03 +01:00
Björn Schießle 102120f105 skip update if the recipient is the same user as the owner, otherwise we run in a infinite loop for group shares 2013-03-25 12:32:56 +01:00
Björn Schießle 5924d1d95c add backticks around table names 2013-03-25 12:29:13 +01:00
Jenkins for ownCloud 4f6e13e673 [tx-robot] updated from transifex 2013-03-23 00:06:16 +01:00
Jenkins for ownCloud 3b1c7de459 [tx-robot] updated from transifex 2013-03-21 00:04:36 +01:00
Björn Schießle b91bcf5f60 Merge pull request #2324 from owncloud/html_video_tag 
use html video tag to preview videos for public shares
 2013-03-20 02:27:53 -07:00
Jenkins for ownCloud 63e3f978ab [tx-robot] updated from transifex 2013-03-20 00:02:44 +01:00
Arthur Schiwon aa3973d365 LDAP: user exists check on getHome, otherwise check will be performed with wrong configs on a multi LDAP server setup. 2013-03-19 14:40:36 +01:00
Arthur Schiwon 0f4e02b6fc LDAP: avoid irritating log output 2013-03-19 14:40:30 +01:00
Arthur Schiwon 50d0f48ee4 LDAP: check whether user exists for before trying to determine displayname 2013-03-19 14:40:23 +01:00
Arthur Schiwon 18fccf6612 LDAP: check first whether group exists in this backend before doing other operations 2013-03-19 14:40:15 +01:00
Arthur Schiwon 504f5f229f LDAP: remove unnecessary func call, was a leftover from earlier refactor 2013-03-19 14:40:05 +01:00
Arthur Schiwon f38932fb80 LDAP: specify appid when selecting from appconfig 2013-03-19 14:39:56 +01:00
Jenkins for ownCloud 63ca84e7bc [tx-robot] updated from transifex 2013-03-19 00:05:52 +01:00
Bernhard Posselt 5b1f857907 Merge pull request #2363 from owncloud/uploadsize 
Improve behaviour when max upload size is unknown
 2013-03-18 08:18:27 -07:00
Björn Schießle 4a1a23ce1b add some error logs to the trash bin app 2013-03-18 12:08:34 +01:00
Jenkins for ownCloud 2a48aa322d [tx-robot] updated from transifex 2013-03-18 00:06:55 +01:00
Jenkins for ownCloud 1427af4a22 [tx-robot] updated from transifex 2013-03-16 22:18:26 +01:00
sherbrecher ec45a8433d Merge remote-tracking branch 'upstream/master' 
Conflicts:
	apps/files_external/templates/settings.php
 2013-03-15 17:50:02 +01:00
Robin Appelman 319e3f162c Don't block uploads if the max upload size is unknown 2013-03-15 16:40:36 +01:00
Robin Appelman 32b8fd8fb7 Improve handeling of unlimited max upload size 2013-03-15 16:31:35 +01:00
sherbrecher d2b3a9fb3b Update settings.php 
fixed overlap of input controls (root cert import)
see issue: https://github.com/owncloud/apps/issues/767
 2013-03-15 15:09:55 +01:00
Björn Schießle 418fb98c40 remove backticks around table names 2013-03-15 12:10:21 +01:00
Björn Schießle e37e884d7a add backtick for db queries to prevent postgresql errors 2013-03-15 12:10:07 +01:00
Björn Schießle 23fe98a562 Merge pull request #2336 from eMerzh/fix_trashpg 
Add backtick for trash app to prevent pg errors
 2013-03-15 03:17:54 -07:00
Frank Karlitschek 92a8676350 Merge pull request #2317 from owncloud/create_version_on_upload 
create new version if the same file is uploaded again over the web interface
 2013-03-15 01:18:20 -07:00
Jenkins for ownCloud 0c123ebf9d [tx-robot] updated from transifex 2013-03-15 00:06:36 +01:00
Brice Maron 1631aa2434 Add backtick for trash app to prevent pg errors 2013-03-15 00:03:37 +01:00
Björn Schießle 285d328ef1 use html video tag to preview videos for public shares 2013-03-14 20:10:21 +01:00
Björn Schießle f78594c0ae fix var name 2013-03-14 17:09:48 +01:00
Björn Schießle 93b2ada6f6 fix var name 2013-03-14 17:08:16 +01:00
Björn Schießle 0cf50d63bf create new version if the same file is uploaded again over the web interface 2013-03-14 16:47:59 +01:00
Jenkins for ownCloud 9a0cb2ccaa [tx-robot] updated from transifex 2013-03-14 00:06:29 +01:00
Bernhard Posselt 7d748a6b06 Merge pull request #2277 from owncloud/fix_sharing_hooks 
listen to the pre delete hook in the sharing app [master]
 2013-03-13 10:15:57 -07:00
Björn Schießle c3ba49f384 Merge pull request #2265 from owncloud/no_share_option_for_shared_folder 
don't add share action to the Shared folder
 2013-03-13 08:23:35 -07:00
Björn Schießle 30831b6b55 we need to listen to the pre delete hook, otherwise the file is already gone 2013-03-13 15:39:39 +01:00
Björn Schießle e5f40ddaae only prevent shared action for the Shared folder in the root dir 2013-03-13 11:33:20 +01:00
Björn Schießle f971ce0b66 let public link download handle json encoded file lists 2013-03-13 11:15:17 +01:00
Jenkins for ownCloud f3a2daaa9d [tx-robot] updated from transifex 2013-03-13 00:06:21 +01:00
Frank Karlitschek 43d15066f9 Merge pull request #2234 from owncloud/fix_ldap_edirectory 
LDAP: compatibility with Novell eDirectory UUID
 2013-03-12 10:21:49 -07:00
Björn Schießle b2da2f769a don't add share action to the Shared folder 2013-03-12 17:28:36 +01:00
Jenkins for ownCloud 569c7ab138 [tx-robot] updated from transifex 2013-03-12 00:14:05 +01:00
Arthur Schiwon 1e07801c95 LDAP: compatibility with Novell eDirectory UUID 2013-03-11 13:30:06 +01:00
Bernhard Posselt 049a4df259 Merge pull request #1786 from owncloud/shared-folder-etags 
Include etags for the root of the shared folder
 2013-03-11 02:38:50 -07:00
Arthur Schiwon 07f88424c8 LDAP: fancy version for release, no code change 2013-03-10 18:34:56 +01:00
Lukas Reschke 3c06020e3e Merge pull request #2217 from owncloud/mountconfig-location 
Store the global mount configuration file in the datadir
 2013-03-10 00:25:10 -08:00
Robin Appelman be4806d031 Store the global mount configuration file in the datadir 2013-03-10 02:25:03 +01:00
Tom Needham dfbf57207d Merge pull request #1584 from owncloud/ocs_multiple_methods 
Allow registering of multiple methods on each api route. Add /cloud/capabilities route.
 2013-03-09 16:59:13 -08:00
Jenkins for ownCloud 6bdb84ab28 [tx-robot] updated from transifex 2013-03-10 00:06:53 +01:00
Tom Needham e58dbd46fc Merge in master 2013-03-09 00:04:33 +00:00
Jenkins for ownCloud 0629ff4dd9 [tx-robot] updated from transifex 2013-03-09 00:06:34 +01:00
Michael Gapczynski e743386acf Fix correctFolders and retrieve the correct storage cache 2013-03-08 14:27:30 -05:00
Lukas Reschke 546fb72b25 Merge pull request #2165 from owncloud/fix_2155 
Offer download of whole shared dir only if it does not exceed zip input ...
 2013-03-08 10:31:48 -08:00
Björn Schießle 02e2f7384e not only files can be reshared but also folders 2013-03-08 17:32:04 +01:00
Michael Gapczynski 20828488bc Fix share hook for updater 2013-03-08 10:59:22 -05:00
Björn Schießle 2d00d13a5d use pre_unshare hook, otherwise the share is already removed. Which means that we have no chance to determine which folder has to be updated 2013-03-08 15:13:00 +01:00
Bernhard Posselt 0525bbd73c Merge pull request #2189 from owncloud/versioning_sync_client 
fix versioning for the sync client - distinguish between touch and write operation
 2013-03-08 03:05:28 -08:00
Björn Schießle 8d26400cb5 remove some debug output; move code to the right function 2013-03-08 11:27:25 +01:00
Björn Schießle 45869afa5a remove debug output 2013-03-08 10:51:28 +01:00
Jenkins for ownCloud 308c85090e [tx-robot] updated from transifex 2013-03-08 00:26:35 +01:00
Michael Gapczynski 4826564344 Merge branch 'master' into shared-folder-etags 
Conflicts:
	apps/files_sharing/lib/sharedstorage.php
 2013-03-07 17:14:34 -05:00
Bernhard Posselt d6bb627a62 Merge pull request #2173 from owncloud/fix-shared-storage 
Fix fetching source path of shared files
 2013-03-07 09:37:36 -08:00
Michael Gapczynski a5cab28bea Fix fetching source path of shared files 2013-03-07 11:12:59 -05:00
Frank Karlitschek 19073e0711 Merge pull request #2167 from owncloud/input-type-fix 
Input type fix
 2013-03-07 07:28:22 -08:00
Michael Gapczynski 4cb5cb9693 itemSource parameter should be fileSource 2013-03-07 10:00:03 -05:00
Björn Schießle 48bb53030c distinguish between touch and write 2013-03-07 15:51:44 +01:00
Arthur Schiwon 2ae1ad23b0 Offer download of whole shared dir only if it does not exceed zip input limit 2013-03-07 15:48:10 +01:00
Jan-Christoph Borchardt 70f0e0a8da Merge pull request #2162 from owncloud/trash_bin_home 
let the home icon link to the files view in the trash bin
 2013-03-07 06:26:15 -08:00
Björn Schießle ba9f5f5885 add dirlisting var to file list 2013-03-07 14:54:59 +01:00
Björn Schießle 3970d1f875 remove debug output 2013-03-07 14:18:27 +01:00
Björn Schießle 4a4f705adc json encode list of files 2013-03-07 14:15:02 +01:00
Björn Schießle dda4c6bf4b no dir parameter needed 2013-03-07 13:51:18 +01:00
Björn Schießle 7188303651 let the home icon link to the files view in the trash bin 2013-03-07 13:48:02 +01:00
Jenkins for ownCloud 97222b1de5 [tx-robot] updated from transifex 2013-03-07 00:16:59 +01:00
Michael Gapczynski 812e306e6e Update Shared folders ETags of users with reshares 2013-03-06 17:33:27 -05:00
Jan-Christoph Borchardt ab7dc76ff1 add type=text to ZIP size field, fix second part of #2097 2013-03-06 12:39:36 +01:00
Bernhard Posselt d9a0d1d23b Merge pull request #2119 from owncloud/fix_ldap_settings 
LDAP: fix settings output thus make settings work again
 2013-03-06 02:32:31 -08:00
Björn Schießle 82990b82a6 Merge pull request #2118 from owncloud/fix_1689 
properly implement displayNamesInGroup in Core and LDAP, fixes #1689
 2013-03-06 00:38:06 -08:00
Arthur Schiwon bce0c3c372 LDAP: move more settings stuff to template file 2013-03-06 08:26:33 +01:00
Michael Gapczynski 771e01af35 Move hook connectors from shared storage to app.php, add post_unshare hook 2013-03-05 21:57:32 -05:00
Michael Gapczynski 4dcbaa1d7b Merge branch 'master' into shared-folder-etags 
Conflicts:
	apps/files_sharing/appinfo/app.php
 2013-03-05 21:54:32 -05:00
Jenkins for ownCloud c1a32b5073 [tx-robot] updated from transifex 2013-03-06 00:08:33 +01:00
Arthur Schiwon 1e5f8b0e20 LDAP: fix settings output thus make settings work again 2013-03-05 23:43:22 +01:00
Arthur Schiwon b5dc8b9ca3 whitespace 2013-03-05 21:25:59 +01:00
Arthur Schiwon 72c293e834 LDAP: implementation of displayNamesInGroup 2013-03-05 21:23:58 +01:00
Arthur Schiwon 055fadd10d LDAP: escape some more chars for proper search filter, fixes #1673 2013-03-05 14:33:20 +01:00
Arthur Schiwon b08894ba77 LDAP: error codes can be negative, too 2013-03-05 13:47:03 +01:00
Tom Needham 370f202251 Rebase to current master 2013-03-05 00:25:56 +00:00
blizzz ef70978524 Merge pull request #2073 from owncloud/trashbin_userHome 
make trashbin work with different user homes
 2013-03-04 04:38:24 -08:00
Björn Schießle 2a5d9ca9c5 damn copy&paste, fix wrong var name 2013-03-04 12:59:48 +01:00
Björn Schießle d23702d324 make trashbin work with different user homes 2013-03-04 12:57:32 +01:00
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