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

5270 commits

Author SHA1 Message Date
Jörn Friedrich Dreyer
606b672a3d always connect file cache updater hooks first 2013-04-16 13:07:55 +02:00
Björn Schießle
01d203c773 add explenation of the expire function to the apps description 2013-04-16 12:31:33 +02:00
Björn Schießle
032c54273c write a info message to the log if a file gets removed from the trash bin automatically 2013-04-16 12:31:22 +02:00
Jenkins for ownCloud
d0b3e8aceb [tx-robot] updated from transifex 2013-04-16 02:17:30 +02:00
Jenkins for ownCloud
e13e4c412f [tx-robot] updated from transifex 2013-04-15 02:12:43 +02:00
Jenkins for ownCloud
7d68cd4040 [tx-robot] updated from transifex 2013-04-14 02:20:35 +02:00
Jenkins for ownCloud
19afc216cf [tx-robot] updated from transifex 2013-04-13 02:15:54 +02:00
Björn Schießle
854b920787 fix some more paths 2013-04-12 15:18:19 +02:00
Björn Schießle
02d1f86a53 fix some confusion about paths relative to the files dir and to the data dir 2013-04-12 14:30:02 +02:00
Björn Schießle
f87229ddaf fix stream wrapper to make initial encryption work 2013-04-12 14:13:38 +02:00
Jenkins for ownCloud
33ee2e2f10 [tx-robot] updated from transifex 2013-04-12 02:11:02 +02:00
Florin Peter
8f0bbdc5cb fix performance issues 2013-04-11 22:55:48 +02:00
Björn Schießle
1b3b766244 cleanup the trash bin tables in the database after a user was deleted 2013-04-11 14:40:06 +02:00
Björn Schießle
544a46c690 remove used space for versions from db is a user was deleted 2013-04-11 14:39:56 +02:00
Jenkins for ownCloud
b02db643d0 [tx-robot] updated from transifex 2013-04-11 02:10:41 +02:00
Björn Schießle
c3a284569b make sure that public-keys dir exists 2013-04-10 16:46:02 +02:00
Björn Schießle
4303d6318e Session expect OC_FilesystemView() 2013-04-10 15:31:19 +02:00
Björn Schießle
fff979a590 add $view as parameter for getFileKey() call 2013-04-10 15:14:44 +02:00
Björn Schießle
98de385b8a add $view as parameter for session constructor 2013-04-10 15:08:28 +02:00
Björn Schießle
48dabd2c14 size of the trash bin could be incorrect, remove it for all users to enforce a recalculation during next usage. 2013-04-10 10:09:37 +02:00
Björn Schießle
16b0855992 only add filesize to trashbin size if the file was moved to the trash bin successfully 2013-04-10 10:09:22 +02:00
Jenkins for ownCloud
c06bc81c79 [tx-robot] updated from transifex 2013-04-10 02:09:39 +02:00
Sam Tuke
109fe198c3 Added info about filesystem method access conventions 2013-04-09 19:19:27 +02:00
Sam Tuke
400cf5beb3 Fixed naming bug of public owncloud key dir, which caused new keypair to be generated on each pageload 2013-04-09 19:11:38 +02:00
Jenkins for ownCloud
5ef389610f [tx-robot] updated from transifex 2013-04-09 02:14:02 +02:00
Jenkins for ownCloud
ccde0212b1 [tx-robot] updated from transifex 2013-04-08 02:18:28 +02:00
Bart Visscher
6d6dfffea7 Merge pull request #2279 from owncloud/refactor_upload_js 
Refactor upload js
 2013-04-06 15:44:08 -07:00
Bart Visscher
248e097f3c Merge pull request #1974 from owncloud/use-rawurlencode 
OC6- Just use rawurlencode in files list template
 2013-04-06 11:55:44 -07:00
Bart Visscher
797b529da7 Merge pull request #2759 from owncloud/fix-2718 
Set file perms to 0640 of mount.json - fixes #2718
 2013-04-06 09:52:22 -07:00
Bart Visscher
46a552fd56 Merge pull request #2738 from Kondou-ger/fix_alert_issues 
Fixed things in alert-messages
 2013-04-06 08:24:43 -07:00
kondou
de2e546617 Translate 'Error' in core 2013-04-06 16:52:55 +02:00
Lukas Reschke
6552996734 Set file perms to 0640 of mount.json - fixes #2718 2013-04-06 13:21:21 +03:00
Jenkins for ownCloud
6798b6dc34 [tx-robot] updated from transifex 2013-04-06 00:05:32 +02:00
root
74b02db337 Fixed things in alert-messages 
Two parameters for OC.dialogs.alert, otherwise one will be "undefined".

