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
2cd35e94b4
Close session for files_trashbin
...
When restoring huge folders the interface will be unresponsive otherwise
2014-10-29 22:53:59 +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
206cb5ba63
Fix typo
2014-10-29 10:11:01 +01:00
9d1be0bbaf
get the source path and owner in a pre hook and the target path and owner in a
...
post hook
2014-10-29 10:11:01 +01:00
2f19de11e4
adding console command to generate javascript translation files based on existing php translation files
...
read server side translations from json files
2014-10-29 10:09:12 +01:00
d71cd680dd
Include core translations
...
Moved search result type translations to search.js
Load JS translations earlier
Translations need to be loaded earlier to make sure that some JS files
like search.js get access to translations at this time.
This requires the template initialization to be moved to after session
initialization, because only after the session we have access to the
current language.
2014-10-29 10:09:12 +01:00
a589d61b78
in case a translation javascript is not found we no longer bail out
...
remove translation.php
2014-10-29 10:09:12 +01:00
ec1a73fab9
Added OC.L10N namespace with translation functions
...
Added addTranslations and fixed de.js file
Fixed de.js to use OC.L10N.register() and use to correct expected
format.
Added JS unit tests for OC.L10N class
Include translations JS script for all apps
2014-10-29 10:09:12 +01:00
f67123c5a4
l10n.pl now generates js files as well
2014-10-29 10:09:12 +01:00
0696099bad
add dataresponse
...
fix docstrings
adjust copyright date
another copyright date update
another header update
implement third headers argument, fix indention, fix docstrings
fix docstrings
2014-10-29 09:43:47 +01:00
cb944814d9
[tx-robot] updated from transifex
2014-10-29 01:54:45 -04:00
4faee4011d
initialisation of cipher
2014-10-28 19:19:10 +01:00
46c2909c78
Update doctrine/dbal to 2.5
2014-10-28 15:39:37 +01:00
2974d4d380
Reset the users setup after clearing mounts
2014-10-28 15:13:29 +01:00
dd9cd7c946
Merge pull request #11738 from owncloud/update-patchwork-utf8
...
Use composer autoloader to load Patchwork
2014-10-28 14:40:16 +01:00
c93ddf77b9
Use composer autoloader to load Patchwork
2014-10-28 13:42:28 +01:00
c864f5e20c
Merge pull request #11805 from owncloud/AdamWill-issue9643
...
use Composer autoloader not OC for non-Composer 3rdparty (#9643 )
2014-10-28 13:09:07 +01:00
0e3f2055d2
use Composer autoloader not OC for non-Composer 3rdparty ( #9643 )
...
Composer's autoloader is rather better than the OwnCloud autoloader's
handling of non-OC classes. Plus we can rely on upstream Composer to
maintain it and not worry about it ourselves.
With this change, we drop the bits of OwnCloud's autoloader that
handled non-OC classes, and register the classes that were being
handled by that code with Composer's autoloader instead. As these
dependencies are converted to actually being managed by Composer,
the explicit registrations can be dropped as they won't be needed
any more.
Since OwnCloud's autoloader isn't going to handle non-OC classes any
more, we no longer need to test to make sure it does it right.
drop unneeded registerPrefix() and registerClass() from autoloader
Now we're not handling anything but OC's own classes, these are
unnecessary.
error out if composer autoloader is not found (thanks bantu)
We're never going to be able to work without the autoloader, if it's not
there we should just throw our hands up and surrender.
2014-10-28 11:32:20 +01:00
510d0b2cf3
Fix the "addHeader($tag, $attributes, $text)" methods to not ignore the $text parameter
...
Also support closing tags with no text content given
Conflicts:
lib/private/template.php
2014-10-28 11:15:58 +01:00
437a660680
Merge pull request #11600 from owncloud/refactor-appsettings-to-app-framework
...
Migrate new app settings to AppFramework
2014-10-28 11:13:20 +01:00
Morris Jobke
Thomas Müller
Jan-Christoph Borchardt
Lukas Reschke
Vincent Petry
Jenkins for ownCloud
Arthur Schiwon
Bjoern Schiessle
Bernhard Posselt
jknockaert
Robin Appelman
Adam Williamson