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

14921 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Petry
5bdfccfc47 Fixed total dirs/files message hiding condition 
Fixes #5829
 2013-11-13 10:53:16 +01:00
Morris Jobke
dc30056025 Merge pull request #5822 from owncloud/delete_hooks_trash_and_versions 
Implement delete hooks for trashbin and filesversions apps.
 2013-11-12 07:03:37 -08:00
Georg Ehrke
49cd5dad24 add trash bin and file versions delete hooks in OC::registerPreviewHooks 2013-11-12 14:08:55 +01:00
Georg Ehrke
238e4bc3eb implement delete hooks in file versions lib 2013-11-12 14:06:32 +01:00
Georg Ehrke
90fac1f371 replace $path with '/files_trashbin/files/' . $file 2013-11-12 14:03:50 +01:00
Georg Ehrke
feee4b865b add delete hook for trash bin app 2013-11-12 14:00:36 +01:00
Morris Jobke
a745901d50 Merge pull request #5810 from owncloud/disbaledtextareas 
Disabled textareas should look like they are disabled
 2013-11-12 02:34:51 -08:00
Morris Jobke
c9517c4fc8 new line for css rule 2013-11-12 11:31:58 +01:00
Thomas Müller
735752f232 Merge pull request #5816 from Wikinaut/patch-1 
Update config.sample.php
 2013-11-12 02:12:06 -08:00
Wikinaut
63952aaeab Update config.sample.php 
/* Enable maintenance mode to disable ownCloud
   If you want to prevent users to login to ownCloud before you start doing some maintenance work, 
   you need to set the value of the maintenance parameter to true. 
   Please keep in mind that users who are already logged-in are kicked out of ownCloud instantly.
*/
 2013-11-12 00:59:35 +01:00
Arthur Schiwon
5c31440dcd Disabled textareas should look like they are disabled 2013-11-11 19:41:51 +01:00
Morris Jobke
808634ac00 Merge pull request #5804 from owncloud/files-selectionsummary 
Selection summary is now displayed properly
 2013-11-11 08:41:53 -08:00
Vincent Petry
e285e84e18 Selection summary is now displayed properly 
Fixes #5775
 2013-11-11 17:14:40 +01:00
Morris Jobke
da20fb7922 Merge pull request #5707 from owncloud/fixwrongfilesizeintests 
Fixed filesize issue in watchr test
 2013-11-11 06:26:38 -08:00
Morris Jobke
43230f11f6 Merge pull request #5769 from owncloud/files-changedirjsevent 
Added JS event for when the user changes the directory
 2013-11-11 06:22:44 -08:00
Morris Jobke
55331479cd Merge pull request #5701 from owncloud/sharing-updateownerfoldersizes 
Fixed watcher to also update the owner's folder sizes
 2013-11-11 06:16:51 -08:00
Jenkins for ownCloud
e431ba5ce8 [tx-robot] updated from transifex 2013-11-11 05:47:59 -05:00
Thomas Müller
841c622085 Merge pull request #5687 from owncloud/fixing-5659-master 
display the exception instead of meaningless message
 2013-11-09 23:14:52 -08:00
Thomas Müller
a8f6a2446c Merge pull request #5759 from owncloud/fixing-5757-master 
adding proper htaccess commands for Apache 2.4
 2013-11-09 23:13:17 -08:00
Jenkins for ownCloud
3428c03b80 [tx-robot] updated from transifex 2013-11-09 01:45:32 -05:00
Thomas Müller
deafac9273 Merge pull request #5763 from owncloud/fixing-sharing-ocs-api-master 
the filesystem has to be initialized once we know the user
 2013-11-08 14:25:08 -08:00
Thomas Müller
b5e013973b implementing solution using <ifModule mod_authz_core> 2013-11-08 17:29:14 +01:00
Jan-Christoph Borchardt
edcf1912b9 Merge pull request #5762 from owncloud/files-uploaderrordelay 
Increased upload error delay to 10 seconds
 2013-11-08 05:36:13 -08:00
Vincent Petry
4998faf343 Added JS event for when the user changes the directory 
This enables apps to detect directory changes which might be caused by
the user using the browser back button.
 2013-11-08 13:16:28 +01:00
Thomas Müller
f93dcc5d77 the filesystem has to be initialized once we know the user 2013-11-08 11:24:19 +01:00
Vincent Petry
c16fbbf386 Increased upload error delay to 10 seconds 
Fixes #5662

Also made it use OC.Notification instead of directly access the
notification HTML element.
 2013-11-08 11:22:08 +01:00
