46d8c0a2d6
Merge pull request #11894 from owncloud/fix-unreachable-code
...
fix odd behaviour
2014-10-31 19:53:47 +01:00
56cf1d9d27
fix odd behaviour
2014-10-31 18:46:47 +01:00
fe9e6be35c
test files external amazon s3 storage id migration
2014-10-31 14:26:09 +01:00
69a3d8eb1a
fix files_external storage id migration
2014-10-31 14:25:55 +01:00
ea3fc401e9
Merge pull request #11888 from owncloud/add-code-climeate
...
Add CodeClimate indicator
2014-10-31 13:57:35 +01:00
67f1ddf2c8
Add CodeClimate indicator
2014-10-31 13:52:14 +01:00
fd4b97d758
Merge pull request #9044 from owncloud/add-missing-email-principal
...
adding missing email address for principal
2014-10-31 13:24:42 +01:00
e0528c7598
Merge pull request #11876 from owncloud/remove-pointless-requires
...
remove unnecessary require calls - the ownCloud class loader is supposed...
2014-10-31 13:10:59 +01:00
55658e7bb2
Merge pull request #11539 from owncloud/mount-setup-once
...
Only mount the storages for the user once
2014-10-31 10:42:29 +01:00
a9b41cbf54
Merge pull request #11850 from owncloud/fix-11848
...
on xp'ed mode and switching configurations: save raw mode instead of tog...
2014-10-31 08:38:05 +01:00
e00f25e5b0
[tx-robot] updated from transifex
2014-10-31 01:55:39 -04:00
1c7f1a8787
Merge pull request #11877 from owncloud/fix-11875-master
...
prevent PHP notice
2014-10-30 21:43:38 +01:00
bed81ea854
Merge pull request #11080 from owncloud/addheader-text-2
...
Fix the addHeader tag attributes text methods to not ignore the text parameter
2014-10-30 18:13:46 +01:00
146c46b73a
Merge pull request #11659 from jknockaert/master
...
rework getFileSize
2014-10-30 18:06:25 +01:00
99921489cf
prevent PHP notice
2014-10-30 17:24:25 +01:00
f776bcd4a0
remove unnecessary require calls - the ownCloud class loader is supposed to take care of this
2014-10-30 17:20:40 +01:00
9b293537a6
Merge pull request #11740 from owncloud/update-archive-tar
...
Update pear/archive_tar to 1.3.13
2014-10-30 17:14:07 +01:00
108cdeb892
Merge pull request #11867 from owncloud/settings-sidebar-admin
...
introduce sidebar for admin page
2014-10-30 17:03:03 +01:00
6db69c5d05
Merge pull request #11864 from owncloud/clear-session-after-logout
...
Clear session after logout
2014-10-30 16:47:46 +01:00
90e523ead0
Merge pull request #11858 from owncloud/fix-11064
...
Allow any outgoing XHR connections
2014-10-30 16:19:39 +01:00
08b46ccc17
Update pear/archive_tar to 1.3.13
2014-10-30 16:10:00 +01:00
1dfabfb491
admin settings: fix LDAP settings header layout
2014-10-30 16:04:26 +01:00
1076a77840
fix loading of more log entries
2014-10-30 14:59:13 +01:00
18f7f582ac
Merge pull request #11860 from owncloud/fix-stupid-error-because-im-a-moro
...
Fix stupid copy paste fail
2014-10-30 14:45:58 +01:00
e2001c6d31
Merge pull request #11821 from owncloud/generic-response
...
Add a generic data response
2014-10-30 14:05:25 +01:00
24feb74638
fixing ldap listing in admin sidebar - needs styling review
2014-10-30 13:55:33 +01:00
d9db791c67
introduce sidebar for admin page
2014-10-30 13:44:40 +01:00
5f76f82573
Merge pull request #11863 from owncloud/fix-enc-sharingtests
...
Properly register sharing hooks and proxies
2014-10-30 13:38:48 +01:00
ea1ee5ba89
update 3rdparty to match it's master branch
2014-10-30 13:34:29 +01:00
770c62c5d8
Clear session after logout
...
Fixes https://github.com/owncloud/core/issues/8420
2014-10-30 12:10:39 +01:00
5536f6edd0
Properly register sharing hooks and proxies
...
This will fix failing tests when shares weren't cleant up on delete due
to missing hooks.
Added login for user1 in setUp().
2014-10-30 12:05:15 +01:00
e219d72619
Fix stupid copy paste fail
...
...
2014-10-30 10:37:59 +01:00
ea55848fa1
[tx-robot] updated from transifex
2014-10-30 01:55:14 -04:00
b3f881748d
Allow any outgoing XHR connections
...
Quickfix for https://github.com/owncloud/core/issues/11064
2014-10-30 00:00:40 +01:00
e8703f648d
fix style of generated documentation
2014-10-29 20:38:59 +01:00
8a48b088ed
on xp'ed mode and switching configurations: save raw mode instead of toggling filter mode in tabs since their status is unknown and dealt with by the Wizard. Fixes #11848
2014-10-29 18:53:07 +01:00
106b9eb55c
Merge pull request #11409 from owncloud/watcher-reuse
...
Pass the cached data to the filesystem watcher
2014-10-29 16:38:16 +01:00
7d10ec41e6
Merge pull request #11835 from owncloud/enc-fixmovingsharekeystofolder
...
Fix moving share keys as non-owner to subdir
2014-10-29 15:59:42 +01:00
32071e8c06
Merge pull request #11831 from owncloud/make-search-non-blocking
...
Close session for search
2014-10-29 15:29:28 +01:00
6c4b7db09b
just add merge commit of 3rdparty repo
2014-10-29 14:10:38 +01:00
105940b9dc
Merge pull request #11638 from owncloud/oc8-translations
...
[OC8] Load javascript translations using standard web technologies
2014-10-29 13:09:02 +01:00
e8f9b929bd
Added encryption test when moving file as non-owner
2014-10-29 12:57:12 +01:00
f44e617dfd
Fix warning with unset extension check
2014-10-29 12:56:49 +01:00
b920f888ae
Fix moving share keys as non-owner to subdir
...
This fix gathers the share keys BEFORE a file is moved to make sure that
findShareKeys() is able to find all relevant keys when the file still
exists.
After the move/copy operation the keys are moved/copied to the target
dir.
Also: refactored preRename and preCopy into a single function to avoid
duplicate code.
2014-10-29 12:22:50 +01:00
c353cbe633
Merge pull request #11689 from owncloud/doctrine-2.5
...
Update doctrine/dbal to 2.5
2014-10-29 11:34:23 +01:00
fb4f993336
Fix implementation of translation short cut
2014-10-29 10:58:10 +01:00
ff84384513
Adding translations for settings
2014-10-29 10:57:46 +01:00
1052243285
Close session for search
...
Make search non-blocking.
2014-10-29 10:28:09 +01:00
c682b1f0c1
Fix language file detection
2014-10-29 10:13:51 +01:00
9f7c571e40
update all translation files to js and json
2014-10-29 10:13:50 +01:00
Vincent Petry
Morris Jobke
Jörn Friedrich Dreyer
Lukas Reschke
Jenkins for ownCloud
Thomas Müller
Jan-Christoph Borchardt
Arthur Schiwon