aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
Commit message (Expand)AuthorAgeFilesLines
* remove unneccessary lib in namespaceJörn Friedrich Dreyer2013-09-201-1/+1
* namespaces use upcasefirst partsJörn Friedrich Dreyer2013-09-201-1/+1
* Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-194-1/+48
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-09-184-1/+48
* | move upload dialog css to separate fileJörn Friedrich Dreyer2013-09-181-0/+1
* | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-176-15/+43
|\|
| * Merge pull request #4838 from owncloud/refactor_upload_jsThomas Müller2013-09-161-14/+13
| |\
| | * refactor upload js & html to always use only js to fill form dataJörn Friedrich Dreyer2013-09-131-14/+13
| * | Merge pull request #4501 from owncloud/ajaxfilelistThomas Müller2013-09-142-2/+2
| |\ \
| | * | Ajax calls for "files" and "files_trashbin" appsVincent Petry2013-09-132-2/+2
| | |/
| * / [tx-robot] updated from transifexJenkins for ownCloud2013-09-131-0/+7
| |/
| * Merge pull request #4719 from owncloud/port_4701_masterThomas Müller2013-09-121-1/+2
| |\
| | * more is_resource checks before readdirArthur Schiwon2013-09-051-1/+2
| * | adding calls to \OCA\files\lib\Helper::determineIcon($i) in files, trashbin a...Thomas Müller2013-09-121-0/+15
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-09-111-0/+6
* | | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-102-0/+14
|\| |
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-09-102-0/+14
* | | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-061-1/+1
|\| |
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-09-051-1/+1
| |/
* | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-0418-34/+148
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2013-09-031-0/+6
| * [tx-robot] updated from transifexJenkins for ownCloud2013-09-011-2/+2
| * 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
| |\| | | |
| * | | | | fix js errorGeorg Ehrke2013-08-071-1/+1