summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Sanitize displayname, respect data @ $element, fix routename, clean after cro...kondou2013-08-315-12/+18
* Merge branch 'master' into oc_avatarskondou2013-08-31463-5441/+12834
|\
| * 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
| | | | | | | | * invert logic of disable_previewsGeorg Ehrke2013-08-292-4/+4
| | | | | | | | * use random string as id for checkboxGeorg Ehrke2013-08-261-1/+2
| | | | | | | | * fix background size in filelist.jsGeorg Ehrke2013-08-261-1/+1
| | | | | | | | * Merge master into oc_previewGeorg Ehrke2013-08-26268-2952/+8420
| | | | | | | | |\
| | | | | | | | * | fix preview issue when uploading a file with parenthesesGeorg Ehrke2013-08-261-1/+3
| | | | | | | | * | fix return value of methodGeorg Ehrke2013-08-231-1/+2
| | | | | | | | * | move path generation for previews to dedicated functionGeorg Ehrke2013-08-232-3/+8
| | | | | | | | * | Merge branch 'master' into oc_previewGeorg Ehrke2013-08-23839-14198/+14028
| | | | | | | | |\ \ | | | | | | |_|_|/ / | | | | | |/| | | |
| | | | | | | | * | make it possible to disable previewsGeorg Ehrke2013-08-232-0/+11
| | | | | | | | * | move isMimeSupported out of template filesGeorg Ehrke2013-08-215-5/+12
| | | | | | | | * | outsource sharing and deleted files previews to appsGeorg Ehrke2013-08-195-8/+12
| | | | | | | | * | style fixes for preview libGeorg Ehrke2013-08-198-48/+55