dbd51d15e1
Port of #8623
...
set result entry identifier earlier, i.e. before a continue for the same level can happen. otherwise will always get the same value and we end up in an infinite loop
add unit test to make sure the infinite loop never comes back
Conflicts:
apps/user_ldap/tests/wizard.php
2014-08-28 11:52:33 +02:00
2f76117cb8
Merge pull request #10670 from owncloud/encodeExceptions
...
Escape error messages
2014-08-28 09:36:18 +02:00
1b342a70d6
[tx-robot] updated from transifex
2014-08-28 01:56:36 -04:00
9ab62ad5b7
Escape error messages
2014-08-27 17:01:51 +02:00
cb0da1178b
Merge pull request #10653 from owncloud/x-forwarded-for
...
Add support for getting the real client IP behind proxies
2014-08-27 10:32:34 -04:00
13012fb5f7
Merge pull request #10666 from ogasser/appframework_db_tests
...
Make Entity properties ```protected``` as in docs
2014-08-27 15:28:22 +02:00
47a2e31c93
Make Entity properties ```protected``` as in docs
...
Entity properties are marked as ```protected``` to correctly reflect the
documentation.
See also owncloud/documentation@644f2eedac
2014-08-27 13:31:51 +02:00
c35d60f6d8
Merge pull request #9915 from suraia/unsharefromself-source
...
Allow specifying the item source in unshareFromSelf().
2014-08-27 10:31:35 +02:00
87167d3141
Prevent errors on broken SFTP config
2014-08-27 09:02:14 +01:00
2740908a5b
[tx-robot] updated from transifex
2014-08-27 01:54:40 -04:00
7acdd018a1
Add support for getting the real client IP behind proxies
...
Fixes https://github.com/owncloud/core/issues/10624
Fix copy paste fail
Add unittest for comma separated headers
Revert 3rdparty
2014-08-27 00:05:04 +02:00
35b035c374
Merge pull request #10641 from callahad/email-input-type
...
Set email input field to type=email for better UX
2014-08-26 22:09:50 +02:00
c0bc41ff1e
Merge pull request #10640 from owncloud/add_moment_js
...
add moment.js
2014-08-26 13:32:47 -04:00
6cca20fb36
Set email input field to type=email for better UX
2014-08-26 11:14:30 -05:00
f82b788ba5
add moment.js
2014-08-26 17:39:15 +02:00
3115053bbb
Merge pull request #10604 from owncloud/fixing-favicon
...
Adding type to favicon
2014-08-26 17:35:50 +02:00
910b827b98
Merge pull request #9844 from OliverKohlDSc/patch-1
...
CRON call ends in null exception
2014-08-26 14:42:07 +02:00
2e8026a7b5
Merge pull request #10619 from owncloud/issue/6722
...
Add a test to break the slugifyPath() with folder and file afterwards
2014-08-26 10:33:18 +02:00
ca7e4c8c67
Add isAppstoreEnabled instead of hijacking the URL
2014-08-26 10:20:51 +02:00
c733842a9a
[tx-robot] updated from transifex
2014-08-26 01:56:33 -04:00
6523c575f3
Merge pull request #10623 from owncloud/not-a-valid-resource-log-entries
...
Do not try to close the same resource multiple times
2014-08-25 12:52:06 -04:00
58ab105515
Merge pull request #10421 from owncloud/share-external-delete
...
Remove no longer existing files from the cache when scanning external storage
2014-08-25 11:28:50 -04:00
c86824fa09
Merge pull request #10023 from owncloud/tmp-file-created-status
...
Log unsuccessful temp file creation and return false
2014-08-25 17:24:46 +02:00
5e2f627d3d
Merge pull request #10108 from owncloud/files_external-allowed-backend
...
Only load personal external storages for allowed backends
2014-08-25 17:07:35 +02:00
989da69cff
Do not try to close the same resource multiple times
2014-08-25 15:31:43 +02:00
1846aebfff
Use md5() of the original name instead of uniqid() for slugifying
...
Previously we used uniqid() here.
However this means that the behaviour is not reproducable, so
when uploading files into a "empty" folder, the folders name is
different.
If there would be a md5() hash collition, the deduplicate check
will spot this and append an index later, so this should not be
a problem.
Fix #6722
2014-08-25 15:06:12 +02:00
b861e1d696
Fix code layout before fixing the function
2014-08-25 15:06:10 +02:00
6a7be8a36a
Use a data provider instead of calling the function manually everytime
2014-08-25 15:06:09 +02:00
51c9b3c62d
Add a test to break the slugifyPath() with folder and file afterwards
2014-08-25 14:38:33 +02:00
992b0f9b06
Merge pull request #10598 from owncloud/warn_on_encryption_occ_pwreset
...
Warn user on resetting passwords via occ when encryption is enabled
2014-08-25 14:23:28 +02:00
f33312f767
Use AppFramework instead of custom controller
2014-08-25 11:50:19 +02:00
6202ef3258
use displayname lookup route in files_external settings
2014-08-25 11:50:19 +02:00
91ba1b345e
add lookup route for displaynames
2014-08-25 11:50:19 +02:00
e09e11b93e
no need to load user display names
2014-08-25 11:50:19 +02:00
393d136faf
fix deletion of shares
2014-08-25 11:50:19 +02:00
308e8d6379
replace chosen with select2 to provide ajaxified user and group selection for files_external, fixes #7499
...
remove minified select2 js
show avatars for users, simpler results
remove unneeded users and groups from settings template
fix css, escape user and group names
2014-08-25 11:50:19 +02:00
bff39f796e
add select2 to app specific thirdparty
2014-08-25 11:49:23 +02:00
8ab1c84161
Merge pull request #10591 from owncloud/routes_for_files_external
...
explicit routes for files_external
2014-08-25 11:45:41 +02:00
ebf7758d10
Merge pull request #10595 from owncloud/swift-stream
...
Stream downloads from Swift object stores without downloading it first
2014-08-25 11:26:39 +02:00
adca48aa93
[tx-robot] updated from transifex
2014-08-25 01:56:07 -04:00
104d1eaed2
Merge pull request #10528 from owncloud/fix-htaccess-check-error
...
Fix htaccess check error
2014-08-24 20:40:06 +02:00
4bc72cc4e0
Remove different URL for EE
...
This can now be achieved by setting `appstoreenabled` to `false` in config.php
2014-08-24 20:22:15 +02:00
b5c2964070
Merge pull request #9818 from owncloud/fix-mount-file-config
...
Comment out mount_file config option
2014-08-24 17:32:24 +01:00
70db496b58
[tx-robot] updated from transifex
2014-08-24 01:56:10 -04:00
0a77a5ec19
Add unit tests for new unshareFromSelf() functionality.
2014-08-23 12:05:19 +02:00
047ec64ac0
[tx-robot] updated from transifex
2014-08-23 01:57:00 -04:00
2ad0d3f1be
Throw exception if file cannot be accessed via http
...
Format file
Removing calls to deprecated classes and using internal method to get via http
Missed a character
Fix inverted logic
2014-08-22 19:41:30 -04:00
e0a8321b23
Adding type to favicon
2014-08-22 16:26:39 -04:00
a77d468d35
Merge pull request #10584 from owncloud/simple-wizard-trusted-domains
...
Add a trusted domain wizard
2014-08-22 17:12:17 +02:00
b86e124e03
Warn user on resetting passwords via occ when encryption is enabled
2014-08-22 16:15:04 +02:00
Arthur Schiwon
Lukas Reschke
Jenkins for ownCloud
Clark Tomlinson
Oliver Gasser
Björn Schießle
Robin McCorkell
Dan Callahan
Georg Ehrke
Thomas Müller
Vincent Petry
Joas Schilling
Jörn Friedrich Dreyer
Michael Kuhn
kondou