Commit Graph

414 Commits

Author SHA1 Message Date
Georg Ehrke 993d655aad Merge branch 'master' into movable_apps_2 2012-04-27 10:30:50 +02:00
Frank Karlitschek 74b5e22a68 some more csrf fixes 2012-04-26 23:17:46 +02:00
Georg Ehrke 6930af4c0f Merge branch 'master' into movable_apps_2 2012-04-26 21:27:22 +02:00
Frank Karlitschek 6bdefef31e csrf protection 2012-04-26 19:35:33 +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 ebcaa46482 fix loading of css files that are core related 2012-04-26 15:19:27 +02:00
Georg Ehrke 3f64eb25ab some fixes fore movable apps 2012-04-26 14:52:55 +02:00
Sam Tuke 02a65f30ec added history buttons 2012-04-25 14:01:03 +01:00
Georg Ehrke d6346b5b0b fix OC.filePath in main js 2012-04-24 21:54:09 +02:00
Georg Ehrke a85d49833b fix position of Semicolon 2012-04-24 21:52:44 +02:00
Georg Ehrke 684007bbae fix pathes in contacts 2012-04-24 21:33:34 +02:00
Georg Ehrke 42a570788b Merge branch 'master' into movable_apps 2012-04-23 19:56:07 +02:00
Georg Ehrke 6d92ebca45 use native functions of php to parse the string into the Var 2012-04-23 17:09:28 +02:00
Georg Ehrke 9226cb7a6a rename var file to getfile to prevent fails in files app 2012-04-23 16:36:24 +02:00
Jan-Christoph Borchardt 1b29fc3fb2 fixing multiselect overflow, issue 341 2012-04-23 14:29:11 +02:00
Jan-Christoph Borchardt 3ba9a9e6a8 adding proper copyright and license notice to the style files 2012-04-23 14:19:03 +02:00
Georg Ehrke 4c2cf35050 fix merge conflicts 2012-04-22 13:19:12 +02:00
Thomas Tanghus f08cfcecec Personal settings: Emphasized labels etc, mono-spaced generated paths and moved text formatting to style sheet. 2012-04-22 03:59:28 +02:00
Georg Ehrke e29ae46609 fix merge conflicts 2012-04-21 22:12:31 +02:00
Georg Ehrke 711aa229b8 Merge branch 'master' into movable_apps 2012-04-20 22:41:39 +02:00
Georg Ehrke 12ef2f5054 modify OC.filepath for movable apps 2012-04-20 22:35:12 +02:00
Frank Karlitschek 2fbc92bd4b new OC_Mail class to handle all mail sending. The benefit is that is way mor flexible than the standard mail command. can be configured to use a remote smtp relay for example. also port the lostpassword code 2012-04-20 20:49:35 +02:00
Georg Ehrke 3fb91a7411 restore require once command for non app files 2012-04-18 17:49:50 +02:00
Georg Ehrke eb29c577c2 Merge branch 'master' into movable_apps 2012-04-18 12:20:09 +02:00
Georg Ehrke cf492a9649 Merge branch 'master' into calendar_sharing 2012-04-18 11:51:59 +02:00
Georg Ehrke 69ee0efc0b remove the require_once lib base from all (or nearly all) files 2012-04-17 19:31:29 +02:00
Robin Appelman cfd0140e2f fix 2 potential xss problems 2012-04-16 12:59:38 +02:00
Jan-Christoph Borchardt 3c182bdb35 adding sticker logo jpg 2012-04-16 12:57:17 +02:00
Jan-Christoph Borchardt 961c239ee4 improving leftcontent display, increasing item height 2012-04-16 12:52:48 +02:00
Jan-Christoph Borchardt 70d0103a67 updated logos and icons 2012-04-16 11:34:16 +02:00
Georg Ehrke dc18e65b46 fix merge conflicts 2012-04-15 22:26:55 +02:00
Jan-Christoph Borchardt e5cda3abcd tooltip for delete shows up to the left 2012-04-15 17:49:54 +02:00
Jan-Christoph Borchardt 1f91224f9e fixing opacity and fading, also for IE 2012-04-15 14:37:42 +02:00
Georg Ehrke 8ddea7e95c Merge branch 'master' into calendar_sharing 2012-04-15 14:28:31 +02:00
Jan-Christoph Borchardt 7ddd043427 renamed extention to extension, also now only showing lowercase 2012-04-15 13:34:30 +02:00
Jan-Christoph Borchardt 5868199e85 fixed settings hover, now whole row sensitive and fading not jerky 2012-04-15 13:34:30 +02:00
Georg Ehrke e292b1fcdb fix merge conflicts 2012-04-15 12:43:07 +02:00
Jan-Christoph Borchardt fbb314ef4b Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-04-14 18:56:55 +02:00
Bart Visscher 30498fd6f8 Use offset function to position block elements 2012-04-14 18:31:41 +02:00
Jan-Christoph Borchardt a0a5668d1e increase opacity of search field and logout icon 2012-04-14 17:20:50 +02:00
Robin Appelman b1bcc60d83 reuse OC_L10N objects 2012-04-14 16:44:15 +02:00
Georg Ehrke afcb0aee40 fix merge conflicts 2012-04-13 16:40:10 -04:00
Bart Visscher b8466d362e Fix rescan "File not Found" error handling in oc-vcategories.js 2012-04-13 21:13:58 +02:00
Jan-Christoph Borchardt eea0d2e096 fixing delete tooltip 2012-04-13 18:28:17 +02:00
Jan-Christoph Borchardt add9673ad6 merging tanghus category CSS 2012-04-13 17:23:56 +02:00
Jan-Christoph Borchardt 31df4c00ec adding tipsy tooltips for file actions 2012-04-13 17:22:23 +02:00
Bart Visscher bc81179163 Fix categories delete fallback when there is no app specific ajax categories delete function 2012-04-12 23:10:49 +02:00
Frank Karlitschek 56bc2c4591 add a title attribute to the logout button 2012-04-12 20:34:56 +02:00