Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #8933 from owncloud/fix-logo-glitch | Raghu Nayyar | 2014-06-06 | 7 | -62/+10 |
|\ | |||||
| * | reduce padding by 1px after increasing image | Jan-Christoph Borchardt | 2014-06-06 | 1 | -1/+1 |
| * | fix logo glitch, add whitespace around form | Jan-Christoph Borchardt | 2014-06-06 | 7 | -61/+9 |
* | | Merge pull request #8253 from owncloud/pk-on-all-tables-master | Thomas Müller | 2014-06-06 | 8 | -3/+109 |
|\ \ | |||||
| * | | adding PK to table encryption | Thomas Müller | 2014-06-06 | 8 | -3/+109 |
* | | | Merge pull request #8921 from owncloud/fix-remove-storage-master | Thomas Müller | 2014-06-06 | 1 | -10/+22 |
|\ \ \ | |_|/ |/| | | |||||
| * | | No need to create a storage within remove | Thomas Müller | 2014-06-06 | 1 | -10/+22 |
* | | | Merge pull request #8922 from owncloud/design-controls-transparency | Jan-Christoph Borchardt | 2014-06-06 | 6 | -46/+25 |
|\ \ \ | |||||
| * | | | fix left padding of controls bar for apps without navigation | Jan-Christoph Borchardt | 2014-06-06 | 1 | -1/+6 |
| * | | | slight transparency for controls bar for more open feel | Jan-Christoph Borchardt | 2014-06-06 | 1 | -1/+1 |
| * | | | fix apps without app-navigation | Jan-Christoph Borchardt | 2014-06-06 | 1 | -1/+1 |
| * | | | unify controls bar, remove duplicate from user management | Jan-Christoph Borchardt | 2014-06-06 | 5 | -43/+17 |
* | | | | Merge pull request #8923 from owncloud/app-settings-input | Jan-Christoph Borchardt | 2014-06-06 | 2 | -4/+9 |
|\ \ \ \ | |||||
| * | | | | app settings: display input fields at full width | Jan-Christoph Borchardt | 2014-06-06 | 2 | -4/+9 |
* | | | | | Merge pull request #4553 from owncloud/update_search_classes | Vincent Petry | 2014-06-06 | 22 | -134/+687 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | allow apps to add translation for search result typeid | Jörn Friedrich Dreyer | 2014-06-06 | 2 | -1/+8 |
| * | | | | use non static access to search | Jörn Friedrich Dreyer | 2014-06-06 | 2 | -2/+2 |
| * | | | | fix namespace for legacy search classes | Jörn Friedrich Dreyer | 2014-06-06 | 2 | -2/+2 |
| * | | | | make search non-static, add ISearch to server container, make legacy a static... | Jörn Friedrich Dreyer | 2014-06-06 | 9 | -31/+146 |
| * | | | | minor phpdoc cleanup and imports | Jörn Friedrich Dreyer | 2014-06-05 | 6 | -13/+14 |
| * | | | | Simplify client-side result customization | Andrew Brown | 2014-06-05 | 1 | -28/+9 |
| * | | | | Move new search results to 'lib/private/search' | Andrew Brown | 2014-06-05 | 5 | -1/+1 |
| * | | | | Move legacy search to 'lib/private/legacy' | Andrew Brown | 2014-06-05 | 5 | -68/+29 |
| * | | | | Re-add type to legacy OC_Search_Result class | Andrew Brown | 2014-06-05 | 1 | -1/+14 |
| * | | | | use path param to create scrollto url | Jörn Friedrich Dreyer | 2014-06-05 | 1 | -11/+16 |
| * | | | | decode filename for scrollto | Jörn Friedrich Dreyer | 2014-06-05 | 1 | -1/+1 |
| * | | | | fix minor typos | Jörn Friedrich Dreyer | 2014-06-05 | 1 | -0/+25 |
| * | | | | Add audio and image result types | Andrew Brown | 2014-06-05 | 1 | -2/+2 |
| * | | | | Add audio and image result types | Andrew Brown | 2014-06-05 | 3 | -1/+81 |
| * | | | | fix formatting | Jörn Friedrich Dreyer | 2014-06-05 | 10 | -191/+200 |
| * | | | | Add legacy adapters for file search | Andrew Brown | 2014-06-05 | 4 | -0/+133 |
| * | | | | Move to new namespace convention and add new result sub-classing | Andrew Brown | 2014-06-05 | 6 | -100/+323 |
* | | | | | Merge pull request #8895 from owncloud/mimetype_fixes | Thomas Müller | 2014-06-06 | 3 | -3/+78 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | increase version number of files and migration trigger | Jörn Friedrich Dreyer | 2014-06-06 | 2 | -2/+2 |
| * | | | | add more and fix office mimetypes, migrate wrong mimetypes | Jörn Friedrich Dreyer | 2014-06-06 | 2 | -2/+77 |
|/ / / / | |||||
* | | | | Merge pull request #8666 from owncloud/mount-remove | icewind1991 | 2014-06-06 | 30 | -377/+1185 |
|\ \ \ \ | |||||
| * | | | | Dont connect hooks twice | Robin Appelman | 2014-06-06 | 1 | -0/+6 |
| * | | | | check if permissions exists | Bjoern Schiessle | 2014-06-06 | 1 | -1/+5 |
| * | | | | Limit permissions to share permissions | Robin Appelman | 2014-06-06 | 1 | -0/+3 |
| * | | | | make sure that we only delete shares for the current user | Bjoern Schiessle | 2014-06-06 | 1 | -3/+8 |
| * | | | | only unshare user share if it was shared with the current user | Bjoern Schiessle | 2014-06-06 | 1 | -1/+2 |
| * | | | | make sure that we remove all shares refering to the same parent | Bjoern Schiessle | 2014-06-06 | 1 | -21/+0 |
| * | | | | fix unshareFromSelf() | Bjoern Schiessle | 2014-06-06 | 3 | -32/+115 |
| * | | | | update unit tests and make sure that we return the right permissions for file... | Bjoern Schiessle | 2014-06-06 | 1 | -0/+5 |
| * | | | | the mount point always have delete permissions to allow unmount | Bjoern Schiessle | 2014-06-06 | 1 | -2/+2 |
| * | | | | add some tests | Bjoern Schiessle | 2014-06-06 | 1 | -1/+59 |
| * | | | | nake sure ti create new db entry when user renames a group share | Bjoern Schiessle | 2014-06-06 | 1 | -1/+1 |
| * | | | | Fix unit test | Robin Appelman | 2014-06-06 | 1 | -1/+1 |
| * | | | | Fix unit tests | Robin Appelman | 2014-06-06 | 1 | -1/+1 |
| * | | | | fix db query | Bjoern Schiessle | 2014-06-06 | 1 | -1/+1 |