Thomas Müller
9c8b1e1775 adding proper htaccess commands for Apache 2.4 2013-11-08 10:45:35 +01:00
Morris Jobke
4459d964d6 Merge pull request #5747 from owncloud/scanner-post-hooks 
Add post hooks for filesystem scanner
 2013-11-07 12:44:23 -08:00
Vincent Petry
013444813e Now removing stray old cookies from 5.0.12 
Cookies from 5.0.12 seemed to have an extra slash in the path.
Firefox doesn't allow to remove them if the trailing slash isn't
there,
thus making it impossible to logout correctly.

This fix adds extra code to delete such stray cookies.

Ported from stable5 branch 99e5c6f7eb
 2013-11-07 18:49:50 +01:00
Robin Appelman
d6845babd6 Add post hooks for filesystem scanner 2013-11-07 16:22:29 +01:00
Morris Jobke
3e916a9f1d Merge pull request #5737 from owncloud/files-totaldirsnotfoundfix 
Fixed totalDirs JS error
 2013-11-07 05:02:43 -08:00
blizzz
0b1749e581 Merge pull request #5682 from owncloud/fix5585 
LDAP: make buttons on Expert page work again, fixes #5585
 2013-11-07 03:34:49 -08:00
Vincent Petry
bdc75e497b Fixed totalDirs JS error 2013-11-07 10:11:18 +01:00
Jenkins for ownCloud
263603aa4c [tx-robot] updated from transifex 2013-11-06 21:44:36 -05:00
Frank Karlitschek
b9aec16037 ownCloud 6 beta 3 2013-11-06 23:07:26 +01:00
Morris Jobke
a0ee6aef29 Merge pull request #5399 from frisco82/fixDownloadOverQuota 
Do not count the size of shared folder on total
 2013-11-06 13:59:27 -08:00
Vincent Petry
f2eef69047 Merge pull request #5718 from owncloud/fixLdapBgJob 
LDAP: resolve namespace harakiri, fixes background job
 2013-11-06 08:58:29 -08:00
Arthur Schiwon
95a5ff63b8 LDAP: resolve namespace harakiri, fixes background job 2013-11-06 16:25:31 +01:00
Morris Jobke
1fa1cf46bd Merge pull request #5711 from owncloud/quota-refreshquotainclientafteroperations 
Fixes for "max upload size" value showed in the UI
 2013-11-06 06:49:42 -08:00
Vincent Petry
6b6a46589e Merge pull request #5717 from owncloud/files-foldericonforhomestorage 
Fixed folder icon for home storage
 2013-11-06 06:39:48 -08:00
Vincent Petry
5d698b72fc Fixed folder icon for home storage 
Fixes #5713
 2013-11-06 15:11:14 +01:00
Vincent Petry
6e47828b45 Merge pull request #5716 from owncloud/full-name 
change 'Display Name' to more understandable 'Full Name', fix #5612
 2013-11-06 05:25:13 -08:00
Jan-Christoph Borchardt
d62b683c6a change 'Display Name' to more understandable 'Full Name', fix #5612 2013-11-06 14:20:43 +01:00
Ramiro Aparicio
b49530f80b Do not count the size of shared folder on total 
Changed all array access to dot notation

Split comment in a second line
 2013-11-06 13:47:03 +01:00
Arthur Schiwon
8b3da23368 LDAP Wizard: l10ned Save button 2013-11-06 12:40:07 +01:00
Vincent Petry
31181e4348 Fixed storage stats to be based on current directory 
Previously, the storage statistics were always for the root dir.
This means that the upload button would always show the limit for the
root dir, even when uploading to a shared dir or external storage.

This fix adds a "dir" argument to getstoragestats.php.
 2013-11-06 10:55:19 +01:00
Vincent Petry
5d9ab6e7ac Update quota value in client after scan and upload 
After uploading, the quota value wasn't refreshed.
This fix refreshes the quota value after files have been scanned or
uploaded.
 2013-11-06 10:15:05 +01:00
Vincent Petry
da126f1692 Fixed unit tests for files sharing watcher 2013-11-06 09:39:52 +01:00
VicDeo
3e5a5567eb Merge pull request #5692 from miicha/patch-2 
allow empty user-dn and password
 2013-11-05 12:19:27 -08:00
Vincent Petry
9f4fd0161e Added unit tests for shared files watcher 
- Added base class for sharing unit tests
- Added unit tests for shared files watched to check for folder size
  propagation
 2013-11-05 19:30:52 +01:00