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

21895 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lukas Reschke
8c8c257ce3 Merge pull request #12554 from owncloud/versions-app-autoload 
Autoload lib files of versions app
 2014-12-03 09:34:57 +01:00
Morris Jobke
98b28c68a3 add proper description what database is supported by CE and EE 2014-12-03 08:52:59 +01:00
Jenkins for ownCloud
af50df8912 [tx-robot] updated from transifex 2014-12-03 01:54:32 -05:00
Robin Appelman
2bbb11fb63 Merge pull request #10881 from owncloud/touch-statcache 
Clear statcache before getting the mtime from local storage backends
 2014-12-02 23:29:24 +01:00
Olivier Paroz
5990293331 Improve the bitmap and vector mime icons 
* Vector files such as Illustrator files currently show the "image"
icon. I propose to add a new type to mimetypeIcon() called
"image/vector" and which would be used by SVG as well
* We can use the current image-svg+xml icon, but would simply rename it
to image-vector
* The black and white "image" icon looks too much like a settings icon.
A simple picture representation pasted over the file icon should work
 2014-12-02 21:11:56 +01:00
Lukas Reschke
c4e0c02526 Add route for download of versions 
Otherwise on master it was not possible anymore to download older versions.

Fixes itself.
 2014-12-02 17:52:31 +01:00
Morris Jobke
f9958153ef Merge pull request #12333 from owncloud/delete-selected-files 
Fix deleting non deletable files by selecting them
 2014-12-02 17:32:04 +01:00
Joas Schilling
1bd018a70c Autoload exception from files_trashbin 2014-12-02 17:26:42 +01:00
Joas Schilling
694003d147 Autoload lib files of versions app 2014-12-02 17:21:19 +01:00
Robin Appelman
1bbb18fe87 also clear statcache in mapped local 2014-12-02 16:39:03 +01:00
Morris Jobke
a16d1a85ef Merge pull request #11975 from owncloud/Combustible-combustible_dev 
Check imagecreate*() return before using and use logger in \OC_Image
 2014-12-02 16:18:00 +01:00
Morris Jobke
5b3dbb4ef8 add missing public interface for iOS client app id 2014-12-02 16:10:07 +01:00
Bjoern Schiessle
9ca9acf3f8 small fixes 2014-12-02 16:08:06 +01:00
Simon Whittaker
6d04ca18d9 adding @ sign between email address and domain name to make the syntax clearer 2014-12-02 15:06:40 +00:00
Bjoern Schiessle
2e78217f17 delete old keys if file was moved to a different mount point 2014-12-02 16:03:54 +01:00
Bjoern Schiessle
49cfc30359 upgrade to new folder structure 2014-12-02 16:03:54 +01:00
Robin Appelman
ce10b93519 Dont return cached date in shared cache when the file doesn't exist 2014-12-02 15:28:11 +01:00
Robin Appelman
db3f7238dd Clear statcache before getting the mtime from local storage backends 2014-12-02 14:25:49 +01:00
Joas Schilling
9da4a6323d Restore the development config after running the tests 2014-12-02 12:41:33 +01:00
Joas Schilling
a0fea16d56 Allow overwriting DATADIR completly so ramdisk can be used 2014-12-02 12:21:37 +01:00
Joas Schilling
a73023fe05 Allow passing a test file just like in autotest.sh 2014-12-02 12:20:07 +01:00
Joas Schilling
7e47a363ff Better manage the output when running autotest.cmd 2014-12-02 12:19:17 +01:00
Thomas Müller
e9029f94cb Merge pull request #12310 from kampka/master 
Implement a logger to log to error_log
 2014-12-02 09:19:12 +01:00
Christian Kampka
553ce946d3 Implement a logger to log to error_log 2014-12-01 21:20:57 +01:00
Thomas Müller
0769556989 Merge pull request #12419 from owncloud/read-only-config 
Allow read-only configuration
 2014-12-01 16:37:29 +01:00
Thomas Müller
b2175f0e25 Use \OCP\ILogger 2014-12-01 16:21:54 +01:00
Vincent Petry
c02ef69521 Simple Plugin system for Javascript 2014-12-01 16:20:44 +01:00
Byron Marohn
fa9b36b726 Added error check to lib/private/image.php 
This checks that imagecreatetruecolor actually creates an image, rather than returning FALSE.
Without this check, subsequent loop might create billions of ERROR-level log messages.

Signed-off-by: Byron Marohn <combustible@live.com>
 2014-12-01 16:20:17 +01:00
