4f0370f1da
Fix for #8654
2014-05-22 10:35:01 +02:00
0249c6d8c7
Merge pull request #8634 from owncloud/handle-excpetions-in-console-master
...
Handle excpetions in console master
2014-05-22 10:30:33 +02:00
25ecd2bdda
Merge pull request #8659 from owncloud/get-preference-multiple-user
...
Add a method to get the values for multiple users to OC\Preferences
2014-05-22 09:59:20 +02:00
69717487f9
[tx-robot] updated from transifex
2014-05-22 01:54:28 -04:00
856c48bc25
Use default priority of 100 if backend default is not set
2014-05-21 22:31:18 +01:00
da03ef25d9
Add priority overriding comments
2014-05-21 22:29:16 +01:00
0a8a319915
Fix priority merging logic and add unit test
2014-05-21 22:18:22 +01:00
eae45dca71
Add unit tests
2014-05-21 22:18:22 +01:00
2254678a0c
Use constants for priority type and add comments
2014-05-21 22:17:21 +01:00
a0ccb060fa
Use more strict type comparisons
2014-05-21 22:17:21 +01:00
e4d3ee7866
Preserve priority if already set
2014-05-21 22:17:21 +01:00
9151d72507
Treat 'all users' as 'global'
...
A mount applicable to all users is as good a definition of global as can be
2014-05-21 22:17:21 +01:00
05642733a3
Add storage priority support
...
Each storage backend has a default priority, assigned to any system mounts
created in ownCloud. mount.json can be manually modified to change these
priorities.
The priority order is as follows:
* Personal
* User
* Group
* Global
Within each mount type, the mount with the highest priority is active.
The storage backend defaults were chosen to be the following:
* Local - 150
* Remote storage - 100
* SMB / CIFS with OC login - 90
2014-05-21 22:17:21 +01:00
14a953fbe0
Merge pull request #8416 from owncloud/sharing_keep_mount_points_visible
...
[sharing] move the mount point up if the parent folder no longer exists
2014-05-21 14:07:49 -04:00
2c89962919
clean up tryRememberLogin and save the timestamp of users last login
2014-05-21 18:03:37 +02:00
c586d1f4d5
Merge pull request #8652 from owncloud/logfile_rotate
...
rotate custom logfile if defined
2014-05-21 17:55:39 +02:00
542b395858
Fixed drag and drop from external files, added tests
...
- Fixed detection whether the drop zone is inside the currently visible
table
- Now dragging outside the table does nothing instead of uploading,
because the user might drop on the sidebar
- Added unit tests for the drop handler
2014-05-21 17:38:09 +02:00
d621a6fe5e
Clean the database after the test
2014-05-21 16:00:21 +02:00
e20fb37038
Correctly create list of placeholders
2014-05-21 14:35:59 +02:00
5f403f3e92
move the mount point up if a share is mounted to a subfolder and the subfolder no longer exists
2014-05-21 13:19:17 +02:00
66f94273c6
Add a lot of users for testing
2014-05-21 13:17:29 +02:00
4fbfe077fb
Move return to new line
2014-05-21 13:10:23 +02:00
88d26aac7b
Merge pull request #8612 from owncloud/share-updateshareiconsafterrename
...
[master] Fixed issues with renaming
2014-05-21 06:27:07 -04:00
319942bccb
Merge pull request #8646 from owncloud/publicshare-fixes
...
[master] Fixed for public link page
2014-05-21 05:41:35 -04:00
457a4aa425
Add test case for getValueForUsers()
2014-05-21 11:36:01 +02:00
cf3cd572b0
Add a method to get the values for multiple users to OC\Preferences
2014-05-21 11:14:52 +02:00
9b23a210c9
Merge pull request #8637 from owncloud/enc_improved_error_handling
...
[encryption] improved error handling during password change
2014-05-21 09:57:45 +02:00
4b2888cd9a
Changed access mode for Dropbox to 'auto'
2014-05-21 09:40:03 +02:00
954d5b27ff
use custom logfile path if defined, otherwise use default of owncloud.log in data directory
2014-05-20 11:29:59 -04:00
7d98bcf9a2
Fixed JS issues in public page
...
- fixed subdir detection when uploading into subdir
- add class detection before overriding to avoid JS errors
2014-05-20 13:37:58 +02:00
160a2bc36f
Fixed download URL in public page
2014-05-20 13:24:52 +02:00
40fc1d5b4b
[tx-robot] updated from transifex
2014-05-20 01:54:53 -04:00
06af8e09da
adding annotation check to checkServer()
2014-05-19 21:51:35 +02:00
30f1ec2521
Merge branch 'master' into test_annotations_working
...
Conflicts:
lib/private/util.php
2014-05-19 21:42:30 +02:00
8749442fec
no return on register and unregister
2014-05-19 21:39:19 +02:00
bb6fac1102
Merge branch 'master' into contactsmanager-register
...
Conflicts:
lib/private/contactsmanager.php
2014-05-19 21:35:13 +02:00
51a6764f31
Merge branch 'master' into cleanup-list-code
...
Conflicts:
apps/files_sharing/ajax/list.php
2014-05-19 20:52:25 +02:00
f8cb8f4803
Merge branch 'master' into csrf-on-login-and-logout
...
Conflicts:
core/templates/login.php
2014-05-19 20:40:55 +02:00
b6d2d6329d
Merge pull request #8639 from owncloud/drop-brief
...
Remove all occurences of @brief and @returns from PHPDoc
2014-05-19 20:18:32 +02:00
dc36d30953
Remove all occurences of @brief and @returns from PHPDoc
...
* test case added to avoid adding them later
2014-05-19 17:50:53 +02:00
090d127050
Merge pull request #6457 from owncloud/db-convert-tool
...
Command line tool to convert current database to others, except sqlite
2014-05-19 16:41:31 +01:00
95741f3936
Merge pull request #8435 from owncloud/fix-8322-master
...
Expose permission via WebDAV
2014-05-19 16:52:03 +02:00
04e6c12fe2
Merge pull request #8557 from owncloud/custom_session_handling
...
Allow apps to create custom session handlers.
2014-05-19 15:58:30 +02:00
d9f715bdad
only start migration if the encryption was initialized; allow to overwrite keys if no files exists
2014-05-19 15:53:50 +02:00
58e22cefaf
fix description of console command maintenance:repair - fixes #8574
2014-05-19 15:29:38 +02:00
6929549dad
adding try/catch + switch to config object as provided by the server container
2014-05-19 15:26:57 +02:00
6c4b650524
Merge pull request #8585 from owncloud/phpdoc-improvements-apps
...
PHPDoc improvements /apps
* owncloud/phpdoc-improvements-apps:
Fix whitespace issues
Reduce double-space with single-space.
Remove spaces around | operator in doc block.
Fix more missing or broken PHPDoc
PHPDoc fixes for user_ldap
Fix PHPDoc in /apps
2014-05-19 14:08:42 +02:00
1cff73b615
Merge branch 'libasys-patch-1'
2014-05-19 13:14:33 +02:00
9e1d47bd90
Add generic 'share by link' URL generator in share.js
...
Some more global definition to autogenerate a "Shared by Link" with token! Why we not add these lines for more global use of the public service feature? At the moment there is a pr for sharing a calendar by Link. With this little mod the calendar can work with the core share api and needs no own js share definition!
2014-05-19 13:12:59 +02:00
48977c8579
Merge pull request #7286 from owncloud/issue/4823
...
Set expiration date by default when adding additional shares
2014-05-19 10:26:54 +02:00
Remco Brenninkmeijer
Thomas Müller
Vincent Petry
Jenkins for ownCloud
Robin McCorkell
Björn Schießle
Arthur Schiwon
Morris Jobke
Joas Schilling
Sascha Schmidt
scolebrook
Frank Karlitschek
Andreas Fischer
libasys