wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
41550 commits 157 branches 562 tags 714 MiB
Commit graph

1245 commits

Author SHA1 Message Date
Thomas Mueller
077e988136 oc-1548: prevent user from leaving the page while a file upload is in progress 2012-08-31 00:45:03 +02:00
Jörn Friedrich Dreyer
26ef012418 use permissions to quickfix drag selections 2012-08-31 00:13:02 +02:00
Bart Visscher
b483f2aab8 Merge branch 'master' into routing 
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
 2012-08-30 21:49:28 +02:00
Bart Visscher
0e58800016 Whitespace fixes in apps 2012-08-29 20:29:43 +02:00
Bart Visscher
cbaf858dea Merge remote-tracking branch 'gitorious/master' into routing 
Conflicts:
	apps/files/js/fileactions.js
	apps/files_archive/js/archive.js
 2012-08-29 20:16:39 +02:00
Michael Gapczynski
0c4575db7a Temporary fix to prevent rename action in root of Shared directory 2012-08-24 15:12:16 -04:00
Juan Carlos Cornejo
0944b4455b Moves the lastAction=null outside the if so it can include the undo requests from replace 2012-08-22 17:08:10 -04:00
Juan Carlos Cornejo
24a207a8fa Fixes a bug where if one tries to delete a file, then clicks undo, and then tries to delete the file again, no questions or undo options were presented. 
Essentially, just set FileLists.lastAction = null when one clicks undo.
 2012-08-22 16:56:00 -04:00
Arthur Schiwon
ef3eebfd3e Fix deletion for browser that do not support onBeforeUnload, fixes oc-1534. 2012-08-20 17:24:10 +02:00
Bart Visscher
ddfb9de147 Fix linkTo calls for new routing 2012-08-15 18:16:06 +02:00
Michael Gapczynski
de7f48b050 Check if New and Upload buttons exist before adding their width to the total breadcrumbs width 2012-08-06 17:37:10 -04:00
Michael Gapczynski
7c0a5d4a59 Check if New and Upload buttons exist before adding their width to the total breadcrumbs width 2012-08-06 17:35:22 -04:00
Michael Gapczynski
ea23854328 Merge branch 'master' into share_api 
Conflicts:
	apps/contacts/lib/app.php
	apps/contacts/templates/part.chooseaddressbook.rowfields.php
 2012-08-06 13:49:54 -04:00
Michael Gapczynski
086397d8a1 Fix condition checking for resizing breadcrumbs 2012-08-04 15:57:49 -04:00
Michael Gapczynski
207ca3ec06 Dynamically resize breadcrumbs, fix for bug oc-468 2012-08-04 15:50:32 -04:00
Michael Gapczynski
94ce8f2168 Merge branch 'master' into share_api 
Conflicts:
	apps/contacts/lib/app.php
	apps/files_sharing/js/share.js
 2012-07-31 15:00:04 -04:00
Michael Gapczynski
dfae77dec1 Add notifications and undo support for replacing files when renaming 2012-07-30 12:22:11 -04:00
Michael Gapczynski
e18639551d Tweak appearance of undo delete notification 2012-07-29 18:02:08 -04:00
Michael Gapczynski
e02d8d7f7e Remove delete tipsy if file is deleted, fixes bug oc-958 2012-07-27 21:28:41 -04:00
Michael Gapczynski
30b58f5677 Merge branch 'master' into share_api 
Conflicts:
	apps/calendar/js/loader.js
	apps/contacts/index.php
	apps/contacts/js/loader.js
	apps/files/js/files.js
	apps/files_sharing/sharedstorage.php
	lib/filesystemview.php
 2012-07-25 17:08:18 -04:00
Michael Gapczynski
4d17ed2f71 Make file actions permissions aware 2012-07-25 16:33:08 -04:00
Michael Gapczynski
b58e72cdb2 Alert user of errors when creating new files or folders 2012-07-23 22:35:34 -04:00
Robin Appelman
a49c07cf88 progressbar for New->From Url 2012-07-22 03:56:51 +02:00
Lukas Reschke
c3fea30811 Sanitizing file names 2012-07-11 19:14:04 +02:00
Bjoern Schiessle
b95996c02c - when creating a new text file or directory which name already exist use the same pattern as for file uploads in such a case (add a (N) to the name) 
- don't allow renaming if a file/directory with the name already exists
 2012-06-29 15:23:04 +02:00
Thomas Tanghus
8f6121ffa8 Files: Double encode download links. Fix for oc-1016. 2012-06-15 15:57:04 +02:00
Bjoern Schiessle
8626f04f5d Label the delete operation "unshare" for files in the "Shared" folder to reduce 
confusion about the operation.
 2012-06-12 16:27:24 +02:00
Bjoern Schiessle
f6e7c633a0 block slashes only for new files and new folders but not for file upload from url (bug #964) 2012-06-12 14:11:28 +02:00
Bjoern Schiessle
b38ce8adfd committed patch (bug #967) to add missing translations for file actions 2012-06-12 11:39:03 +02:00
Robin Appelman
e6c4e53486 prevent creating files with a / the name 2012-06-06 00:02:51 +02:00
Bjoern Schiessle
2d80c148ba Don't allow user to delete, rename and re-share the "Shared" directory 2012-06-04 10:42:09 +02:00
Arthur Schiwon
3db28d7616 linkTo instead of hard links in Files and Files_Archive. Hope that makes sense. 2012-05-31 19:46:51 +02:00
Brice Maron
5fa14806c8 Add translation for error message 2012-05-24 19:16:00 +00:00
Brice Maron
2c9311cf48 Add error message when uploading folder or null files. ref oc-739 2012-05-24 18:47:34 +00:00
Brice Maron
f00a50c76a Add pending line in file list before trying to upload. Correct indentation 2012-05-24 16:56:19 +00:00
Michael Gapczynski
568b6a7f56 Make only writable files draggable 2012-05-14 20:41:06 -04:00
Brice Maron
de6aa0f88c Use a clean uri param constructor to get files 2012-05-09 21:35:59 +00:00
Brice Maron
fae1ce4ea7 Correct file move by dropping on folder 2012-05-08 22:07:14 +00:00
Robin Appelman
84bd83b1dc fix file deletion 2012-04-29 16:09:41 +02:00
Georg Ehrke
78b2da583d move files to the correct place 2012-04-26 21:24:41 +02:00
Georg Ehrke
2b10371bde fix merge conflicts 2012-04-26 18:08:49 +02:00
Georg Ehrke
40f95ffdf3 fix security check for the path of the requested file 2012-04-26 17:55:00 +02:00
Georg Ehrke
0249a72cab fix downloading of files in files app 2012-04-26 17:35:12 +02:00
Georg Ehrke
08fe6bdb27 fix path in /apps/files/js/timezone.php 2012-04-23 16:17:35 +02:00
Georg Ehrke
45de7ad221 move files to app folder 2012-04-18 17:27:34 +02:00