Lukas Reschke
805be635fa Only store user credentials when SMB_OC storage is enabled 
Conflicts:
	apps/files_external/lib/smb_oc.php
 2014-12-01 11:18:29 +01:00
Vincent Petry
8db4dd7585 Merge pull request #12469 from owncloud/issue/12460-port-local-changes2mapped 
Issue/12460 port local changes2mapped
 2014-12-01 10:42:39 +01:00
Morris Jobke
48f00df08e move jstz to bower management 2014-12-01 10:40:31 +01:00
Morris Jobke
fefeb506b2 include lock files of bower to be able to use "bower install" 2014-12-01 10:30:15 +01:00
Lukas Reschke
ffd1fc42e7 Merge pull request #12427 from owncloud/issue/6101-deprecate-namespaced-functions 
Depcrate namespaced functions, since they can not be autoloaded
 2014-12-01 09:38:15 +01:00
Jenkins for ownCloud
5275daff4e [tx-robot] updated from transifex 2014-12-01 01:54:26 -05:00
Adam Williamson
415411a3d5 google: delete original after successful rename 
In GDrive, filenames aren't unique, and directories are just
special files - so you can have multiple files with the same
name, multiple directories with the same name, and even files
with the same names as directories.

OC doesn't handle this at all, though, and just wants to act
as if file and directory names *are* unique. So when renaming,
we must check if there's an existing object with the same
file or directory name before we commit the rename, and
explicitly delete it if the rename is successful. (Other
providers like dropbox do the same for files, but intentionally
don't do it for directories; we really need to do it for
directories too.)

A good way to observe this is to run the storage unit tests
and look at the state of the Drive afterwards. Without this
commit, there will be several copies of all the test files
and directories. After this commit, there's just one of each.

We can't just say "hey, Drive lets us do this, what's the
problem?" because we don't handle multiple-objects, same-name
cases - getDriveFile() just bails and prints an error if it
searches for the file or directory with a given name and gets
multiple results.
 2014-11-30 15:34:35 -08:00
Morris Jobke
6fa748621f Merge pull request #12398 from oparoz/patch-5 
You can only change the oritentation of a JPEG
 2014-11-30 10:32:51 +01:00
Jenkins for ownCloud
40badba703 [tx-robot] updated from transifex 2014-11-30 01:54:25 -05:00
Jenkins for ownCloud
83d097c524 [tx-robot] updated from transifex 2014-11-29 01:54:28 -05:00
Lukas Reschke
ebb243344a Merge pull request #12499 from owncloud/disableMSSQL 
Disable MSSQL and OCI for new CE installations
 2014-11-28 18:38:34 +01:00
Lukas Reschke
f0e6876f2e Merge pull request #12488 from owncloud/activity_group_multiple_conditions 
activitymanager: concatenate queries with 'or'
 2014-11-28 17:35:05 +01:00
Lukas Reschke
18b6fc9332 Adjust sample config 2014-11-28 16:58:09 +01:00
Lukas Reschke
9a8dc4a832 Disable OCI as it is unsupported by most CE apps 2014-11-28 16:23:03 +01:00
Lukas Reschke
f3e75c085c Disable MSSQL for new CE installations 
Since automatic schema migrations are not yet possible let's disable this for now.
 2014-11-28 16:08:38 +01:00
Bjoern Schiessle
bf2c9be066 concatenate queries with 'or' 2014-11-28 14:46:27 +01:00
Lukas Reschke
2c157da1c2 Merge pull request #12486 from owncloud/activity_priorities 
add activity priorities to core so that other apps can reuse it
 2014-11-28 14:40:27 +01:00
Lukas Reschke
b3afc98f82 Merge pull request #12483 from owncloud/issue/6101-preview-providers 
Issue/6101 Autoload preview providers
 2014-11-28 13:43:41 +01:00
Thomas Müller
7c96cedd25 Merge pull request #12489 from owncloud/skip-sendpassword-email-test-windows 
Skip lostcontroller sending email test on windows
 2014-11-28 12:41:53 +01:00
Joas Schilling
9cfae2ed44 Skip lostcontroller sending email test on windows 2014-11-28 11:38:22 +01:00
Bjoern Schiessle
00ad7d48c7 add activity priorities to core so that other apps can reuse it 2014-11-28 10:37:16 +01:00
Vincent Petry
154628daf4 Merge pull request #12432 from owncloud/nosqlite 
Add notes that SQLite is CE only
 2014-11-28 10:19:15 +01:00