summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8972 from owncloud/use_imagettftext_take2Morris Jobke2014-06-112-2/+6
|\
| * make text preview backend use imagettftext, fixes #8087Georg Ehrke2014-06-102-2/+6
* | Merge pull request #8971 from owncloud/sidebar-disablesnapperinielte9jbtbnl2014-06-101-1/+1
|\ \
| * | Disable snapper init for IE <= 9Vincent Petry2014-06-101-1/+1
|/ /
* | Merge pull request #8908 from owncloud/fix-placeholdersMorris Jobke2014-06-103-5/+5
|\ \ | |/ |/|
| * fix split translationsVolkan Gezer2014-06-063-5/+5
* | [tx-robot] updated from transifexJenkins for ownCloud2014-06-10102-245/+278
* | Merge pull request #8928 from owncloud/too-long-filename-fix-v2jbtbnl2014-06-093-6/+58
|\ \
| * | improve ellipsis of filename for different screen sizesMorris Jobke2014-06-082-19/+22
| * | @jancborchardt's commit for cross browser compatibility of extension.raghunayyar2014-06-081-3/+1
| * | Adds class name to span element inside filename.raghunayyar2014-06-072-7/+7
| * | Adds multiple media queries for filename.raghunayyar2014-06-071-1/+37
| * | Ellipcises too long filenamesraghunayyar2014-06-062-1/+16
* | | Merge pull request #8948 from owncloud/fix-logger-race-conditionMorris Jobke2014-06-091-1/+1
|\ \ \
| * | | set logger before registrate to an error handlerMorris Jobke2014-06-091-1/+1
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-0949-423/+735
* | | Merge pull request #8916 from owncloud/rmdirr-test-cleanup-fixMorris Jobke2014-06-082-4/+11
|\ \ \
| * | | Added hacky fix for long path cleanup routineVincent Petry2014-06-062-4/+11
* | | | Merge pull request #8937 from owncloud/design-sizingMorris Jobke2014-06-082-2/+2
|\ \ \ \
| * | | | display empty content message a bit higher up so it's easier to seeJan-Christoph Borchardt2014-06-071-1/+1
| * | | | app settings: only display text fields at full width, not buttonsJan-Christoph Borchardt2014-06-071-1/+1
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-08614-1641/+2125
* | | | | Merge pull request #8942 from owncloud/fix-user-search-fieldVolkan Gezer2014-06-081-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix hidden user group search fieldVolkan Gezer2014-06-071-1/+1
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-07536-15604/+18729
* | | | Merge pull request #8927 from owncloud/expire_only_link_sharesBjörn Schießle2014-06-066-111/+136
|\ \ \ \
| * | | | set minDate and maxDate in datepickerBjoern Schiessle2014-06-062-1/+7
| * | | | only expire link sharesBjoern Schiessle2014-06-065-110/+129
* | | | | Merge pull request #8935 from owncloud/missed-apps-tagRaghu Nayyar2014-06-061-1/+1
|\ \ \ \ \
| * | | | | wrap App text with t() to let it use localesVolkan Gezer2014-06-061-1/+1
* | | | | | Merge pull request #8925 from owncloud/extstorage-sidebarVincent Petry2014-06-068-5/+363
|\ \ \ \ \ \
| * | | | | | Fixed delete button CSS in ext storage listVincent Petry2014-06-063-9/+10
| * | | | | | Added more columns to ext storage listVincent Petry2014-06-063-22/+55
| * | | | | | Fixed ext storage list sortingVincent Petry2014-06-061-8/+6
| * | | | | | Added external storage list in files appVincent Petry2014-06-067-0/+326
| | |/ / / / | |/| | | |
* | | | | | 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
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |