summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Basic work for right sidebarVincent Petry2015-08-077-0/+508
| | | | Adds right sidebar with registrable panels (still WIP)
* Merge pull request #18083 from owncloud/user-search-boxJan-Christoph Borchardt2015-08-074-45/+29
|\ | | | | use the main search box to filter users in user management
| * use the main search box to filter users in user managementRobin Appelman2015-08-054-45/+29
| |
* | Merge pull request #18091 from owncloud/add-backbonejsblizzz2015-08-077-1/+1947
|\ \ | | | | | | Add Backbone.js
| * | load backbone universallyArthur Schiwon2015-08-064-7/+2
| | |
| * | make available as OC.Backbone to avoid conflictsArthur Schiwon2015-08-062-0/+17
| | |
| * | adjust gitignore for backbone.jsArthur Schiwon2015-08-063-3/+3
| | |
| * | files and sharing will require backbonejsArthur Schiwon2015-08-062-0/+2
| | |
| * | add backbone.jsArthur Schiwon2015-08-066-1/+1933
| | |
* | | Merge pull request #17680 from owncloud/ftp-rmdir-fileVincent Petry2015-08-061-1/+4
|\ \ \ | | | | | | | | handle rmdir on files for ftp storages
| * | | handle rmdir on files for ftp storagesRobin Appelman2015-07-161-1/+4
| | | |
* | | | Merge pull request #18106 from owncloud/enc-jsnamespaceconflictBjörn Schießle2015-08-062-12/+4
|\ \ \ \ | | | | | | | | | | Fix namespace conflict in OC.Encryption JS code
| * | | | Fix namespace conflict in OC.Encryption JS codeVincent Petry2015-08-062-12/+4
| | | | |
* | | | | Merge pull request #18030 from owncloud/dav-upload-updaterVincent Petry2015-08-061-2/+1
|\ \ \ \ \ | |/ / / / |/| | | | go trough the updater when uploading over webdav
| * | | | go trough the updater when uploading over webdavRobin Appelman2015-08-031-2/+1
| | | | |
* | | | | Merge pull request #18082 from owncloud/share-group-conflictVincent Petry2015-08-064-23/+50
|\ \ \ \ \ | | | | | | | | | | | | Re-use the share entry we have for the shared storage instead of searching for it every time
| * | | | | just pass the share instead of searching for itRobin Appelman2015-08-053-23/+11
| | | | | |
| * | | | | add unit tests for share target conflict with group sharesRobin Appelman2015-08-051-0/+39
| | | | | |
* | | | | | Merge pull request #16961 from owncloud/hardening-ldapJörn Friedrich Dreyer2015-08-063-1/+191
|\ \ \ \ \ \ | | | | | | | | | | | | | | Hardening home folder retrieval in user_ldap
| * | | | | | integration tests for hardening user home retrievalArthur Schiwon2015-08-061-0/+159
| | | | | | |
| * | | | | | Only throw exception if on new LDAP setupsMorris Jobke2015-07-292-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * this is done by setting enforce_home_folder_naming_rule for the user_ldap app in the app settings
| * | | | | | Hardening home folder retrieval in user_ldapMorris Jobke2015-07-291-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * if the home folder naming rule is specified it should not fallback to the "use owncloud username as home folder" scenario * this does not allow the mixed setup of users with the attribute and some users without the attribute (which then would fallback to "use owncloud username as home folder" rule) anymore
* | | | | | | Merge pull request #17810 from owncloud/better-enc-warningsBernhard Posselt2015-08-062-3/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Condense doc warnings into small section that gets showed to the user…
| * | | | | | | condense doc warnings into small section that gets showed to the user before ↵Bernhard Posselt2015-07-222-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enabling encryption remove share warning remove app and just write it out as feature adjust warnings reframe storage issue fix typo
* | | | | | | | Merge pull request #18084 from ↵Thomas Müller2015-08-052-6/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | owncloud/ocs-anything-other-then-100-means-failure [OCS] Error handling - fix in status code mapper
| * | | | | | | Following the spec:Thomas Müller2015-08-052-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "`statuscode`: The OCS status code of the response, everything except 100 MUST be handled as failure."
* | | | | | | | Merge pull request #18077 from owncloud/fix_18055Morris Jobke2015-08-051-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Set proper mimetype for directories
| * | | | | | | Set proper mimetype for directoriesRoeland Jago Douma2015-08-051-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #18035 from owncloud/ocs-2.0Bernhard Posselt2015-08-0510-203/+211
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Adding ocs/v2.php with status code mapper
| * | | | | | | | Return 200 not null - we should return consistent typesThomas Müller2015-08-052-1/+4
| | | | | | | | |
| * | | | | | | | Fix unit test within OCSControllerThomas Müller2015-08-032-6/+9
| | | | | | | | |
| * | | | | | | | Remove duplicate and unused codeThomas Müller2015-08-035-175/+42
| | | | | | | | |
| * | | | | | | | Fix authorsThomas Müller2015-08-031-7/+1
| | | | | | | | |
| * | | | | | | | Reduce duplicate codeThomas Müller2015-08-033-15/+46
| | | | | | | | |
| * | | | | | | | Adding ocs/v2.php with status code mapperThomas Müller2015-08-033-8/+118
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #18057 from owncloud/import_root_certificatesThomas Müller2015-08-055-10/+72
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | disable "ssl root certificate" settings if user can't mount external storages
| * | | | | | | also block certificate management in the back-end if external storages are ↵Bjoern Schiessle2015-08-043-9/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disabled for the user
| * | | | | | | only add the possibility to import ssl root certificates to the personalBjoern Schiessle2015-08-042-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setting if the user can mount external storages
* | | | | | | | Merge pull request #18068 from owncloud/update-pearThomas Müller2015-08-051-0/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | [PHP7] Update pear-core-minimal
| * | | | | | | Update submodule after merge in 3rdpartyThomas Müller2015-08-051-0/+0
| | | | | | | |
| * | | | | | | remove old pear classesThomas Müller2015-08-051-0/+0
| | | | | | | |
| * | | | | | | "pear/pear-core-minimal": "v1.10.0alpha2"Thomas Müller2015-08-051-0/+0
| | | | | | | |
* | | | | | | | Merge pull request #17961 from owncloud/make_knowledgebase_configurableThomas Müller2015-08-053-1/+27
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | make knowledge base url configurable
| * | | | | | | | make knowledge base url configurableBjoern Schiessle2015-07-293-1/+27
| | | | | | | | |
* | | | | | | | | Merge pull request #18062 from owncloud/use-full-namespaceThomas Müller2015-08-052-7/+7
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Use absolute namespace
| * | | | | | | | Use absolute namespaceLukas Reschke2015-08-052-7/+7
| | | | | | | | |
* | | | | | | | | Merge pull request #18059 from owncloud/use-hash-comparison-on-the-requesttokenThomas Müller2015-08-053-7/+103
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Use StringUtils::equals on CSRF token and add unit tests
| * | | | | | | | Remove "use" statementLukas Reschke2015-08-052-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref https://bugs.php.net/bug.php?id=66773
| * | | | | | | | Use StringUtils::equals on CSRF token and add unit testsLukas Reschke2015-08-042-5/+99
|/ / / / / / / /
* | | | | | | | Merge pull request #18024 from owncloud/phpseclib-2.0Thomas Müller2015-08-046-25/+28
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update phpseclib to 2.0 for increased PHP7 compatibility
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-04 17:20:31 +0000