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

15115 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
408ce91b25 Merge pull request #5768 from owncloud/quota-workaroundwhenmissingrootsize-home-only 
Do not use -1 as the size for the root folder of the home storage
 2013-11-13 05:57:16 -08:00
Morris Jobke
ac0e87b1cc Merge pull request #5831 from owncloud/files-charatissue 
Fixed total dirs/files message hiding condition
 2013-11-13 05:22:48 -08:00
Bjoern Schiessle
222fa88eec Merge branch 'master' into encryption_fixes 2013-11-13 12:11:12 +01:00
Vincent Petry
3fa651f2b1 Merge pull request #5447 from owncloud/fixing-5117-master 
No data corruption duriing parallel upload
 2013-11-13 02:59:34 -08:00
Vincent Petry
5bdfccfc47 Fixed total dirs/files message hiding condition 
Fixes #5829
 2013-11-13 10:53:16 +01:00
Tom Needham
17e45e2002 Pick any none 100 status code before defaulting to 100 2013-11-13 00:45:49 +00:00
Thomas Tanghus
ec51825d31 Use dedicated OC_Image loader methods 
This prevents excessive logging and disk access
 2013-11-13 00:36:42 +01:00
Bjoern Schiessle
dd0ebcede2 fixPartialFilePath() is now stripPartialFileExtension() 2013-11-12 18:48:31 +01:00
Vincent Petry
34c92f6656 Now using HomeStorage for legacy home storage ids 
Legacy home storage ids with the format "local://path/to/datadir/user1"
are now also wrapped by the HomeStorage.
 2013-11-12 18:01:02 +01:00
Bjoern Schiessle
77429c28fd rename fixPartialFilePath() to stripPartialFileExtension(), this name describes better what the method actually does 2013-11-12 16:48:24 +01:00
Vincent Petry
1a65e3a725 Now calling parent method when path is not root 2013-11-12 16:15:44 +01:00
Robin Appelman
32a703ab36 Do not use -1 as the size for the root folder of the home storage 2013-11-12 16:15:43 +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
Bjoern Schiessle
e2fb8d7128 only update file cache if the file is already indexed to avoid that we create a incomplete file cache entry 2013-11-12 15:55:59 +01:00
Bjoern Schiessle
894856ce01 make sure that we keep the correct timestamp and etag after encryoption/decryption 2013-11-12 15:51:51 +01:00
Robin Appelman
abc428916c Fix fatal error when trying to open a non existing public link 2013-11-12 15:38:00 +01: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
Oliver Gasser
53f17a71d1 treat numeric as an alias for decimal 2013-11-12 13:55:20 +01:00
Oliver Gasser
4b01eaf6cc changed type to decimal 2013-11-12 13:47:47 +01:00
Morris Jobke
9c1c8d57f0 fix DB schema test - no default value 2013-11-12 13:45:28 +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
Oliver Gasser
95b3eb2c75 Add DB tests for default numeric 
Add a table with a numeric column and an empty default directive.
 2013-11-12 11:27:57 +01:00
Bjoern Schiessle
fcbb5d6cb3 missed some replacements... now tests should work 2013-11-12 11:17:34 +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
Bjoern Schiessle
9f10f15fd4 fixing tests for the new part file handling 2013-11-12 10:24:10 +01: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
Arthur Schiwon
550f2d0089 LDAP Wizard: make UI behaviour more consistent and more pleasant when determining Base DN 2013-11-11 19:27:38 +01:00
Arthur Schiwon
082357a670 LDAP Wizard: remove ugly whitespace where it should not be 2013-11-11 19:25:20 +01:00
Morris Jobke
913cde816f Fix spacing issue for checkboxes, vertically center checkboxes on personal page 2013-11-11 18:03:57 +01:00
Bart Visscher
dcca887f18 Don't set a default value when there isn't a default specified 2013-11-11 17:58:25 +01:00
Robin Appelman
a2015ee065 Use View::copy and View::rename when copying or renaming files in the shared storage 2013-11-11 17:58:20 +01:00
Bart Visscher
c5cd0b2d26 Add some more indexes to tables to improve db queries 2013-11-11 17:57:17 +01:00
Bjoern Schiessle
802213f7ec let encryption app detect transfer id in path and handle it correctly 2013-11-11 17:47:59 +01:00
Bjoern Schiessle
68f3f2e691 make it possible to detect transferID part 2013-11-11 17:47:46 +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
Vincent Petry
99ee95d46c Added missing escaping 2013-11-11 15:41:03 +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
Arthur Schiwon
da61c6ef72 LDAP Wizard: determine port without credentials. don't hide the port input field 2013-11-11 15:16:54 +01: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
Arthur Schiwon
ea9f392f4e LDAP Wizard: improve check for Agent DN and Credentials 2013-11-11 13:36:28 +01:00
Jenkins for ownCloud
e431ba5ce8 [tx-robot] updated from transifex 2013-11-11 05:47:59 -05:00
Oliver Gasser
b278356eb9 DB: Set correct default value for numeric types 
Set 0 as default value for columns with numeric data type instead of the
empty string ''. Otherwise the database complains about an invalid
default value for this column.

To reproduce put the following in your ````appinfo/database.xml````:

````
<field>
        <name>modified</name>
        <type>decimal</type>
        <default/>
        <notnull>true</notnull>
        <length>15</length>
</field>
````

See owncloud/mozilla_sync#14
 2013-11-10 14:15:33 +01:00
Vincent Petry
df288605d4 Fixed undefined variable error when using avconv 2013-11-10 11:46:46 +01:00