summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
Commit message (Expand)AuthorAgeFilesLines
* Merge master into oc_previewGeorg Ehrke2013-08-293-22/+14
|\
| * backport of #4357 to masterThomas Müller2013-08-271-3/+7
| * [tx-robot] updated from transifexJenkins for ownCloud2013-08-271-0/+7
| * kill zh_CN.GB2312Thomas Müller2013-08-271-19/+0
* | Merge master into oc_previewGeorg Ehrke2013-08-261-0/+6
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2013-08-251-0/+6
* | Merge branch 'master' into oc_previewGeorg Ehrke2013-08-233-4/+11
|\|
| * Merge pull request #4262 from owncloud/fix_jslint_kondouChristopher2013-08-201-3/+3
| |\
| | * Merge branch 'master' into fix_jslint_kondoukondou2013-08-1871-74/+342
| | |\
| | * | Fix a syntax error & have if-conds in an own linekondou2013-08-011-1/+1
| | * | Fix some JSLint warningskondou2013-07-311-4/+4
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-191-0/+7
| * | | Merge pull request #4467 from owncloud/storage-wrapper-quotaicewind19912013-08-191-1/+1
| |\ \ \
| | * \ \ merge master in storage-wrapper-quotaRobin Appelman2013-08-1874-74/+375
| | |\ \ \ | | | | |/ | | | |/|
| | * | | use renamed constantsRobin Appelman2013-07-251-1/+1
* | | | | move isMimeSupported out of template filesGeorg Ehrke2013-08-211-0/+1
* | | | | outsource sharing and deleted files previews to appsGeorg Ehrke2013-08-192-0/+90
* | | | | Merge master into oc_previewGeorg Ehrke2013-08-199-14/+19
|\| | | |
| * | | | Merge pull request #4497 from owncloud/newlines_at_eof_kondouKondou2013-08-186-6/+6
| |\ \ \ \
| | * | | | Add _many_ newlines at the end of fileskondou2013-08-186-6/+6
| | | |/ / | | |/| |
| * | | | Use boolean casting for bitwise and result.Andreas Fischer2013-08-171-1/+1
| * | | | Compare result are already true/falseBart Visscher2013-08-171-3/+3
| |/ / /
| * | | remove ru_RU - fixes #3135Thomas Müller2013-08-171-5/+0
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-161-0/+7
| * | | Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_fir...Thomas Müller2013-08-151-2/+5
| |\ \ \
| | * | | fix #2711 using a custom event, also use css selectors over filterAttrJörn Friedrich Dreyer2013-08-081-2/+5
* | | | | Merge master into oc_previewGeorg Ehrke2013-08-1470-71/+255
|\| | | |
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-132-0/+12
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-0970-70/+235
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-072-1/+8
| |/ / /
* | | | fix js errorGeorg Ehrke2013-08-071-1/+1
* | | | implement previews of single shared filesGeorg Ehrke2013-08-072-1/+5
* | | | fix merge conflictsGeorg Ehrke2013-08-0516-0/+109
|\| | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-031-0/+6
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-022-0/+12
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-0110-0/+61
| | |/ | |/|
| * | Merge pull request #4225 from owncloud/better-404Thomas Müller2013-07-303-0/+30
| |\ \
| | * | Use default cursor for list itemsVictor Dubiniuk2013-07-301-1/+1
| | * | RewordingVictor Dubiniuk2013-07-291-1/+1
| | * | Move styles from core to appVictor Dubiniuk2013-07-292-0/+13
| | * | Allow apps to have own 404 content, closes #3225Victor Dubiniuk2013-07-292-0/+17
* | | | Merge branch 'master' into oc_previewGeorg Ehrke2013-07-301-0/+1
|\| | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-301-0/+1
| |/ /
* | | style fixesGeorg Ehrke2013-07-301-1/+1
* | | Merge branch 'master' into oc_previewThomas Müller2013-07-3014-6/+19
|\| |
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-07-281-0/+1
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-07-271-0/+1
| |/
| * initialize OC_Defaults in template constructorXBjörn Schießle2013-07-241-5/+3
| * Merge branch 'master' into more-themable-stringsThomas Müller2013-07-249-1/+12
| |\
| | * Merge branch 'master' into disable-anon-upload-masterThomas Müller2013-07-226-1/+6
| | |\