372a73d43a
Merge pull request #5184 from owncloud/fix-trash-bin-button
...
Fix trash bin button
2013-10-07 10:58:47 -07:00
c655eec3d1
[tx-robot] updated from transifex
2013-10-07 12:21:38 -04:00
980fc9cc7e
Fix trash bin button
2013-10-07 18:15:23 +02:00
a3d0e29aa5
Merge pull request #5178 from owncloud/sharing-ispublicflagintemplate
...
Added isPublic flag in files_sharing template
2013-10-07 08:23:55 -07:00
d8b7e42fc1
Merge pull request #4921 from owncloud/file_conflicts_dialog_fixes
...
File conflicts dialog fixes
2013-10-07 08:19:40 -07:00
6a36d7fa86
Added isPublic flag in files_sharing template
...
To make it possible for apps to find out whether they are running in
public mode, the flag "isPublic" will now be present in the DOM.
This is required to disable the editor app in public mode to fix #5059
2013-10-07 16:59:57 +02:00
193e815133
Merge pull request #5165 from owncloud/files-dropontobreadcrumbfix
...
Fix breadcrumb to reinit dnd after ajax nav #5064
2013-10-07 05:01:02 -07:00
4ccbace68d
remove double uri encoding
2013-10-07 11:15:58 +02:00
0683372200
canceling individual uploads is currently impossible because there is no placeholder
2013-10-07 11:14:11 +02:00
3be8e3f8d3
remove obsolete comment
2013-10-07 11:14:11 +02:00
8899543b7f
use !== comparison
2013-10-07 11:14:10 +02:00
6a4563f203
Fix breadcrumb to reinit dnd after ajax nav #5064
...
Now correctly reinitializing the breadcrumb drop zone after ajax
navigation.
This also fixes dropping onto the "files" app icon.
2013-10-07 11:07:33 +02:00
981608cf6b
Merge pull request #5129 from owncloud/remove_deleted_shares_from_db
...
remove deleted files from oc_share
2013-10-07 02:07:11 -07:00
288f01bf62
catch exception if db query execution fails
2013-10-07 11:06:24 +02:00
4f67b7a6c3
Merge branch 'master' into remove_deleted_shares_from_db
2013-10-07 11:00:56 +02:00
0346167bb2
clean up oc_share table from files which are no longer exists
2013-10-07 10:59:09 +02:00
46fdb449a4
Merge pull request #4662 from owncloud/fix-4129
...
Fix 4129
2013-10-06 23:42:44 -07:00
3613e79e10
[tx-robot] updated from transifex
2013-10-06 19:16:10 -04:00
5470700c9a
Update file to meet coding standarts
2013-10-07 01:08:39 +02:00
72ad309920
Actually test the connection
2013-10-07 01:08:38 +02:00
b9a948b597
Fixes #4129
2013-10-07 01:08:38 +02:00
e1e16ec3b0
Merge pull request #5088 from owncloud/fix_trashbin_button
...
trash bin button needs to be an input field
2013-10-06 14:51:08 -07:00
2b521327c0
more elegant style for Personal and Admin settings
2013-10-05 11:23:49 +02:00
cc1e69c190
Merge pull request #5136 from owncloud/design-fixes
...
Design fixes
2013-10-04 14:56:09 -07:00
a927c145be
Merge pull request #5102 from owncloud/input-simplify
...
Input simplify
2013-10-04 10:40:32 -07:00
fcb9b49d1f
increase font size of file actions for better readability
2013-10-04 20:25:18 +03:00
401740166b
add comments
2013-10-04 16:50:53 +02:00
da0db7bcb2
fix multiselect bar opacity, webroot
2013-10-04 17:32:06 +03:00
2cdf54b77d
Merge pull request #4877 from owncloud/ocs_share_api
...
OCS Share API
2013-10-04 07:10:21 -07:00
041837de2c
merge master into input-simplify
2013-10-04 17:08:34 +03:00
7337b34110
Merge pull request #5085 from owncloud/versioning_preview
...
add previews to versions dialog
2013-10-04 06:13:54 -07:00
54dd91b859
remove hover effect from preview image
2013-10-04 15:13:05 +02:00
2e7f481e6b
update tests
2013-10-04 14:32:15 +02:00
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
2cfb5fb2d2
vertical align versions text
2013-10-04 14:13:48 +02:00
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
dd2bf69152
use true/false instead of yes/no for publicUpload and subfiles parameter
2013-10-04 12:16:47 +02:00
a1fe5148b5
use always path as parameter to specify a file/folder
2013-10-04 12:10:11 +02:00
c38638fdf4
Merge pull request #4815 from owncloud/ldap_improve_testing
...
LDAP modularization and tests
2013-10-04 02:41:06 -07:00
5b7f76e702
Merge pull request #4691 from owncloud/encryption_improved_error_messages_4617
...
Encryption improved error messages
2013-10-04 02:28:18 -07:00
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
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
b7c3af11bf
fix hidden fieled name
2013-10-04 10:46:55 +02:00
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
c335169f6d
increase height of controls bar and elements to more clickable 44px
2013-10-04 08:41:16 +03:00
13218ec689
remove duplicate upload CSS from files.css
2013-10-03 17:08:29 +03:00
f3e0cbdeed
fix position of New and Deleted Files buttons
2013-10-03 16:49:49 +03:00
308d4383a3
simplify input elements for less cognitive load. No box-shadow, no text-shadow, smaller border-radius
2013-10-03 16:35:42 +03:00
5501dd623e
add/remove specific CSS class - not all classes
2013-10-03 12:22:25 +02:00
9c23c3449b
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
core/css/share.css
2013-10-02 23:33:50 +02:00
VicDeo
Jenkins for ownCloud
Morris Jobke
Vincent Petry
Jörn Friedrich Dreyer
Björn Schießle
Bjoern Schiessle
Frank Karlitschek
Lennart Rosam
Jan-Christoph Borchardt