summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8933 from owncloud/fix-logo-glitchRaghu Nayyar2014-06-067-62/+10
|\
| * reduce padding by 1px after increasing imageJan-Christoph Borchardt2014-06-061-1/+1
| * fix logo glitch, add whitespace around formJan-Christoph Borchardt2014-06-067-61/+9
* | Merge pull request #8253 from owncloud/pk-on-all-tables-masterThomas Müller2014-06-068-3/+109
|\ \
| * | adding PK to table encryptionThomas Müller2014-06-068-3/+109
* | | Merge pull request #8921 from owncloud/fix-remove-storage-masterThomas Müller2014-06-061-10/+22
|\ \ \ | |_|/ |/| |
| * | No need to create a storage within removeThomas Müller2014-06-061-10/+22
* | | Merge pull request #8922 from owncloud/design-controls-transparencyJan-Christoph Borchardt2014-06-066-46/+25
|\ \ \
| * | | fix left padding of controls bar for apps without navigationJan-Christoph Borchardt2014-06-061-1/+6
| * | | slight transparency for controls bar for more open feelJan-Christoph Borchardt2014-06-061-1/+1
| * | | fix apps without app-navigationJan-Christoph Borchardt2014-06-061-1/+1
| * | | unify controls bar, remove duplicate from user managementJan-Christoph Borchardt2014-06-065-43/+17
* | | | Merge pull request #8923 from owncloud/app-settings-inputJan-Christoph Borchardt2014-06-062-4/+9
|\ \ \ \
| * | | | app settings: display input fields at full widthJan-Christoph Borchardt2014-06-062-4/+9
* | | | | Merge pull request #4553 from owncloud/update_search_classesVincent Petry2014-06-0622-134/+687
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | allow apps to add translation for search result typeidJörn Friedrich Dreyer2014-06-062-1/+8
| * | | | use non static access to searchJörn Friedrich Dreyer2014-06-062-2/+2
| * | | | fix namespace for legacy search classesJörn Friedrich Dreyer2014-06-062-2/+2
| * | | | make search non-static, add ISearch to server container, make legacy a static...Jörn Friedrich Dreyer2014-06-069-31/+146
| * | | | minor phpdoc cleanup and importsJörn Friedrich Dreyer2014-06-056-13/+14
| * | | | Simplify client-side result customizationAndrew Brown2014-06-051-28/+9
| * | | | Move new search results to 'lib/private/search'Andrew Brown2014-06-055-1/+1
| * | | | Move legacy search to 'lib/private/legacy'Andrew Brown2014-06-055-68/+29
| * | | | Re-add type to legacy OC_Search_Result classAndrew Brown2014-06-051-1/+14
| * | | | use path param to create scrollto urlJörn Friedrich Dreyer2014-06-051-11/+16
| * | | | decode filename for scrolltoJörn Friedrich Dreyer2014-06-051-1/+1
| * | | | fix minor typosJörn Friedrich Dreyer2014-06-051-0/+25
| * | | | Add audio and image result typesAndrew Brown2014-06-051-2/+2
| * | | | Add audio and image result typesAndrew Brown2014-06-053-1/+81
| * | | | fix formattingJörn Friedrich Dreyer2014-06-0510-191/+200
| * | | | Add legacy adapters for file searchAndrew Brown2014-06-054-0/+133
| * | | | Move to new namespace convention and add new result sub-classingAndrew Brown2014-06-056-100/+323
* | | | | Merge pull request #8895 from owncloud/mimetype_fixesThomas Müller2014-06-063-3/+78
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | increase version number of files and migration triggerJörn Friedrich Dreyer2014-06-062-2/+2
| * | | | add more and fix office mimetypes, migrate wrong mimetypesJörn Friedrich Dreyer2014-06-062-2/+77
|/ / / /
* | | | Merge pull request #8666 from owncloud/mount-removeicewind19912014-06-0630-377/+1185
|\ \ \ \
| * | | | Dont connect hooks twiceRobin Appelman2014-06-061-0/+6
| * | | | check if permissions existsBjoern Schiessle2014-06-061-1/+5
| * | | | Limit permissions to share permissionsRobin Appelman2014-06-061-0/+3
| * | | | make sure that we only delete shares for the current userBjoern Schiessle2014-06-061-3/+8
| * | | | only unshare user share if it was shared with the current userBjoern Schiessle2014-06-061-1/+2
| * | | | make sure that we remove all shares refering to the same parentBjoern Schiessle2014-06-061-21/+0
| * | | | fix unshareFromSelf()Bjoern Schiessle2014-06-063-32/+115
| * | | | update unit tests and make sure that we return the right permissions for file...Bjoern Schiessle2014-06-061-0/+5
| * | | | the mount point always have delete permissions to allow unmountBjoern Schiessle2014-06-061-2/+2
| * | | | add some testsBjoern Schiessle2014-06-061-1/+59
| * | | | nake sure ti create new db entry when user renames a group shareBjoern Schiessle2014-06-061-1/+1
| * | | | Fix unit testRobin Appelman2014-06-061-1/+1
| * | | | Fix unit testsRobin Appelman2014-06-061-1/+1
| * | | | fix db queryBjoern Schiessle2014-06-061-1/+1