Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #319 from owncloud/fileactions_newfile | icewind1991 | 2012-11-12 | 1 | -6/+10 |
|\ | | | | | Add fileactions to new files and folders | ||||
| * | add actions to newly created files and folders | Robin Appelman | 2012-11-07 | 1 | -0/+2 |
| | | | | | | | | closes #231 | ||||
| * | reuse jquery object when adding files to the file list | Robin Appelman | 2012-11-07 | 1 | -6/+8 |
| | | |||||
* | | add i18n for cancel button | Jörn Friedrich Dreyer | 2012-11-12 | 1 | -2/+5 |
| | | |||||
* | | Merge pull request #261 from owncloud/fix_opera_file_delete | Georg Ehrke | 2012-11-08 | 1 | -0/+3 |
|\ \ | |/ |/| | fix file delete in opera - fixes #188 | ||||
| * | fix file delete in opera - fixes #188 | Georg Ehrke | 2012-11-05 | 1 | -0/+3 |
| | | |||||
* | | Revert "fix blocking drag & drop upload of folders" | Robin Appelman | 2012-11-07 | 1 | -2/+2 |
| | | | | | | | | | | | | Fixes #150 This reverts commit 5b2f3c7f72a002b38da31a6748c0de22cb335203. | ||||
* | | Merge pull request #306 from owncloud/crumb_drop_fix | Björn Schießle | 2012-11-07 | 1 | -1/+1 |
|\ \ | | | | | | | extract the right file name for drag&drop. | ||||
| * | | get the right file name for drag&drop. This was necessary after the switch ↵ | Björn Schießle | 2012-11-07 | 1 | -1/+1 |
| |/ | | | | | | | to css to show/hide file actions, otherwise the actions where part of the extracted file name. | ||||
* / | Moved relative_modified_date from file/js to core/js | Alessandro Cosentino | 2012-11-06 | 1 | -21/+0 |
|/ | |||||
* | remove debug statements | Robin Appelman | 2012-11-05 | 1 | -2/+0 |
| | |||||
* | this line shouldn't be here | Robin Appelman | 2012-11-04 | 1 | -1/+0 |
| | |||||
* | some more code reuse for fileactions | Robin Appelman | 2012-11-04 | 1 | -16/+13 |
| | | | | also fixes an issue where some fileactions always worked on the last file in the list | ||||
* | Fix shared status icons | Michael Gapczynski | 2012-10-28 | 1 | -1/+1 |
| | |||||
* | properly replace fileaction icons with pngs when needed | Robin Appelman | 2012-10-28 | 1 | -2/+2 |
| | |||||
* | use css to show/hide fileactions | Robin Appelman | 2012-10-28 | 2 | -28/+10 |
| | |||||
* | code style | Robin Appelman | 2012-10-28 | 1 | -93/+101 |
| | |||||
* | Fix download url generation | Bart Visscher | 2012-10-27 | 1 | -1/+1 |
| | |||||
* | Merge branch 'routing' | Bart Visscher | 2012-10-27 | 2 | -2/+2 |
|\ | | | | | | | | | | | Conflicts: core/lostpassword/index.php core/lostpassword/resetpassword.php | ||||
| * | Merge branch 'master' into routing | Bart Visscher | 2012-10-17 | 2 | -34/+49 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: lib/search/provider/file.php settings/ajax/changepassword.php settings/settings.php | ||||
| * \ | Merge branch 'master' into routing | Bart Visscher | 2012-09-28 | 1 | -1/+1 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into routing | Bart Visscher | 2012-09-28 | 3 | -61/+73 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/filelist.js core/js/js.js lib/ocs.php | ||||
| * \ \ \ | Merge branch 'master' into routing | Bart Visscher | 2012-09-07 | 3 | -84/+170 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/fileactions.js lib/base.php lib/helper.php lib/ocs.php | ||||
| * \ \ \ \ | Merge branch 'master' into routing | Bart Visscher | 2012-08-30 | 1 | -3/+3 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/contacts/js/contacts.js apps/contacts/lib/search.php apps/files_archive/js/archive.js apps/gallery/lib/tiles.php apps/gallery/templates/index.php lib/ocs.php | ||||
| * \ \ \ \ \ | Merge remote-tracking branch 'gitorious/master' into routing | Bart Visscher | 2012-08-29 | 3 | -51/+84 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/fileactions.js apps/files_archive/js/archive.js | ||||
| * | | | | | | | Fix linkTo calls for new routing | Bart Visscher | 2012-08-15 | 2 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Check if New and Upload buttons exist before adding their width to the total ↵ | Michael Gapczynski | 2012-08-06 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | breadcrumbs width | ||||
* | | | | | | | | Merge pull request #39 from scambra/date-l10n-fixes | Thomas Müller | 2012-10-18 | 1 | -5/+4 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Date l10n fixes | ||||
| * | | | | | | | | Translate modification date when file is created/uploaded, use same strings ↵ | scambra | 2012-10-16 | 1 | -5/+4 |
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | as lib/template.php | ||||
* | | | | | | | | fix oc-605 | Jörn Friedrich Dreyer | 2012-10-18 | 1 | -7/+9 |
| | | | | | | | | |||||
* | | | | | | | | use interpolation for some translations in js | scambra | 2012-10-16 | 2 | -14/+14 |
|/ / / / / / / | |||||
* | | | | | | | Whitespace cleanup | Bart Visscher | 2012-10-14 | 2 | -5/+5 |
| | | | | | | | |||||
* | | | | | | | fix blocking drag & drop upload of folders | Robin Appelman | 2012-10-12 | 1 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | Sanitize user input | Lukas Reschke | 2012-10-12 | 1 | -6/+6 |
| | | | | | | | |||||
* | | | | | | | check if ID was assigned | Björn Schießle | 2012-10-08 | 1 | -1/+3 |
| | | | | | | | |||||
* | | | | | | | add data-id directly after upload/creation to the file list (bugfix for #1917) | Björn Schießle | 2012-10-08 | 2 | -3/+8 |
| | | | | | | | |||||
* | | | | | | | add ID to upload form and check if ID exist to avoid loading invalid ↵ | Björn Schießle | 2012-10-08 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | javascript code for read-only views. | ||||
* | | | | | | | Revert part of 5beca59b, fixes file upload bug oc-1926 | Michael Gapczynski | 2012-10-07 | 1 | -4/+1 |
| | | | | | | | |||||
* | | | | | | | enable user to download selected files from publically shared directory | Björn Schießle | 2012-10-05 | 1 | -1/+6 |
| | | | | | | | |||||
* | | | | | | | check if element really exists before calling it. (e.g. for public shared ↵ | Björn Schießle | 2012-10-05 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | files view, elements like "navigation" doesn't exist) | ||||
* | | | | | | | remove textbox after pressing "enter" even if the name is the same | Björn Schießle | 2012-10-02 | 1 | -16/+15 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Correctly fix oc-1016 and fix downloading of files | Bart Visscher | 2012-09-28 | 1 | -1/+1 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | fix sharing for newly uploaded or created files | Robin Appelman | 2012-09-26 | 1 | -4/+5 |
| | | | | | |||||
* | | | | | some js style fixes | Robin Appelman | 2012-09-23 | 1 | -20/+22 |
| | | | | | |||||
* | | | | | Merge pull request #15 from scambra/delete-fixes | Thomas Müller | 2012-09-21 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | use post to delete files, get has a limit and fails with many files | ||||
| * | | | | | use post to delete files, get has a limit and fails with many files | scambra | 2012-09-20 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | translate rename and history actions | scambra | 2012-09-21 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #13 from scambra/safari-fixes | icewind1991 | 2012-09-20 | 1 | -1/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | fix js success callback on safari when uploading files | ||||
| * | | | | | | fix js success callback on safari when uploading files | scambra | 2012-09-20 | 1 | -1/+2 |
| |/ / / / / | |||||
* | | | | | | fix for bug #1752 (Renaming of folders in files view does not work correctly ↵ | Björn Schießle | 2012-09-19 | 1 | -17/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | in firefox 15) |