Commit graph

9604 commits

Author SHA1 Message Date
Björn Schießle
5c4e2ad490 allow admin to change retention obligation for the trash bin, default value is 180 days 2013-01-22 13:19:41 +01:00
Björn Schießle
bdee0e204e calculate correct relative date for trashbin file list 2013-01-22 12:30:12 +01:00
Lukas Reschke
8907bdaf7f Remove uneeded JS 2013-01-22 12:15:46 +01:00
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
Lukas Reschke
bd5ff29716 Merge branch 'master' into no-inline-js 2013-01-22 11:50:33 +01:00
Lukas Reschke
351d206dd3 Allow eval() and send headers for legacy browsers
The blocking of eval() seems to have problems with JQuery 1.7.2 - let's allow it for now and disable it in the future.
2013-01-22 08:09:01 +01:00
Michael Gapczynski
465c100d8f Add tests for mtime changes in folders - testRename is failing right now 2013-01-22 00:43:43 -05:00
Michael Gapczynski
e666ce3622 Fix external storage UI for new storage namespaces 2013-01-21 23:57:26 -05:00
Michael Gapczynski
5136f6d818 Make database connection error messages less verbose 2013-01-21 22:53:32 -05:00
Lukas Reschke
3ffbaf4795 Allow iframes to external domains 2013-01-22 00:30:09 +01:00
Robin Appelman
f2d0eeae83 Merge branch 'master' into filesystem 2013-01-22 00:19:44 +01:00
icewind1991
dd40b691ee Merge pull request #1255 from owncloud/leftcontent_fix
Fix scrolling of leftcontent
2013-01-21 15:18:38 -08:00
Thomas Mueller
d8d812a91e enable unittesting on appframework and apptemplateadvanced 2013-01-21 23:19:17 +01:00
Robin Appelman
8ede3290ae Cache: add database indexes for mimetype and mimepart 2013-01-21 22:31:44 +01:00
Lukas Reschke
8223117569 Remove closing tag 2013-01-21 22:29:27 +01:00
Lukas Reschke
d2383338de External JSON for the Apps 2013-01-21 22:18:42 +01:00
Lukas Reschke
30274ee33e Move to OC_App 2013-01-21 22:18:11 +01:00
Lukas Reschke
a29f9f90ab Indentation 2013-01-21 22:17:48 +01:00
Robin Appelman
1762378f67 Files: don't load fileactions.js when upgrading filecache 2013-01-21 22:07:55 +01:00
Robin Appelman
42a1a17a30 Cache: return non numberic storage id 2013-01-21 22:01:22 +01:00
Lukas Reschke
3ed7d5d521 Move isadmin to external file 2013-01-21 21:25:38 +01:00
Lukas Reschke
39da6f8166 Move timezone check to external JS 2013-01-21 21:10:44 +01:00
Lukas Reschke
0c59074eeb Correct copy paste fail 2013-01-21 20:46:42 +01:00
Frank Karlitschek
a27f92a17a we are getting closer. updating is not working yet. 2013-01-21 20:40:23 +01:00
Lukas Reschke
9bc8df3649 Move publicListView to external JS 2013-01-21 20:36:19 +01:00
Lukas Reschke
0d02caa684 No inline JS in apps 2013-01-21 20:34:28 +01:00
Lukas Reschke
8ca78fcf3f Move requesttoken to oc-requesttoken.js 2013-01-21 20:24:18 +01:00
Robin Appelman
8817b603d7 Fix scrolling of leftcontent 2013-01-21 18:29:18 +01:00
Thomas Mueller
d58cee2f76 returning http status code 503 in case connecting to the database failed 2013-01-21 14:57:33 +01:00
Björn Schießle
3fd28632c4 allow to look into deleted directories 2013-01-21 13:07:43 +01:00
Lukas Reschke
5fff57339f Move config to core/js/config.php 2013-01-21 00:10:47 +01:00
Jenkins for ownCloud
aede26d996 [tx-robot] updated from transifex 2013-01-21 00:05:34 +01:00
Lukas Reschke
68025ac43c Add a route to the JS config 2013-01-20 23:46:46 +01:00
Lukas Reschke
af8c193605 Disallow inline JS 2013-01-20 23:30:16 +01:00
Thomas Müller
b0716ba0e0 Merge pull request #1247 from owncloud/clear-queries-cache-on-schema-change-master
cached queries need to be reset on schema change because they become inv...
2013-01-20 14:00:15 -08:00
Thomas Mueller
dea77b7610 cached queries need to be reset on schema change because they become invalid
fixes: https://github.com/owncloud/apps/issues/468
2013-01-20 22:46:26 +01:00
Arthur Schiwon
10876aba89 fix more config keys for save settings handling 2013-01-20 18:30:14 +01:00
Arthur Schiwon
0c3466325b fix continue in switch, add another key to skip 2013-01-20 18:27:39 +01:00
Arthur Schiwon
6d84aa93d3 Ajaxifiy Settings Save 2013-01-20 18:02:44 +01:00
Lukas Reschke
967b7947a1 Add the default-src 2013-01-20 12:19:09 +01:00
Lukas Reschke
c82d6e5153 Add CSP header 2013-01-20 12:06:33 +01:00
Robin Appelman
4c05661875 Merge branch 'filesystem' of github.com:owncloud/core into filesystem 2013-01-20 03:11:50 +01:00
Robin Appelman
83d6221322 merge master into filesytem 2013-01-20 03:11:04 +01:00
Michael Gapczynski
664f33a29c Update mtimes of all parent folders after change inside 2013-01-19 21:04:25 -05:00
Michael Gapczynski
68272fa253 Remove unnecessary ob_end_clean() from template tests 2013-01-19 20:28:45 -05:00
Jenkins for ownCloud
ebc0c4b85b [tx-robot] updated from transifex 2013-01-20 00:06:40 +01:00
Thomas Mueller
5d6c1d52bd replace #notification with OC.Notification call 2013-01-19 21:37:05 +01:00
Lukas Reschke
10a9ddd9b2 Merge pull request #1233 from owncloud/visualphpunit
Add listener for VisualPHPUnit
2013-01-19 11:25:31 -08:00
Lukas Reschke
8daefd00fb Sanitize the exception 2013-01-19 19:57:17 +01:00