summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into from-insane-autoescape-to-pThomas Mueller2013-03-0167-24/+103
|\
| * fixes #2001 - in case the user has no permissions to upload/create files/fold...Thomas Mueller2013-03-011-1/+2
| * Merge pull request #2005 from owncloud/trash_add_signalsBernhard Posselt2013-03-011-0/+6
| |\
| | * add additional parameter to signalBjörn Schießle2013-03-011-2/+6
| | * add post_moveToTrash and post_restore signals to the trash binBjörn Schießle2013-03-011-0/+2
| * | fix getVersions() call for the history viewBjörn Schießle2013-03-011-1/+2
| * | make sure that the version app always work on the users real home folder and ...Björn Schießle2013-03-011-7/+8
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2013-03-0162-15/+85
| * Merge pull request #1979 from maelzx/patch-2Lukas Reschke2013-02-281-1/+1
| |\
| | * Fix window.location mistakes in previous codemaelzx2013-02-281-1/+1
* | | Sed was wrongLukas Reschke2013-02-281-1/+1
* | | Merge masterLukas Reschke2013-02-2879-323/+100
|\| |
| * | Merge pull request #1397 from owncloud/trash_fileactionsJan-Christoph Borchardt2013-02-284-31/+72
| |\ \ | | |/ | |/|
| | * Trash: fix opening foldersRobin Appelman2013-02-281-2/+4
| | * Trash: disable text editor from trash for nowRobin Appelman2013-02-271-0/+4
| | * Trash: fix download.phpRobin Appelman2013-02-271-1/+1
| | * Trash: fix trash when default quota is usedRobin Appelman2013-02-271-1/+1
| | * Merge master into trash_fileactionsRobin Appelman2013-02-27373-2469/+30049
| | |\
| | * \ merge master into trash_fileactionsRobin Appelman2013-02-08259-1135/+3599
| | |\ \
| | * | | Trash: use the same sorting algoritm as filesRobin Appelman2013-01-311-0/+12
| | * | | Trash: fix opening foldersRobin Appelman2013-01-311-0/+2
| | * | | Trash: enable fileactions while viewing trashRobin Appelman2013-01-311-9/+27
| | * | | Trash: don't use depricated filesystem api classesRobin Appelman2013-01-312-107/+107
| | * | | Trash: highlight Files navigation entry while in trashRobin Appelman2013-01-311-14/+16
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-2875-292/+29
* | | | | [Files] Use p() instead of echoLukas Reschke2013-02-271-2/+1
* | | | | Merge masterLukas Reschke2013-02-271-2/+2
|\| | | |
| * | | | Update apps/files/templates/part.list.phpj-ed2013-02-271-2/+2
| | |_|/ | |/| |
* | | | [user_webdavauth] From echo to pLukas Reschke2013-02-271-4/+4
* | | | [user_ldap] From echo to pLukas Reschke2013-02-272-55/+55
* | | | [files_versions] From echo to pLukas Reschke2013-02-271-11/+11
* | | | [files_trashbin] From echo to pLukas Reschke2013-02-273-41/+41
* | | | [files] Unescape file sizeLukas Reschke2013-02-271-1/+1
* | | | [files_sharing] From echo to pLukas Reschke2013-02-273-32/+31
* | | | [files_external] From echo to pLukas Reschke2013-02-273-58/+58
* | | | [files_encryption] Use p() instead of echo()Lukas Reschke2013-02-272-8/+8
* | | | [Files] Use htmlspecialchars()Lukas Reschke2013-02-271-2/+2
* | | | [Files] Use p() instead of echoLukas Reschke2013-02-276-83/+83
|/ / /
* | | Merge pull request #1031 from owncloud/external_storage_ui_feedbackMichael Gapczynski2013-02-2716-182/+390
|\ \ \
| * | | Fix Dropbox and Google uiMichael Gapczynski2013-02-252-11/+11
| * | | Merge branch 'master' into external_storage_ui_feedbackMichael Gapczynski2013-02-25124-595/+1129
| |\ \ \
| * | | | attach on() events to external storage table, dom events in the table will al...Jörn Friedrich Dreyer2013-02-201-3/+3
| * | | | Merge branch 'master' into external_storage_ui_feedbackMichael Gapczynski2013-02-19116-262/+801
| |\ \ \ \
| * | | | | fixing issues with UTF8 characters in translatable stringsThomas Mueller2013-02-132-7/+2
| * | | | | adding spinner while talking to the backendThomas Mueller2013-02-122-2/+7
| * | | | | Merge branch 'master' into external_storage_ui_feedbackThomas Mueller2013-02-1216-22/+146
| |\ \ \ \ \
| * | | | | | fixing namespaceThomas Mueller2013-02-122-3/+3
| * | | | | | Merge branch 'master' into external_storage_ui_feedbackThomas Mueller2013-02-1219-7/+102
| |\ \ \ \ \ \
| * | | | | | | fixing namespaceThomas Mueller2013-02-122-3/+3
| * | | | | | | Replace another mount point placeholderMichael Gapczynski2013-02-111-1/+1