10e62bfd68
Merge pull request #7893 from owncloud/no-routed-link-for-css-files
...
css files are not to be routed through index.php anymore
2014-03-26 16:48:54 +01:00
be78cd53f9
Merge pull request #7896 from Xenopathic/misc_text_fixes
...
Miscellaneous text fixes for core apps
2014-03-26 16:47:24 +01:00
50dba97bde
Miscellaneous text fixes for core apps
2014-03-26 15:43:03 +00:00
d57bb70b03
Merge pull request #7889 from owncloud/routing-warning
...
Fix undefined index warning in router
2014-03-26 15:52:31 +01:00
93b984ecf8
css files are not to be routed through index.php anymore
2014-03-26 15:36:55 +01:00
b656c68ede
Merge pull request #7888 from owncloud/extstorage-multiplemountpointconfig
...
Fix merging of external storage configurations
2014-03-26 14:30:35 +01:00
028973cbea
Merge pull request #7885 from owncloud/extstorage-prettyprintjson
...
Pretty print mount.json when possible
2014-03-26 13:34:31 +01:00
9b2bb7c6ab
fix undefined index warning in router
2014-03-26 13:02:11 +01:00
e002b7242c
Fix merging of external storage configurations
...
Merging of configurations is whenever the same config is available for
multiple users/groups, in which case the config is considered as a
single one by the UI, and shows multiple users/groups selected.
Fixed merging logic to make sure that class, mount point and options are
the same before merging them.
Fixed merging to work correctly when the same mount point path is used
for separate users and configs. These are now correctly shows in the UI
as separate entries.
2014-03-26 12:41:25 +01:00
8d95c0d013
Pretty print mount.json when possible
2014-03-26 11:32:03 +01:00
75d8de378c
[tx-robot] updated from transifex
2014-03-26 01:56:21 -04:00
743ca4581d
Merge pull request #7748 from owncloud/postgresversionwarning
...
Added PostgreSQL version warning on upgrade
2014-03-25 23:17:18 +01:00
6bfeb342db
fixing code style
2014-03-25 23:17:00 +01:00
1816f43722
Merge pull request #7864 from owncloud/routing-performance
...
Routing performance
2014-03-25 23:00:36 +01:00
4900ad9119
update type hint in PHPDoc
2014-03-25 22:59:42 +01:00
ed97d872af
Merge pull request #7325 from owncloud/recursive-mkdir-local
...
Recursive mkdir fixes #7047
2014-03-25 22:45:14 +01:00
1ae10b9da3
Merge pull request #7420 from owncloud/cachehooks-first
...
Manually triger the filecache update hooks before any other hook
2014-03-25 22:41:09 +01:00
bbc2e37259
Merge pull request #7477 from owncloud/foldersize-reuse
...
Allow re-using already known fileinfo when calculating folder sizes
2014-03-25 22:33:24 +01:00
86356db044
Merge pull request #7772 from owncloud/filter_more_jsconsole
...
Also replace console.time/timeEnd when not in DEBUG mode
2014-03-25 20:29:26 +02:00
5111fad006
Merge pull request #7689 from owncloud/last_cron_log
...
Log last cron execution
2014-03-25 19:17:36 +01:00
d75c3d5f9a
Fix routes getting lost when loading app routes twice
2014-03-25 14:28:30 +01:00
e1d3d0e948
fix incorect array
2014-03-25 14:04:18 +01:00
c17f415356
Only load core routes for ocs and settings
2014-03-25 13:42:47 +01:00
36c9d91f86
Merge pull request #7867 from owncloud/upload-dontclosesessionforencryption
...
Fix public upload to not close session when encryption is on
2014-03-25 12:43:26 +01:00
531c9564b3
Merge pull request #7861 from owncloud/idn-domains-support-on-emails-master
...
idn have to be converted before being used
2014-03-25 12:38:32 +01:00
b92dad992f
[tx-robot] updated from transifex
2014-03-25 01:55:34 -04:00
e72b2e6e3b
Fix public upload to not close session when encryption is on
...
The encryption app needs to create keys when uploading files, so the
session needs to be kept open in such case.
2014-03-24 17:34:37 +01:00
9e89ad07c6
Only load core routes when matching a core route
2014-03-24 16:38:01 +01:00
0e1cb001b6
Cache generated urls for routes
2014-03-24 15:42:21 +01:00
f17674fef2
Only load routes from the apps we need
2014-03-24 15:41:46 +01:00
3eb5898f7b
use \OC_Mail::validateAddress() to validate the email address - fixes #7862
2014-03-24 15:35:07 +01:00
0d0aac6fff
Load the routes when matching or generating a route instead of when creating the router
2014-03-24 14:55:03 +01:00
fb7f3008d3
idn have to be converted before being used
2014-03-24 13:46:31 +01:00
d87001a093
Merge pull request #7768 from owncloud/trashempty-nocache
...
Use a more efficient way to determine that the trashbin is empty that doesn't rely on the cache
2014-03-24 13:34:30 +01:00
4c8a83e82f
Merge pull request #7714 from owncloud/phpunit-config
...
Allow setting the config dir to use as enviroment variable for phpunit
2014-03-24 13:01:37 +01:00
6b66b42f6e
catch the case where files_trashbin/files doesn't exist
2014-03-24 12:33:44 +01:00
a25b86a30e
Log exception when PostgreSQL version check failed
2014-03-24 11:54:44 +01:00
abdc823bb6
[tx-robot] updated from transifex
2014-03-24 01:55:51 -04:00
4a19a97d67
[tx-robot] updated from transifex
2014-03-23 01:55:34 -04:00
0245e64cec
[tx-robot] updated from transifex
2014-03-22 01:56:09 -04:00
e6b4d28229
Move success/error squircles to settings
2014-03-21 20:27:22 +01:00
dda7129a24
Merge branch 'master' of https://github.com/owncloud/core into last_cron_log
2014-03-21 20:23:31 +01:00
4be0b3f6cc
Merge pull request #7844 from owncloud/fix_7803_blizzz
...
LDAP: create a new instance of Configuration on clone, fixes #7803
2014-03-21 18:02:10 +01:00
422ccf4cdb
add test for cloning and keeping configuration seperate
2014-03-21 15:31:30 +01:00
86d479cb28
Use array_key_exists instead of isset, because the latter returns false if the assigned value is null
2014-03-21 15:29:49 +01:00
055a09e487
On clone create a new instance of the Configuration
...
To avide effects on the original instance of Connection when the clone
is modified, for instance on authentication checks.
2014-03-21 15:27:51 +01:00
43313d120d
Merge pull request #7820 from owncloud/core-macwarning
...
Added warning for Mac OS on setup page
2014-03-21 15:06:11 +01:00
37af74efb3
Merge pull request #7655 from owncloud/shared-unencryptedsize
...
Fixed warning when browsing Shared folder
2014-03-21 12:28:27 +01:00
a52bc333a2
Merge pull request #7611 from owncloud/fix-updater
...
Use $installedVersion instead of $currentVersion
2014-03-21 12:16:51 +01:00
3f95f9325f
Merge pull request #7823 from owncloud/fix_7796
...
Add FreeIPA UUID compatibility, fixes #7796
2014-03-21 11:27:18 +01:00
Thomas Müller
Robin McCorkell
Vincent Petry
Robin Appelman
VicDeo
icewind1991
kondou
blizzz
Morris Jobke