summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-08-29729-11741/+4273
|
* Merge pull request #10647 from owncloud/implementing_momentjsClark Tomlinson2014-08-284-32/+30
|\ | | | | Implementing momentjs
| * Implementing moment.jsClark Tomlinson2014-08-284-32/+30
| | | | | | | | | | | | | | | | Updating Usages Removing unused method Adding JS Doc
* | Merge pull request #10658 from owncloud/sftp_prevent_errorVincent Petry2014-08-281-0/+3
|\ \ | | | | | | Prevent errors on broken SFTP config
| * | Prevent errors on broken SFTP configRobin McCorkell2014-08-271-0/+3
| | |
* | | Merge pull request #10696 from owncloud/inputdateBernhard Posselt2014-08-281-0/+1
|\ \ \ | | | | | | | | Enhancement: Adds input styles to input type dates too.
| * | | Enhancement: Adds input styles to input type dates too.raghunayyar2014-08-281-0/+1
|/ / /
* | | Merge pull request #8507 from owncloud/ajaxify_user_list_for_files_externalblizzz2014-08-2867-58/+5681
|\ \ \ | | | | | | | | Ajaxify user list for files external
| * | | Use AppFramework instead of custom controllerLukas Reschke2014-08-255-40/+88
| | | |
| * | | use displayname lookup route in files_external settingsJörn Friedrich Dreyer2014-08-251-31/+14
| | | |
| * | | add lookup route for displaynamesJörn Friedrich Dreyer2014-08-252-0/+35
| | | |
| * | | no need to load user display namesJörn Friedrich Dreyer2014-08-251-1/+0
| | | |
| * | | fix deletion of sharesJörn Friedrich Dreyer2014-08-251-21/+22
| | | |
| * | | replace chosen with select2 to provide ajaxified user and group selection ↵Jörn Friedrich Dreyer2014-08-258-62/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | add select2 to app specific thirdpartyJörn Friedrich Dreyer2014-08-2560-0/+5431
| | | |
* | | | fix wizard test, adjust to changed parameters of the tested method, ↵Arthur Schiwon2014-08-281-1/+1
| | | | | | | | | | | | | | | | introduced by 9caa354cfc1f73159f335646ca89be4db72b125e
* | | | Port of #8623Arthur Schiwon2014-08-282-1/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge pull request #10670 from owncloud/encodeExceptionsLukas Reschke2014-08-281-4/+4
|\ \ \ \ | | | | | | | | | | Escape error messages
| * | | | Escape error messagesLukas Reschke2014-08-271-4/+4
| | |_|/ | |/| |
* / | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-28495-2230/+2370
|/ / /
* | | Merge pull request #10653 from owncloud/x-forwarded-forClark Tomlinson2014-08-276-6/+72
|\ \ \ | | | | | | | | Add support for getting the real client IP behind proxies
| * | | Add support for getting the real client IP behind proxiesLukas Reschke2014-08-276-6/+72
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/10624 Fix copy paste fail Add unittest for comma separated headers Revert 3rdparty
* | | Merge pull request #10666 from ogasser/appframework_db_testsLukas Reschke2014-08-272-7/+7
|\ \ \ | | | | | | | | Make Entity properties ```protected``` as in docs
| * | | Make Entity properties ```protected``` as in docsOliver Gasser2014-08-272-7/+7
|/ / / | | | | | | | | | | | | | | | | | | Entity properties are marked as ```protected``` to correctly reflect the documentation. See also owncloud/documentation@644f2eedac8e912c3019366b29ecdfbd9a15c5d9
* | | Merge pull request #9915 from suraia/unsharefromself-sourceBjörn Schießle2014-08-273-8/+33
|\ \ \ | | | | | | | | Allow specifying the item source in unshareFromSelf().
| * | | Add unit tests for new unshareFromSelf() functionality.Michael Kuhn2014-08-231-0/+24
| | | |
| * | | Allow specifying the item source in unshareFromSelf().Michael Kuhn2014-07-262-8/+9
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-2730-115/+155
| | | |
* | | | Merge pull request #10641 from callahad/email-input-typeLukas Reschke2014-08-261-1/+1
|\ \ \ \ | | | | | | | | | | Set email input field to type=email for better UX
| * | | | Set email input field to type=email for better UXDan Callahan2014-08-261-1/+1
| | | | |
* | | | | Merge pull request #10640 from owncloud/add_moment_jsClark Tomlinson2014-08-262-0/+9084
|\ \ \ \ \ | |_|_|/ / |/| | | | add moment.js
| * | | | add moment.jsGeorg Ehrke2014-08-262-0/+9084
| | | | |
* | | | | Merge pull request #10604 from owncloud/fixing-faviconThomas Müller2014-08-263-3/+3
|\ \ \ \ \ | |_|/ / / |/| | | | Adding type to favicon
| * | | | Adding type to faviconClark Tomlinson2014-08-223-3/+3
| | | | |
* | | | | Merge pull request #9844 from OliverKohlDSc/patch-1Thomas Müller2014-08-261-2/+4
|\ \ \ \ \ | | | | | | | | | | | | CRON call ends in null exception
| * | | | | Update cron.phpOliver Kohl D.Sc.2014-07-241-2/+1
| | | | | |
| * | | | | CRON call ends in null exceptionOliver Kohl D.Sc.2014-07-241-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [error] 4461#0: *186285 FastCGI sent in stderr: "PHP message : PHP Fatal error: Call to a member function execute() on null in /var/www/ownc loud/cron.php on line 125" while reading response header from upstream, client: 217.13.183.252, server: cloud.mycloud.com, request: "GET /cron.php HTTP/1.1", upstre am: "fastcgi://unix:/var/run/php5-fpm.sock:", host: "cloud.mycloud.com", referrer: " https://cloud.mycloud.com/"
* | | | | | Merge pull request #10619 from owncloud/issue/6722Thomas Müller2014-08-262-37/+59
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Add a test to break the slugifyPath() with folder and file afterwards
| * | | | | Use md5() of the original name instead of uniqid() for slugifyingJoas Schilling2014-08-251-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Fix code layout before fixing the functionJoas Schilling2014-08-251-13/+9
| | | | | |
| * | | | | Use a data provider instead of calling the function manually everytimeJoas Schilling2014-08-251-33/+35
| | | | | |
| * | | | | Add a test to break the slugifyPath() with folder and file afterwardsJoas Schilling2014-08-251-1/+14
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-26500-1577/+1694
| | | | | |
* | | | | | Merge pull request #10623 from owncloud/not-a-valid-resource-log-entriesClark Tomlinson2014-08-251-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Do not try to close the same resource multiple times
| * | | | | | Do not try to close the same resource multiple timesJoas Schilling2014-08-251-1/+6
| |/ / / / /
* | | | | | Merge pull request #10421 from owncloud/share-external-deleteClark Tomlinson2014-08-251-1/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove no longer existing files from the cache when scanning external storage
| * | | | | | Remove no longer existing files from the cache when scanning external storageRobin Appelman2014-08-141-1/+11
| | | | | | |
* | | | | | | Merge pull request #10023 from owncloud/tmp-file-created-statusVincent Petry2014-08-251-2/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Log unsuccessful temp file creation and return false
| * | | | | | | Log unsuccessful temp file creation and return falseVictor Dubiniuk2014-07-301-2/+14
| | | | | | | |
* | | | | | | | Merge pull request #10108 from owncloud/files_external-allowed-backendVincent Petry2014-08-251-6/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Only load personal external storages for allowed backends
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-31 08:00:29 +0000