Thomas Müller
|
7086c386fd
|
Merge branch 'master' into append-error-document
Conflicts:
lib/private/setup.php
lib/private/updater.php
|
2014-04-02 08:48:37 +02:00 |
|
Jenkins for ownCloud
|
73dd5ff26c
|
[tx-robot] updated from transifex
|
2014-04-02 01:56:39 -04:00 |
|
Thomas Müller
|
d762e25cc5
|
Merge pull request #7989 from owncloud/files-deletefileregressionfix
Fixed broken delete file action
|
2014-04-01 22:54:05 +02:00 |
|
Thomas Müller
|
82d1ea240e
|
Merge pull request #7884 from owncloud/use-idn_to_ascii-if-available
idn_to_ascii is only used if available
|
2014-04-01 22:51:23 +02:00 |
Vincent Petry
|
d811026ec9
|
Merge pull request #7935 from owncloud/getpath-shared
Make getPath work for shared files
|
2014-04-01 21:59:09 +02:00 |
Morris Jobke
|
bd2cf6ee29
|
Merge pull request #7817 from owncloud/app-navigation-for-apps
Makes #app-navigation a part of app management.
|
2014-04-01 21:38:43 +02:00 |
Bart Visscher
|
630b5b648f
|
Merge pull request #7997 from owncloud/correct-remember-trashbin-state
Correct the remembering of the trashbin app state in encryption test
|
2014-04-01 21:23:53 +02:00 |
|
Bart Visscher
|
f37a76c396
|
Remember before change works better
|
2014-04-01 19:46:46 +02:00 |
|
Vincent Petry
|
0e93c3fd9a
|
Merge pull request #7986 from owncloud/files-fixredirectwhendirnotexists
Fix dirInfo check when dir does not exist
|
2014-04-01 16:51:30 +02:00 |
|
Morris Jobke
|
017d7953d7
|
Merge pull request #7984 from owncloud/wording-applicable2
External Storage: change confusing 'applicable' to 'available for', default to »All Users«
|
2014-04-01 16:44:31 +02:00 |
|
Vincent Petry
|
aaa8d6ec02
|
Fixed broken delete file action
|
2014-04-01 16:09:48 +02:00 |
|
Vincent Petry
|
6e6a131b32
|
Merge pull request #7696 from owncloud/chunk-remainingspacefix
Fixed chunking and insufficient storage check
|
2014-04-01 16:09:19 +02:00 |
|
Vincent Petry
|
0bede65947
|
Fix dirInfo check when dir does not exist
|
2014-04-01 15:15:03 +02:00 |
|
Vincent Petry
|
27eff1ac30
|
Merge pull request #7293 from owncloud/update-shares-postgres
fix update to remove shares where file doesn't exist on postgres
|
2014-04-01 14:56:37 +02:00 |
Jan-Christoph Borchardt
|
acfb3cfff5
|
external storage: set storages to be available for All Users by default
|
2014-04-01 14:31:22 +02:00 |
|
Jan-Christoph Borchardt
|
0a112de676
|
external storage: change confusing 'applicable' to 'available for'
|
2014-04-01 14:26:06 +02:00 |
blizzz
|
a179335775
|
Merge pull request #7940 from owncloud/settings-userlistajaxcallfix
Fixed user list offset call
|
2014-04-01 14:17:05 +02:00 |
Björn Schießle
|
c45793033d
|
Merge pull request #7912 from owncloud/enc_move_checks_to_pre_hook
move check if a file should be encrypted to the pre hook
|
2014-04-01 13:56:46 +02:00 |
|
Vincent Petry
|
be0660f84f
|
Merge pull request #7943 from hjort/master
Correction: failure on sharing when user ID was prefixed by zero
|
2014-04-01 12:57:16 +02:00 |
|
Vincent Petry
|
5807681c09
|
Merge pull request #7975 from owncloud/fix-7973-master-2
remove pl_PL - fixes #7973
|
2014-04-01 12:38:47 +02:00 |
|
Vincent Petry
|
18acfa8bb3
|
Merge pull request #7915 from owncloud/replace-personalblock
Replace personalblock with .section
|
2014-04-01 11:20:16 +02:00 |
|
Morris Jobke
|
a94ac41512
|
Merge pull request #7966 from owncloud/url_generation_hack
Check if web root has already been appended
|
2014-04-01 10:59:53 +02:00 |
Morris Jobke
|
0d2a81a095
|
apply proposed change
|
2014-04-01 10:48:55 +02:00 |
|
Jenkins for ownCloud
|
7a4a836abe
|
[tx-robot] updated from transifex
|
2014-04-01 01:56:15 -04:00 |
|
Björn Schießle
|
0ca80254ec
|
Merge pull request #7967 from owncloud/sharing_fix_select_statement
select statement always need to contain file_source respectively item_source
|
2014-03-31 21:34:42 +02:00 |
|
Thomas Müller
|
fe2c6f4e6d
|
remove pl_PL - fixes #7973
|
2014-03-31 18:03:42 +02:00 |
|
Morris Jobke
|
ab696edba6
|
Merge pull request #7916 from owncloud/fix-input-sizes
Fix input sizes
|
2014-03-31 15:56:19 +02:00 |
|
Bjoern Schiessle
|
aa867ad647
|
don't call getFileInfo() to avoid to open the same file twice
|
2014-03-31 15:29:16 +02:00 |
|
Bjoern Schiessle
|
8ebb1f15d3
|
move check if a file should be encrypted to the pre hook
|
2014-03-31 15:29:16 +02:00 |
|
Bjoern Schiessle
|
3a731a01b1
|
select statement always need to contain file_source respectively item_source
|
2014-03-31 15:03:35 +02:00 |
Robin Appelman
|
0c2585f3ac
|
Improve phpdoc
|
2014-03-31 14:29:55 +02:00 |
Thomas Tanghus
|
6292aa57af
|
Check if web root has already been appended
|
2014-03-31 14:24:38 +02:00 |
|
Morris Jobke
|
8bd308ffed
|
merge CSS rules
|
2014-03-31 13:51:53 +02:00 |
|
Jan-Christoph Borchardt
|
2be2a5d2c5
|
external storage: fix merge conflict, indentation
|
2014-03-31 13:12:04 +02:00 |
|
Jan-Christoph Borchardt
|
6ac85480f7
|
replace last personalblock fieldset within files_external
|
2014-03-31 13:00:46 +02:00 |
|
Jan-Christoph Borchardt
|
615de6534f
|
fix duplicate rules for button/input styles, em to px
|
2014-03-31 12:27:26 +02:00 |
|
Vincent Petry
|
65e3f63400
|
Merge pull request #7939 from owncloud/wring_redirect_on_login
Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936
|
2014-03-31 10:50:05 +02:00 |
|
Jenkins for ownCloud
|
5b552c84da
|
[tx-robot] updated from transifex
|
2014-03-31 01:55:43 -04:00 |
raghunayyar
|
881c66df52
|
Removes highlighting of selected items, padding from apps management.
|
2014-03-30 15:48:47 +05:30 |
|
Jenkins for ownCloud
|
bfb0b9a044
|
[tx-robot] updated from transifex
|
2014-03-30 01:55:42 -04:00 |
|
Thomas Tanghus
|
7278f2f567
|
Sub-dir was prepended twice
|
2014-03-29 20:40:49 +01:00 |
|
Thomas Tanghus
|
3a7829f784
|
Sub-dir was prepended twice
|
2014-03-29 20:39:55 +01:00 |
|
Jenkins for ownCloud
|
915fa3da74
|
[tx-robot] updated from transifex
|
2014-03-29 01:55:44 -04:00 |
|
Thomas Müller
|
80c6f883a8
|
Merge pull request #7845 from duritong/fix_submodule_url
use https as submodule url
|
2014-03-28 21:54:50 +01:00 |
|
Morris Jobke
|
73c81ae709
|
Merge pull request #7932 from owncloud/update-phpdoc-statement-wrapper-master
adding @method annotation to declare methods which can be called on the ...
|
2014-03-28 21:20:09 +01:00 |
Rodrigo Hjort
|
51b727cfca
|
Correction: failure on sharing when user ID was prefixed by zero
|
2014-03-28 15:08:59 -03:00 |
|
Vincent Petry
|
82f98fb3d3
|
Fixed user list offset call
|
2014-03-28 18:12:34 +01:00 |
|
Thomas Tanghus
|
c14107550d
|
Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936
|
2014-03-28 18:05:48 +01:00 |
|
Vincent Petry
|
0ae9ed4244
|
Merge pull request #7934 from owncloud/addEventToExpirationDate
Emit event after setting a new expiration for a share
|
2014-03-28 17:35:20 +01:00 |
|
Robin Appelman
|
fe78d963d9
|
Implement getPath for shared files
|
2014-03-28 15:26:15 +01:00 |