Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added unit tests for right sidebar | Vincent Petry | 2015-08-07 | 7 | -7/+222 |
* | Improve layout, fix mime icon | Vincent Petry | 2015-08-07 | 4 | -17/+35 |
* | Disable right sidebar in public file list page | Vincent Petry | 2015-08-07 | 2 | -6/+14 |
* | Right sidebar now has its own scrollbar | Vincent Petry | 2015-08-07 | 3 | -5/+25 |
* | Remove horizontal scroll caused by right sidebar | Vincent Petry | 2015-08-07 | 1 | -0/+4 |
* | Styling fixes + hightlight in files sidebar | Vincent Petry | 2015-08-07 | 7 | -3/+17 |
* | More fixes to the right sidebar | Vincent Petry | 2015-08-07 | 7 | -133/+85 |
* | Improved right sidebar | Vincent Petry | 2015-08-07 | 9 | -74/+328 |
* | Basic work for right sidebar | Vincent Petry | 2015-08-07 | 7 | -0/+508 |
* | Merge pull request #18083 from owncloud/user-search-box | Jan-Christoph Borchardt | 2015-08-07 | 4 | -45/+29 |
|\ | |||||
| * | use the main search box to filter users in user management | Robin Appelman | 2015-08-05 | 4 | -45/+29 |
* | | Merge pull request #18091 from owncloud/add-backbonejs | blizzz | 2015-08-07 | 7 | -1/+1947 |
|\ \ | |||||
| * | | load backbone universally | Arthur Schiwon | 2015-08-06 | 4 | -7/+2 |
| * | | make available as OC.Backbone to avoid conflicts | Arthur Schiwon | 2015-08-06 | 2 | -0/+17 |
| * | | adjust gitignore for backbone.js | Arthur Schiwon | 2015-08-06 | 3 | -3/+3 |
| * | | files and sharing will require backbonejs | Arthur Schiwon | 2015-08-06 | 2 | -0/+2 |
| * | | add backbone.js | Arthur Schiwon | 2015-08-06 | 6 | -1/+1933 |
* | | | Merge pull request #17680 from owncloud/ftp-rmdir-file | Vincent Petry | 2015-08-06 | 1 | -1/+4 |
|\ \ \ | |||||
| * | | | handle rmdir on files for ftp storages | Robin Appelman | 2015-07-16 | 1 | -1/+4 |
* | | | | Merge pull request #18106 from owncloud/enc-jsnamespaceconflict | Björn Schießle | 2015-08-06 | 2 | -12/+4 |
|\ \ \ \ | |||||
| * | | | | Fix namespace conflict in OC.Encryption JS code | Vincent Petry | 2015-08-06 | 2 | -12/+4 |
* | | | | | Merge pull request #18030 from owncloud/dav-upload-updater | Vincent Petry | 2015-08-06 | 1 | -2/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | go trough the updater when uploading over webdav | Robin Appelman | 2015-08-03 | 1 | -2/+1 |
* | | | | | Merge pull request #18082 from owncloud/share-group-conflict | Vincent Petry | 2015-08-06 | 4 | -23/+50 |
|\ \ \ \ \ | |||||
| * | | | | | just pass the share instead of searching for it | Robin Appelman | 2015-08-05 | 3 | -23/+11 |
| * | | | | | add unit tests for share target conflict with group shares | Robin Appelman | 2015-08-05 | 1 | -0/+39 |
* | | | | | | Merge pull request #16961 from owncloud/hardening-ldap | Jörn Friedrich Dreyer | 2015-08-06 | 3 | -1/+191 |
|\ \ \ \ \ \ | |||||
| * | | | | | | integration tests for hardening user home retrieval | Arthur Schiwon | 2015-08-06 | 1 | -0/+159 |
| * | | | | | | Only throw exception if on new LDAP setups | Morris Jobke | 2015-07-29 | 2 | -2/+30 |
| * | | | | | | Hardening home folder retrieval in user_ldap | Morris Jobke | 2015-07-29 | 1 | -1/+4 |
* | | | | | | | Merge pull request #17810 from owncloud/better-enc-warnings | Bernhard Posselt | 2015-08-06 | 2 | -3/+16 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | condense doc warnings into small section that gets showed to the user before ... | Bernhard Posselt | 2015-07-22 | 2 | -3/+16 |
* | | | | | | | | Merge pull request #18084 from owncloud/ocs-anything-other-then-100-means-fai... | Thomas Müller | 2015-08-05 | 2 | -6/+2 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | Following the spec: | Thomas Müller | 2015-08-05 | 2 | -6/+2 |
* | | | | | | | | Merge pull request #18077 from owncloud/fix_18055 | Morris Jobke | 2015-08-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Set proper mimetype for directories | Roeland Jago Douma | 2015-08-05 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #18035 from owncloud/ocs-2.0 | Bernhard Posselt | 2015-08-05 | 10 | -203/+211 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Return 200 not null - we should return consistent types | Thomas Müller | 2015-08-05 | 2 | -1/+4 |
| * | | | | | | | | Fix unit test within OCSController | Thomas Müller | 2015-08-03 | 2 | -6/+9 |
| * | | | | | | | | Remove duplicate and unused code | Thomas Müller | 2015-08-03 | 5 | -175/+42 |
| * | | | | | | | | Fix authors | Thomas Müller | 2015-08-03 | 1 | -7/+1 |
| * | | | | | | | | Reduce duplicate code | Thomas Müller | 2015-08-03 | 3 | -15/+46 |
| * | | | | | | | | Adding ocs/v2.php with status code mapper | Thomas Müller | 2015-08-03 | 3 | -8/+118 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #18057 from owncloud/import_root_certificates | Thomas Müller | 2015-08-05 | 5 | -10/+72 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | also block certificate management in the back-end if external storages are di... | Bjoern Schiessle | 2015-08-04 | 3 | -9/+53 |
| * | | | | | | | only add the possibility to import ssl root certificates to the personal | Bjoern Schiessle | 2015-08-04 | 2 | -1/+19 |
* | | | | | | | | Merge pull request #18068 from owncloud/update-pear | Thomas Müller | 2015-08-05 | 1 | -0/+0 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | Update submodule after merge in 3rdparty | Thomas Müller | 2015-08-05 | 1 | -0/+0 |
| * | | | | | | | remove old pear classes | Thomas Müller | 2015-08-05 | 1 | -0/+0 |
| * | | | | | | | "pear/pear-core-minimal": "v1.10.0alpha2" | Thomas Müller | 2015-08-05 | 1 | -0/+0 |