Commit Graph

8376 Commits

Author SHA1 Message Date
Björn Schießle 76bd0cffce remove table row in trash bin view after undelete 2013-01-22 12:13:50 +01:00
Björn Schießle 2c3216266c allow to restore single files/folder from a deleted folder 2013-01-22 12:00:04 +01:00
Björn Schießle 3fd28632c4 allow to look into deleted directories 2013-01-21 13:07:43 +01:00
Björn Schießle adbc576439 handle group restore 2013-01-18 17:50:44 +01:00
Björn Schießle 8fdcd72d7f expire files in trash bin after 30 days 2013-01-18 15:12:38 +01:00
Björn Schießle ca14af2fdd remove unneeded function 2013-01-18 14:11:55 +01:00
Björn Schießle d16164b0cd remove item in the trash bin view after successful undelete 2013-01-18 14:09:22 +01:00
Björn Schießle d5151fa61c first version of the trash bin app 2013-01-18 13:11:29 +01:00
Björn Schießle 1318450791 introduce option to disable download action 2013-01-18 10:51:13 +01:00
Björn Schießle 82d4da0d3d call the trash bin view 2013-01-18 10:23:31 +01:00
Björn Schießle d5ee435253 rename "publicListView" option to "disableSharing", this is more meaningful also because it is not only useful for the public list view 2013-01-17 13:17:48 +01:00
Björn Schießle c494eb79ab listen to post delete event to allow the trash bin to create a copy of the version first 2013-01-16 16:01:11 +01:00
Björn Schießle 73d45e79a7 add trash button to web interface 2013-01-15 20:35:15 +01:00
Bart Visscher fa78fbe0c3 Merge pull request #1112 from Raydiation/master
This fixes a problem that prevented app routes from being loaded after ocs_api merge
2013-01-14 07:35:14 -08:00
Daniel Molkentin e51055cd10 Revert "fix c&p error"
This reverts commit 9d41322cf0.
2013-01-14 16:25:03 +01:00
Daniel Molkentin 9d41322cf0 fix c&p error 2013-01-14 16:15:35 +01:00
Thomas Müller 51a4240051 Merge pull request #1170 from owncloud/correctIndention
Remove ugly indentation - Trivial
2013-01-14 04:59:53 -08:00
Björn Schießle cd802ed45b Merge branch 'master' of github.com:owncloud/core 2013-01-14 10:33:17 +01:00
Björn Schießle e0173303e6 merge conflict fixed, settings-personal.php is no longer needed
Conflicts:
	apps/files_versions/templates/settings-personal.php
2013-01-14 10:24:40 +01:00
Jenkins for ownCloud c29310aaef [tx-robot] updated from transifex 2013-01-14 00:18:21 +01:00
Lukas Reschke 2a7e5faa37 Remove ugly indentation 2013-01-13 01:02:11 +01:00
Jenkins for ownCloud 981fd5e424 [tx-robot] updated from transifex 2013-01-13 00:08:40 +01:00
Lukas Reschke eddf9f964a Correct the link 2013-01-12 15:19:12 +01:00
Lukas Reschke 689e37c0aa Merge pull request #1160 from owncloud/updateContrib
Update CONTRIBUTING.md
2013-01-12 02:51:31 -08:00
Lukas Reschke 850184ad6e Updated browser log 2013-01-12 11:51:03 +01:00
Thomas Müller 2da5ddd71c Adding database to server config 2013-01-12 09:08:23 +01:00
Jenkins for ownCloud ad64ce189d [tx-robot] updated from transifex 2013-01-12 00:10:58 +01:00
Lukas Reschke 0bf8a1e62e Typos 2013-01-11 23:40:14 +01:00
Lukas Reschke ca7658b240 Add server operating system to template
Thanks @eMerzh, could be especially needed as there are some platform specific issues like filename encoding under MS Windows
2013-01-11 23:39:37 +01:00
Lukas Reschke 81472c8af4 Add the correct link to the apps repository
:oops:
2013-01-11 23:34:16 +01:00
Lukas Reschke 7a7281987a Add a space behind the ####
Makes it at least better readable for me.
2013-01-11 23:08:01 +01:00
Lukas Reschke 4fa9e3cfc3 Uneeded newline 2013-01-11 23:00:48 +01:00
Lukas Reschke 8501792cdd Remove : 2013-01-11 22:59:41 +01:00
Lukas Reschke d832147f44 Add ownCloud version 2013-01-11 22:57:55 +01:00
Bart Visscher b608675938 Merge pull request #1157 owncloud/move-OpenID
Move openid.php to apps repo

Conflicts:
	settings/routes.php
2013-01-11 22:57:40 +01:00
Lukas Reschke ecde84a946 Add template 2013-01-11 22:57:30 +01:00
Lukas Reschke 98630dd0bc Create issue_template.md 2013-01-11 13:52:41 -08:00
Lukas Reschke 3695425c1c Fix a typo 2013-01-11 22:24:22 +01:00
Lukas Reschke 4272778a97 Update CONTRIBUTING.md 2013-01-11 22:22:08 +01:00
Lukas Reschke da4a50a7fc Remove uneeded link 2013-01-11 22:14:18 +01:00
Lukas Reschke e833ed3efb Merge pull request #1159 from LukasReschke/master
Add contribution file
2013-01-11 11:57:14 -08:00
Björn Schießle d276d21c76 - code clean-up
- some more code comments
- fixed bug in the expire function, cleanup all_versions array during run. Otherwise it could happen that we try to delete already deleted versions
2013-01-11 19:33:54 +01:00
Lukas Reschke 954b559d48 Merge pull request #994 from owncloud/enhanced_multiSelect
Enhanced multiSelect
2013-01-11 10:23:04 -08:00
Lukas Reschke 9b63f1d63e Added links to app + mirall repo 2013-01-11 19:19:04 +01:00
Lukas Reschke b7bdfe113d Update CONTRIBUTING.md 2013-01-11 18:59:56 +01:00
Lukas Reschke 809b264693 Create CONTRIBUTING.md 2013-01-11 09:57:56 -08:00
Lukas Reschke 1f6eb68ef9 Merge pull request #1150 from owncloud/EnableSSL-AdminMenu
Add security section to admin settings to enable the HTTPS enforcement
2013-01-11 09:21:08 -08:00
Lukas Reschke b6e0842f4c Merge pull request #1155 from owncloud/remove-setContentTypeHeader
Remove setContentTypeHeader()
2013-01-11 09:18:14 -08:00
Frank Karlitschek 507d4aa129 Merge pull request #1154 from owncloud/remove-uneededFile
Remove uneeded file
2013-01-11 09:16:55 -08:00
Lukas Reschke e11b650d2e Remove OpenID from the router 2013-01-11 17:24:10 +01:00