Also fixed missing translation.
 2013-04-05 01:56:32 +02:00
Jenkins for ownCloud
c745bfa821 [tx-robot] updated from transifex 2013-04-05 00:22:48 +02:00
Bart Visscher
e824c6cffa Merge pull request #2611 from owncloud/filename-width 
Adds a fixed width to the filename to prevent horizontal scroll.
 2013-04-04 05:32:38 -07:00
Jenkins for ownCloud
cbece8b12f [tx-robot] updated from transifex 2013-04-04 00:06:51 +02:00
Bernhard Posselt
40627a05a8 Merge pull request #2694 from owncloud/fix_2690 
Typo, fixes #2690
 2013-04-03 10:23:34 -07:00
Arthur Schiwon
d44b649d2a Typo, fixes #2690 2013-04-03 17:52:34 +02:00
Jenkins for ownCloud
10e37e1553 [tx-robot] updated from transifex 2013-04-03 00:04:02 +02:00
Jenkins for ownCloud
29d33ff7c2 [tx-robot] updated from transifex 2013-04-02 00:04:27 +02:00
Jan-Christoph Borchardt
f8e48955b9 Merge pull request #2576 from owncloud/fixing-2125-master 
fixes #2125 - the warning is now displayed with a disabled button
 2013-03-31 09:53:07 -07:00
Jenkins for ownCloud
cfd8b911b6 [tx-robot] updated from transifex 2013-03-31 00:03:46 +01:00
Jenkins for ownCloud
5e74ec26a8 [tx-robot] updated from transifex 2013-03-30 00:06:29 +01:00
Sam Tuke
14451bdaf0 Development snapshot; 
Fixed errors from Hooks::login();
Work on enable/disable recoveryAdmin for lost passwords in settings page (template, ajax, js);
Work on fixing sharing files to users (still broken);
 2013-03-29 21:11:29 +01:00
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
Sam Tuke
ff6f52d5ec Merge branch 'master' into files_encryption 
Conflicts:
	apps/files_encryption/hooks/hooks.php
	apps/files_encryption/lib/crypt.php
	apps/files_encryption/lib/keymanager.php
 2013-03-28 18:39:12 +01:00
Sam Tuke
9ecfd07f23 Added ajax scripts for setting pwd recovery preferences 2013-03-28 18:29:18 +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
Björn Schießle
e717f7150e check for dir in deleteFileKey() and delShareKey(), to always handle all share keys and file keys on delete 2013-03-26 16:52:58 +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
Björn Schießle
73157133e8 reuse function provided in util.php 2013-03-26 16:22:26 +01:00
Björn Schießle
6beeb2466f also delete share keys if a different user than the owner deletes a shared file 2013-03-26 16:17:26 +01:00
Thomas Mueller
3817922c93 fixes #2125 - the warning is now displayed with a disabled button 2013-03-26 15:44:35 +01:00
Björn Schießle
b1d620300e delete share keys if file gets deleted 2013-03-26 14:22:18 +01:00
Thomas Mueller
e0e5cb73bf fixes #1461 2013-03-26 14:14:30 +01:00
Björn Schießle
5f233ee814 get the correct paths and owner to access shared files 2013-03-26 12:40:31 +01:00
Björn Schießle
a65d741a3f move getUidAndFilename() tu util.php 2013-03-26 12:39:55 +01:00
Björn Schießle
890f0142a2 get shared keys from new location 2013-03-26 12:24:04 +01:00
Björn Schießle
5995b6996b always call stripUserFilesPath(), we need to keep the Shared/ to find the correct owner of the file later 2013-03-26 12:23:28 +01:00
Björn Schießle
f10be4ea17 new file structure for share keys; sub-folder need to be generated each by one (we don't have a recursive mkdir) 2013-03-26 11:58:54 +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
Sam Tuke
fd4e59b748 Added method for setting user keyfile recovery preference 
Fixed method for checking if keyfile recovery is enabled for a user
Added unit test for above 2 methods
Made proxy{} always use sharing
Made proxy{} work regardless of sharing API enabled or not
Implemented proxy-based sharing to admin if user keyfile recovery is enabled
 2013-03-20 19:26:59 +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
Sam Tuke
c89fd49870 Improved folder creation code 
Created stub method for checking user pwd recovery preference from db
Added pwd recovery column to db
Added comments
 2013-03-19 19:53:15 +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