Jan-Christoph Borchardt
0b78db4750
fix disabled buttons not showing icons
2013-10-04 20:21:36 +03:00
Bart Visscher
21cbef0d2c
passesCSRFCheck added to OCP\IRequest
2013-10-04 18:13:04 +02:00
Bart Visscher
61a9098b7d
Add Helper and URLGenerator interfaces to server container
2013-10-04 18:11:02 +02:00
Bart Visscher
ce9436c051
OC_Defaults is only used in error reporting
2013-10-04 18:11:02 +02:00
Bart Visscher
9f777fba98
Add L10N interface to server container
2013-10-04 18:11:02 +02:00
Bart Visscher
bae121b16d
Merge pull request #5068 from owncloud/improved_request
...
Improved request
2013-10-04 09:05:20 -07:00
Vincent Petry
0736bfb43a
Do not call changeDirectory() when no dir set on breadcrumb
...
Some apps like the files_trashbin app do not set a directory on its
"home" breadcrumb link.
This fix makes sure that the click event doesn't do anything in that
case and lets the browser open the link.
This fixes the "home" icon in the trashbin app which now correctly
reopens the files app.
2013-10-04 17:49:42 +02:00
Bjoern Schiessle
fd34c969d2
increase version number to trigger db update
2013-10-04 17:41:23 +02:00
Thomas Tanghus
f19a236c8e
Remove obsolete files.
2013-10-04 17:24:28 +02:00
Thomas Tanghus
12bb197028
JS version of the OCP\ITags interface
2013-10-04 17:21:52 +02:00
ringmaster
85f63d4f77
Allow "Finishing..." button on setup page to be translated.
...
Fixes #5130 .
2013-10-04 11:09:59 -04:00
Victor Dubiniuk
ef65037211
Make mimetypes static. Jenkis will be happy
2013-10-04 18:09:42 +03:00
Bjoern Schiessle
401740166b
add comments
2013-10-04 16:50:53 +02:00
Jan-Christoph Borchardt
0c53269b5e
remove specific border-radius for .primary button as it should be specific to log in instead
2013-10-04 17:37:20 +03:00
Jan-Christoph Borchardt
da0db7bcb2
fix multiselect bar opacity, webroot
2013-10-04 17:32:06 +03:00
Björn Schießle
2cdf54b77d
Merge pull request #4877 from owncloud/ocs_share_api
...
OCS Share API
2013-10-04 07:10:21 -07:00
Jan-Christoph Borchardt
041837de2c
merge master into input-simplify
2013-10-04 17:08:34 +03:00
Victor Dubiniuk
65750cb244
Load all mimetypes in one go
2013-10-04 16:17:19 +03:00
Björn Schießle
7337b34110
Merge pull request #5085 from owncloud/versioning_preview
...
add previews to versions dialog
2013-10-04 06:13:54 -07:00
Bjoern Schiessle
54dd91b859
remove hover effect from preview image
2013-10-04 15:13:05 +02:00
Vincent Petry
48a4c67d48
Merge pull request #5087 from owncloud/templatefunction-relativedate
...
Added dateOnly argument to relative_modified_date
2013-10-04 05:53:13 -07:00
Vincent Petry
f3594904c2
Removed $fromTime argument from public template API
2013-10-04 14:45:12 +02:00
Björn Schießle
b8f2adc7c1
Merge pull request #5121 from owncloud/shareapi-syntaxerror
...
Fixed array syntax to work with PHP 5.3
2013-10-04 05:32:56 -07:00
Bjoern Schiessle
2e7f481e6b
update tests
2013-10-04 14:32:15 +02:00
Vincent Petry
ba0f2f10a7
Merge pull request #4933 from owncloud/1376-filesappplussigninurlbug
...
Replace plus sign with space in files app URL #4932
2013-10-04 05:30:30 -07:00
Vincent Petry
e257c3f27c
Fixed array syntax to work with PHP 5.3
...
It seems that array brackets are only supported starting with PHP 5.4.
Fixed the array brackets to be compatible and not cause a syntax error
in PHP 5.3.
2013-10-04 14:28:11 +02:00
Morris Jobke
2cfb5fb2d2
vertical align versions text
2013-10-04 14:13:48 +02:00
Thomas Müller
aebc330f26
Merge branch 'master' into fixing-4011-master
2013-10-04 14:06:42 +02:00
Markus Goetz
800bf0769f
Merge pull request #5091 from guruz/webdav_connector_use_cache_for_etag
...
DAV: Use fileinfo_cache for ETag
2013-10-04 04:27:28 -07:00
Björn Schießle
31d5565a18
Merge pull request #4689 from owncloud/sharing_mail_notification_master
...
send mail notification if a file was shared to a user/group
2013-10-04 04:06:37 -07:00
Bjoern Schiessle
51295e9a6b
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
apps/files/index.php
apps/files/templates/index.php
2013-10-04 12:30:49 +02:00
Bjoern Schiessle
a223cf769a
Merge branch 'sharing_mail_notification_master' of github.com:owncloud/core into sharing_mail_notification_master
...
Conflicts:
core/ajax/share.php
2013-10-04 12:27:18 +02:00
Bjoern Schiessle
304803d102
fix array_diff call
2013-10-04 12:23:40 +02:00
Bjoern Schiessle
dd2bf69152
use true/false instead of yes/no for publicUpload and subfiles parameter
2013-10-04 12:16:47 +02:00
Bjoern Schiessle
a1fe5148b5
use always path as parameter to specify a file/folder
2013-10-04 12:10:11 +02:00
Thomas Müller
514d7a884a
Merge pull request #5107 from owncloud/user_skeleton
...
make it possible to prepopulate a new user home with a skeleton
2013-10-04 02:57:17 -07:00
Arthur Schiwon
0c837cefb6
LDAP: allow different UUID attributes for groups and users
2013-10-04 11:47:40 +02:00
Morris Jobke
c38638fdf4
Merge pull request #4815 from owncloud/ldap_improve_testing
...
LDAP modularization and tests
2013-10-04 02:41:06 -07:00
Björn Schießle
5b7f76e702
Merge pull request #4691 from owncloud/encryption_improved_error_messages_4617
...
Encryption improved error messages
2013-10-04 02:28:18 -07:00
Björn Schießle
1992450b32
Merge pull request #4902 from owncloud/repeat_recovery_password
...
let user repeat the recovery key password to prevent typos
2013-10-04 02:23:01 -07:00
Vincent Petry
9d2595a7c5
Shortened notification message that was too long
...
The message for invalid private key was too long and didn't fit in the
notification box. This fix reduces the message to fit properly by
removing the extra information.
2013-10-04 11:11:24 +02:00
Bjoern Schiessle
b7c3af11bf
fix hidden fieled name
2013-10-04 10:46:55 +02:00
Bjoern Schiessle
47f59d2e42
we don't know \OCA\Encryption\Session if the encryption app is not enabled, so we have to set the status manually
2013-10-04 10:37:58 +02:00
Frank Karlitschek
566d826a9e
add a real examplefile instead of an .gitignore which is a bit stupid here
2013-10-04 10:21:33 +02:00
Morris Jobke
ecd2bf2a55
Merge pull request #5109 from owncloud/controls-bar-height
...
Controls bar height
2013-10-04 01:01:54 -07:00
Frank Karlitschek
47666796a7
ups. remove debug
2013-10-04 09:42:38 +02:00
Frank Karlitschek
e49ee47e7b
use Filesystem::isIgnoredDir
2013-10-04 09:28:46 +02:00
Frank Karlitschek
f0a98cc923
fix typo
2013-10-04 09:25:54 +02:00
Frank Karlitschek
6d95436695
add public static
2013-10-04 09:24:07 +02:00
Morris Jobke
889a09c8fe
Merge pull request #5100 from owncloud/autotest-backupconfig
...
Added backup for config.php in autotest.sh script
2013-10-03 23:47:27 -07:00