aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* use on to add event listener instead of deprecated jquery bindJörn Friedrich Dreyer2013-09-031-1/+2
* Merge pull request #4673 from owncloud/ocsapi_cleanupJörn Friedrich Dreyer2013-09-022-36/+0
|\
| * remove the activity call here. it is not implemented anyways. This will be pr...Frank Karlitschek2013-08-312-36/+0
* | Merge pull request #4663 from owncloud/fix-sticky-appsMorris Jobke2013-09-021-4/+4
|\ \
| * | fix issues caused by introduction of sticky Apps management footerJan-Christoph Borchardt2013-08-301-4/+4
* | | Merge pull request #4657 from owncloud/files-controls-fixesMorris Jobke2013-09-011-7/+13
|\ \ \
| * | | adjust right padding of controls bar, fix #4650Jan-Christoph Borchardt2013-08-301-2/+2
| * | | fix coding style for controls barJan-Christoph Borchardt2013-08-301-7/+13
* | | | Merge pull request #4674 from owncloud/fit-filepicker-new-iconsMorris Jobke2013-09-012-2/+19
|\ \ \ \
| * | | | IE8 fixesMorris Jobke2013-09-021-0/+4
| * | | | Fit filesummary for \OC\Preview's ne mimetype-iconskondou2013-08-311-2/+15
| | |_|/ | |/| |
* | | | Merge pull request #4671 from owncloud/emptycontentBernhard Posselt2013-09-015-11/+12
|\ \ \ \
| * | | | rename emptyfolder to emptycontentAlessandro Cosentino2013-08-313-8/+8
| * | | | text centered horizontally and vertically in emptycontent divAlessandro Cosentino2013-08-313-8/+9
| |/ / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-01228-1751/+1919
* | | | Merge pull request #4329 from owncloud/fix_4258Christopher2013-09-012-145/+192
|\ \ \ \
| * | | | Check for $this->fileInfo and @depend on testData()kondou2013-09-012-2/+5
| * | | | Merge branch 'master' into fix_4258kondou2013-08-31145-120/+4872
| |\| | |
| * | | | Fix #4258, clean up \OC_Image and improve its unittestkondou2013-08-302-145/+189
* | | | | fixing this obvious typo directlyFrank Karlitschek2013-09-011-1/+1
| |/ / / |/| | |
* | | | Merge pull request #4022 from owncloud/oc_previewThomas Müller2013-08-31145-120/+4872
|\ \ \ \ | |/ / / |/| | |
| * | | fix issue with filetable backgroundGeorg Ehrke2013-08-301-1/+1
| * | | Merge master into oc_previewGeorg Ehrke2013-08-30320-5280/+7824
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #4661 from owncloud/separate-app-stylesJan-Christoph Borchardt2013-08-304-284/+285
|\ \ \ \
| * | | | move CSS for browser-specific fixes out of styles.css into new fixes.cssJan-Christoph Borchardt2013-08-303-44/+47
| * | | | move CSS for apps out of styles.css into new apps.cssJan-Christoph Borchardt2013-08-303-240/+238
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-30308-4962/+7462
* | | | | Merge pull request #4578 from houbaastef/masterStephane Martin2013-08-301-5/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | fixes #4574Stephane Martin2013-08-261-5/+10
* | | | | Merge pull request #4660 from owncloud/apps-management-stickyMorris Jobke2013-08-302-2/+25
|\ \ \ \ \
| * | | | | Apps management as sticky footer and rename to 'Apps', fix #4622Jan-Christoph Borchardt2013-08-302-2/+25
| | |/ / / | |/| | |
* | | | | Use Group methods for searching, fixes #4201Arthur Schiwon2013-08-301-6/+5
* | | | | prefix 'tbody tr' to separate app/core css errorspetemcfarlane2013-08-301-1/+1
* | | | | Use the real username in preferences and magic cookie instead of case-insensi...Arthur Schiwon2013-08-301-3/+4
|/ / / /
* | | | Merge pull request #4642 from masakik/masterMorris Jobke2013-08-292-9/+28
|\ \ \ \
| * | | | replace ident spaces with tabsMasaki2013-08-292-22/+23
| * | | | enable usage with CLI interfaceMasaki Kawabata Neto2013-08-291-2/+5
| * | | | added help and status commandsMasaki Kawabata Neto2013-08-290-0/+0
| * | | | added help and status commandsMasaki Kawabata Neto2013-08-291-7/+22
* | | | | Merge pull request #4592 from owncloud/fix-logicThomas Müller2013-08-291-4/+2
|\ \ \ \ \
| * | | | | fix weird logical behaviourMorris Jobke2013-08-271-4/+2
* | | | | | Merge pull request #4643 from owncloud/touch-newfile-hookThomas Müller2013-08-291-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | also emmit create hook when creating new files using touch()Robin Appelman2013-08-291-0/+1
|/ / / / /
* | | | | webdav quota information contains the values for used and free - not totalThomas Müller2013-08-291-1/+1
| | | * | use gerMimeTypeDetector detectPath instead of getMimeTypeGeorg Ehrke2013-08-301-1/+1
| | | * | fix parameter missing warningGeorg Ehrke2013-08-291-1/+1
| | | * | Merge master into oc_previewGeorg Ehrke2013-08-29368-5791/+6409
| | | |\ \ | |_|_|/ / |/| | | |
* | | | | Merge pull request #4552 from dampfklon/fix4552Morris Jobke2013-08-281-1/+5
|\ \ \ \ \
| * | | | | Make group suffix in share dialog translatabledampfklon2013-08-221-1/+5
* | | | | | Merge pull request #4631 from owncloud/hotfix_4630Morris Jobke2013-08-281-1/+9
|\ \ \ \ \ \