Georg Ehrke
d9e8ebabdc
outsource sharing and deleted files previews to apps
2013-08-19 13:24:07 +02:00
icewind1991
d7dde3cfbc
Merge pull request #4467 from owncloud/storage-wrapper-quota
...
Move quota logic from filesystem proxy to storage wrapper
2013-08-19 03:38:55 -07:00
Georg Ehrke
48f0c54261
style fixes for preview lib
2013-08-19 12:16:55 +02:00
Robin Appelman
c5402f4575
use strict equals in readdir loops to prevent issues with '0' files
2013-08-19 12:04:53 +02:00
Arthur Schiwon
0f7fad7166
return only existing users in group
2013-08-19 11:48:21 +02:00
Georg Ehrke
f2702ff1ca
Merge master into oc_preview
2013-08-19 11:24:17 +02:00
Jörn Friedrich Dreyer
89c928c3be
replace ' ' with '%20' in urls for curl
2013-08-19 11:09:55 +02:00
Morris Jobke
a1d5aba5fd
Merge pull request #4509 from owncloud/add-odf-templates-master
...
adding file templates for ods, odt and odp
2013-08-19 01:54:54 -07:00
Thomas Müller
0890a915b3
adding file templates for ods, odt and odp
2013-08-18 21:11:11 +02:00
Thomas Müller
6c518797ef
fixing require path
2013-08-18 19:14:14 +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
Christopher
c620c5840a
Merge pull request #4498 from owncloud/uploadprogress-near-uploadbutton
...
move upload progress bar near upload button, more contextual
2013-08-18 09:30:47 -07:00
kondou
7c296a6cf9
Move .errormsg from settings-css to .warning in core. Reusable!
2013-08-18 17:37:22 +02:00
Kondou
c7af26ec84
Merge pull request #4497 from owncloud/newlines_at_eof_kondou
...
Add newlines at the end of files
2013-08-18 07:16:15 -07:00
Thomas Tanghus
3366bbeb8a
Port DAV groupMemberSet fix to master #4458
2013-08-18 15:54:56 +02:00
Kondou
141d2f67aa
Merge pull request #4496 from owncloud/fixing-error-page-layout-master
...
fixing error page layout
2013-08-18 06:46:48 -07:00
kondou
db424cc86b
Use appitem instead of always recreating a jquery object
...
Also fix some wrong data storages
2013-08-18 14:49:11 +02:00
kondou
9f4bd7cb47
Don't use an alert for displaying app-mgmt-errors
...
Rather display a dominant div and mark the problematic app in the applist.
Fix #305
2013-08-18 13:49:34 +02:00
Markus Goetz
ba430a7dfa
Merge pull request #4485 from guruz/class_autoloader_optimization
...
Class Auto Loader: Cache paths in APC
2013-08-18 03:32:13 -07:00
Markus Goetz
aba64a0b81
Class Auto Loader: Cache paths in APC
...
Using benchmark_single.php (from administration repo) I can
measure a speed improvement of 5% to 20% loading the /index.php
when logged in. (when using APC and php-fpm).
2013-08-18 12:29:43 +02:00
Bart Visscher
eb97818519
Merge pull request #4483 from owncloud/compare-true-false
...
Compare result are already true/false
2013-08-18 03:26:35 -07:00
kondou
c741a25eaa
Merge branch 'master' into improve_app-management
2013-08-18 12:15:22 +02:00
Bart Visscher
dda5eb2530
Merge pull request #4486 from owncloud/ldap_adjust_cache
...
LDAP: use memcache if available
2013-08-18 02:50:41 -07:00
Robin Appelman
d8c71ba734
merge master in storage-wrapper-quota
2013-08-18 11:34:56 +02:00
Bjoern Schiessle
d544a371bf
revert changes to 3rdparty submodule reference
2013-08-18 11:31:25 +02:00
Jan-Christoph Borchardt
dce7cdaaec
remove unneeded extra ID selectors
2013-08-18 11:27:51 +02:00
Bjoern Schiessle
1be11bb03d
don't change the etags if a file gets encrypted/decrypted to avoid that the sync client downloads all files again
2013-08-18 11:21:01 +02:00
Jan-Christoph Borchardt
bf4efd5290
move upload progress bar near upload button, more contextual
2013-08-18 11:18:16 +02:00
Owen Winkler
c427e256e1
Merge pull request #4493 from owncloud/fixing-initL10n-master
...
fixing undefined js error
2013-08-18 02:18:04 -07:00
Owen Winkler
1793ec1d5d
Fixed inconsistent spacing.
2013-08-18 05:17:28 -04:00
kondou
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
Owen Winkler
9840363488
Break long lines into smaller ones.
2013-08-18 05:03:20 -04:00
Jan-Christoph Borchardt
ce9103d522
Merge pull request #4426 from owncloud/ldap_settings_design
...
Ldap settings design
2013-08-18 01:52:51 -07:00
Thomas Müller
3d760222d4
fixing error page layout
2013-08-18 10:30:21 +02:00
kondou
edd92e4c09
Merge branch 'master' into fix_jslint_kondou
...
Conflicts:
apps/files/js/file-upload.js
2013-08-18 00:38:52 +02:00
Andreas Fischer
4bb0e1567b
Use boolean casting for bitwise and result.
2013-08-17 23:41:37 +02:00
Andreas Fischer
4f462e9b6f
Add trailing comma for all touched array lines.
2013-08-17 23:39:26 +02:00
Andreas Fischer
d38929fb10
Fix spacing of all touched lines.
2013-08-17 23:38:26 +02:00
Thomas Müller
15c9a0f405
fixing undefined js error
2013-08-17 19:24:06 +02:00
Thomas Müller
727a191021
update 3rdparty submodule - timepicker removed
2013-08-17 18:54:08 +02:00
Thomas Müller
e22a4aba47
update 3rdparty submodule
2013-08-17 18:47:41 +02:00
Thomas Müller
c5cea47ab2
3rdparty submodule update: getid3 removed
2013-08-17 18:37:45 +02:00
Thomas Müller
b82c8bf9e6
update 3rdparty - openid moved
2013-08-17 18:33:44 +02:00
Thomas Müller
7575186fa6
moving Dropbox and smb4php 3rdparty code over to the apps
2013-08-17 18:20:20 +02:00
Thomas Müller
b4cc79970d
update 3rdparty submodule
2013-08-17 18:17:49 +02:00
Thomas Müller
12f4494de0
Merge pull request #4339 from owncloud/mimetype-defaults
...
Add the option to provide templates for newly created files
2013-08-17 08:42:49 -07:00
Arthur Schiwon
f41c4312ff
LDAP: use memcache if available
2013-08-17 17:22:54 +02:00
Morris Jobke
6ae6dc00e5
Merge pull request #4427 from owncloud/fix_4425
...
use OC files API to create missing directory
2013-08-17 08:09:07 -07:00
Kondou
a1128aadd0
Merge pull request #4482 from owncloud/remove_cancel_button_filepicker
...
Remove cancel button from filepicker
2013-08-17 06:58:34 -07:00
Bjoern Schiessle
f28f528431
switched to dirname()
2013-08-17 13:49:42 +02:00