summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* $image doesn't have data() when a defaultavatar should be usedkondou2013-09-011-1/+1
* Also set an E-Tag headerkondou2013-09-011-0/+2
* Use \OC_Response for cache invalidationkondou2013-09-011-10/+4
* Properly check for tmpavatar, invalidate cache, fix debug msgskondou2013-09-011-3/+14
* Fix @tanghus's complains in avatars and clean up cropper after closing with "x"kondou2013-09-011-6/+30
* Provide 'enable_avatars' in config.php, to disable avatarskondou2013-09-011-0/+2
* Better naming than "ava" & "data", cache timeout, use OC.Router.registerLoade...kondou2013-09-013-15/+17
* Add a description for $.avatar() and remove TODOs @raghunayyar fixedkondou2013-08-312-2/+28
* Deal with OC.Router.generate()kondou2013-08-311-4/+4
* Sanitize displayname, respect data @ $element, fix routename, clean after cro...kondou2013-08-313-8/+16
* Merge branch 'master' into oc_avatarskondou2013-08-31134-370/+3456
|\
| * Merge master into oc_previewGeorg Ehrke2013-08-3031-317/+489
| |\
| | * Merge pull request #4661 from owncloud/separate-app-stylesJan-Christoph Borchardt2013-08-303-283/+282
| | |\
| | | * move CSS for browser-specific fixes out of styles.css into new fixes.cssJan-Christoph Borchardt2013-08-302-44/+46
| | | * move CSS for apps out of styles.css into new apps.cssJan-Christoph Borchardt2013-08-302-239/+236
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-08-3026-26/+177
| | * | 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
| | |/
| * | Merge master into oc_previewGeorg Ehrke2013-08-2919-183/+162
| |\|
| | * Merge pull request #4552 from dampfklon/fix4552Morris Jobke2013-08-281-1/+5
| | |\
| | | * Make group suffix in share dialog translatabledampfklon2013-08-221-1/+5
| * | | Merge master into oc_previewGeorg Ehrke2013-08-265-14/+45
| |\ \ \
| * \ \ \ Merge branch 'master' into oc_previewGeorg Ehrke2013-08-2380-286/+132
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | outsource sharing and deleted files previews to appsGeorg Ehrke2013-08-193-133/+0
| * | | | style fixes for preview libGeorg Ehrke2013-08-191-4/+5
| * | | | Merge master into oc_previewGeorg Ehrke2013-08-19105-516/+556
| |\ \ \ \
| * | | | | add folder icons for shared, public and externalJan-Christoph Borchardt2013-08-156-0/+204
| * | | | | adjust New file dialog for new stylesJan-Christoph Borchardt2013-08-152-13/+11
| * | | | | Merge master into oc_previewGeorg Ehrke2013-08-1480-118/+519
| |\ \ \ \ \
| * | | | | | increase row height to 50px, properly position everything, checkboxes, action...Jan-Christoph Borchardt2013-08-141-1/+1
| * | | | | | adjustments of video and web iconJan-Christoph Borchardt2013-08-148-243/+109
| * | | | | | Merge branch 'oc_preview' of github.com:owncloud/core into oc_previewJan-Christoph Borchardt2013-08-143-12/+0
| |\ \ \ \ \ \
| | * | | | | | remove \OC\Preview::showErrorPreviewGeorg Ehrke2013-08-143-12/+0
| * | | | | | | replace different icons for code with proper onesJan-Christoph Borchardt2013-08-1420-50/+317
| * | | | | | | replace different icons for documents, spreadsheets and presentations with pr...Jan-Christoph Borchardt2013-08-1418-0/+233
| * | | | | | | replace same but differently named package graphics with one proper oneJan-Christoph Borchardt2013-08-1416-0/+62
| * | | | | | | add more file type icons, replace old onesJan-Christoph Borchardt2013-08-1415-0/+1387
| |/ / / / / /
| * | | | | | fix merge conflictsGeorg Ehrke2013-08-0510-26/+109
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into oc_previewGeorg Ehrke2013-07-302-21/+25
| |\ \ \ \ \ \ \
| * | | | | | | | fix code style of try catch blocksGeorg Ehrke2013-07-301-1/+1
| * | | | | | | | style fixesGeorg Ehrke2013-07-304-3/+183
| * | | | | | | | Merge branch 'master' into oc_previewThomas Müller2013-07-3061-257/+447
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Revert "OC\Preview - outsource static methods"Georg Ehrke2013-07-291-4/+3
| * | | | | | | | | Optimize images with optipng and scourkondou2013-07-1220-4779/+634
| * | | | | | | | | OC\Preview - outsource static methodsGeorg Ehrke2013-07-111-3/+4
| * | | | | | | | | merge conflicts ...Georg Ehrke2013-07-1093-411/+538
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | add two new icons - for copyright see filetypes/readme-2.txtGeorg Ehrke2013-07-102-0/+183
| * | | | | | | | | | implement use of preview icons in thrashbin appGeorg Ehrke2013-07-081-0/+2
| * | | | | | | | | | first round of replacing small filetype icons with proper ones, from ElementaryJan-Christoph Borchardt2013-06-2526-0/+4813