summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \
| * | | | | no duplicate declaration of appLicense + camelCaseThomas Müller2013-08-281-5/+4
| * | | | | Work around #4630 to fix license showingkondou2013-08-281-1/+10
* | | | | | Merge pull request #3926 from owncloud/improve_filesummaryThomas Müller2013-08-284-40/+127
|\ \ \ \ \ \
| * | | | | | Reimplement filesummary in JSkondou2013-08-284-40/+127
* | | | | | | Merge pull request #4614 from owncloud/trashbin_also_show_empty_foldersThomas Müller2013-08-281-5/+0
|\ \ \ \ \ \ \
| * | | | | | | also move empty folders to the trash bin as discussed here #4590Bjoern Schiessle2013-08-281-5/+0
* | | | | | | | Merge pull request #4615 from owncloud/npm-modulesThomas Müller2013-08-281-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Adds Node Modules to build in gitignore for easy testing.raghunayyar2013-08-281-0/+3
| |/ / / / / / /
* | | | | | | | Merge pull request #4618 from owncloud/visualize-jsMorris Jobke2013-08-282-0/+65
|\ \ \ \ \ \ \ \
| * | | | | | | | fixing typoThomas Müller2013-08-281-1/+1
| * | | | | | | | calculate fontsize and line-heightMorris Jobke2013-08-281-2/+7
| * | | | | | | | update 3rdparty - md5Morris Jobke2013-08-281-0/+0
| * | | | | | | | fix 3rdparty commitMorris Jobke2013-08-281-0/+0
| * | | | | | | | reviewers commentsMorris Jobke2013-08-281-6/+14
| * | | | | | | | add visualizeMorris Jobke2013-08-282-0/+52
| |/ / / / / / /