Georg Ehrke
|
f2702ff1ca
|
Merge master into oc_preview
|
2013-08-19 11:24:17 +02:00 |
Björn Schießle
|
9be836814c
|
Merge pull request #4239 from owncloud/decrypt_files_again
Enable user to decrypt files again after encryption app was disabled
|
2013-08-18 09:51:48 -07:00 |
kondou
|
9e8a6b704d
|
Add _many_ newlines at the end of files
|
2013-08-18 11:06:59 +02:00 |
Bjoern Schiessle
|
cabe92ef12
|
Merge branch 'master' into decrypt_files_again
Conflicts:
apps/files_encryption/tests/keymanager.php
|
2013-08-17 13:15:22 +02:00 |
Bjoern Schiessle
|
53bb89824d
|
check if some encrypted files are left after the app was disabled and warn the user
|
2013-08-12 17:25:27 +02:00 |
Georg Ehrke
|
af983b843d
|
fix merge conflicts
|
2013-08-05 14:27:38 +02:00 |
Bjoern Schiessle
|
9253627327
|
cancel sharing if some users doesn't have a working encryption set-up.
|
2013-08-01 13:04:55 +02:00 |
Thomas Müller
|
17c36b5074
|
fixes #4026
|
2013-07-30 10:26:42 +02:00 |
Thomas Müller
|
7425efade7
|
Merge branch 'master' into oc_preview
Conflicts:
3rdparty
lib/template.php
|
2013-07-30 00:34:36 +02:00 |
Georg Ehrke
|
1e4ec2ac27
|
add class='preview-icon' to rows in file app that make use of previews
|
2013-07-29 15:47:17 +02:00 |
Robin Appelman
|
1b50154c95
|
functions in OCP should be static
|
2013-07-25 15:25:17 +02:00 |
Jörn Friedrich Dreyer
|
cb4cf3e2f7
|
need to use \OC_Image to escape OCP namespace
|
2013-07-22 17:25:55 +02:00 |
Robin Appelman
|
d509a0c403
|
return result from getL10N
|
2013-07-22 15:52:02 +02:00 |
Bart Visscher
|
9bf12da750
|
Merge pull request #3880 from owncloud/code-checker
Add classes replaced by the public api to the code checker
|
2013-07-21 11:19:20 -07:00 |
Morris Jobke
|
05c83a163a
|
add proper deprecated tag
|
2013-07-21 10:30:00 +02:00 |
Jan-Christoph Borchardt
|
48267b6e6c
|
add back public API function, but mark as deprecated
|
2013-07-20 01:15:12 +02:00 |
Bart Visscher
|
cbe1c22b5f
|
Correct casing of OC_User and pass through the params to getUsers
|
2013-07-19 17:32:31 +02:00 |
Bart Visscher
|
a22940d3cd
|
Add OC_L10N to public api
|
2013-07-19 11:40:11 +02:00 |
Bart Visscher
|
9379cbf602
|
Add OC_Image to public api
|
2013-07-19 11:23:47 +02:00 |
Jan-Christoph Borchardt
|
48948ccf5f
|
finally remove the file size obfuscation as it had more disadvantages. I was wrong, sorry.
|
2013-07-18 22:15:26 +02:00 |
icewind1991
|
3abe68176f
|
Merge pull request #3270 from owncloud/convert-oc_config
Convert OC_Config to object so it can be used for DI
|
2013-07-11 18:21:08 -07:00 |
Georg Ehrke
|
53830f2f75
|
implement use of previews in sharing app
|
2013-07-11 11:58:52 +02:00 |
Georg Ehrke
|
a357e5b284
|
merge conflicts ...
|
2013-07-10 12:41:53 +02:00 |
Victor Dubiniuk
|
5a3fce12a4
|
Implement encodePath
|
2013-07-09 17:46:11 +03:00 |
Michael Gapczynski
|
4feff3456b
|
Only emit permissions hook for files and and include path
|
2013-07-08 17:28:18 -04:00 |
Bart Visscher
|
52553c64ed
|
Merge branch 'master' into convert-oc_config
Conflicts:
lib/config.php
|
2013-07-08 17:59:50 +02:00 |
Michael Gapczynski
|
5c2a0325ba
|
Add update permissions hook to sharing
|
2013-07-08 11:40:10 -04:00 |
Thomas Müller
|
98da4bf704
|
removing unused getSharedItem()
|
2013-07-06 00:04:01 +02:00 |
Thomas Müller
|
dad91c156f
|
Merge branch 'master' into fixing-3942-master
Conflicts:
apps/files/ajax/upload.php
|
2013-07-06 00:02:11 +02:00 |
Thomas Müller
|
e159cbf527
|
on reshares we now recursively move to the root of all reshares - therefore some code has been refactured and added as a new public function
|
2013-07-05 17:39:41 +02:00 |
Thomas Müller
|
352c1415be
|
proper fix for getting the shared item if no user is logged in
|
2013-07-05 13:45:21 +02:00 |
Bart Visscher
|
ad9458e85d
|
Merge branch 'master' into convert-oc_config
Conflicts:
lib/config.php
|
2013-07-04 18:23:47 +02:00 |
Björn Schießle
|
6cfa016c39
|
add public api
|
2013-07-04 10:11:55 +02:00 |
Thomas Müller
|
bb07dde988
|
Merge branch 'master' into convert-oc_config
|
2013-07-01 23:43:00 +02:00 |
Jörn Friedrich Dreyer
|
f3c4a37a78
|
Merge pull request #3832 from owncloud/oracle_sql_fixes
for oracle use BITAND() instead of & in sharing permissions sql
|
2013-06-28 10:22:59 -07:00 |
Bart Visscher
|
6ad7a0336f
|
Oracle doesn't know & as bitwise AND
Conflicts:
lib/public/share.php
|
2013-06-28 15:48:49 +02:00 |
Bart Visscher
|
c6bbccc776
|
Merge branch 'master' into convert-oc_config
Conflicts:
lib/config.php
lib/setup.php
|
2013-06-27 17:54:17 +02:00 |
Jörn Friedrich Dreyer
|
5d51118cb2
|
fix type of numeric columns
|
2013-06-26 20:03:24 +02:00 |
Jörn Friedrich Dreyer
|
bf49edde6b
|
check item id is set
|
2013-06-26 19:57:28 +02:00 |
Georg Ehrke
|
39c387eed4
|
implement server side use of previews
|
2013-06-26 18:04:22 +02:00 |
Jörn Friedrich Dreyer
|
b32d6d8487
|
for oracle use BITAND() instead of & in sharing permissions sql
|
2013-06-24 22:52:01 +02:00 |
Georg Ehrke
|
1a933a9173
|
Merge branch 'master' into oc_preview
|
2013-06-17 12:31:02 +02:00 |
Jörn Friedrich Dreyer
|
961a001af3
|
add missing backticks, use executeAudited in post_deleteGroup and post_removeFromGroup
|
2013-06-14 12:18:20 +02:00 |
Jörn Friedrich Dreyer
|
124f34422c
|
add missing backticks all over the place
|
2013-06-10 09:53:29 +02:00 |
Georg Ehrke
|
85ecec8b01
|
Merge branch 'master' into oc_preview
|
2013-06-06 11:13:55 +02:00 |
Michael Gapczynski
|
1c61732193
|
Merge branch 'master' into convert-oc_config
|
2013-06-03 18:06:13 -04:00 |
Jörn Friedrich Dreyer
|
96b1e54d4a
|
Merge pull request #3444 from owncloud/share-fix
Fix undefined index for share mount point retrieval
|
2013-06-03 11:35:06 -07:00 |
Robin Appelman
|
251527c6e6
|
merge master into backgroundjob
|
2013-06-02 20:12:44 +02:00 |
Florin Peter
|
1337f48d64
|
fixes for pgsql
|
2013-05-29 20:41:07 +02:00 |
Florin Peter
|
f1b884aa5d
|
changed deprecated class
|
2013-05-29 20:15:04 +02:00 |