Commit Graph

1999 Commits

Author SHA1 Message Date
Georg Ehrke 61c4f9b3c8 Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-09-28 18:44:17 +02:00
Georg Ehrke 59d4ddd905 commented out colorfield in edit calendar dialog, because colors aren't implemented yet (it would just confuse the user) 2011-09-28 18:43:59 +02:00
Jan-Christoph Borchardt 8d14c489eb changed short description and styled unobtrusively 2011-09-28 17:14:37 +02:00
Tom Needham 3ab8739809 Implemented ace-editor for basic file editing. 2011-09-28 15:26:54 +01:00
Tom Needham 1f74e76d83 Implemented ace-edtior as an app. Basic file editing and saving supported. 2011-09-28 15:15:04 +01:00
Frank Karlitschek 98c59605aa show the syncing and ampache urls on the settings page. not very pretty but otherwise the user has no way to configure the desktop integration 2011-09-28 16:05:01 +02:00
Frank Karlitschek 18216fe71f xml so soooo oldschool. using json now like the cool kids do. 2011-09-28 14:26:48 +02:00
Frank Karlitschek f14a62c875 Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-09-28 13:53:51 +02:00
Frank Karlitschek f2a7f230f1 add status file. useful for external administration. show the ownClopud version at least in the config dialog. 2011-09-28 13:52:26 +02:00
Frank Karlitschek 475dd72ea4 Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-09-28 11:52:13 +02:00
Frank Karlitschek 0fcd765bd5 add check for ctype 2011-09-28 11:47:29 +02:00
Thomas Schmidt e30220e287 media app: show current song, add margin, enable tooltip 2011-09-28 11:46:04 +02:00
Thomas Schmidt b178310a82 ignore netbeans folder 2011-09-28 11:46:04 +02:00
Thomas Schmidt 40b47defcb enhance errormessages on setup 2011-09-28 11:46:04 +02:00
Thomas Schmidt fbada56054 fix url 2011-09-28 11:46:04 +02:00
Georg Ehrke 8e42b02a22 Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-09-28 10:29:07 +02:00
Georg Ehrke 8c405a59d8 little bug fixes in calendar app 2011-09-28 23:28:14 +02:00
Bart Visscher c6f78fbe43 Add flag in info.xml to control the apps that are installed by default 2011-09-27 22:36:14 +02:00
Georg Ehrke 61aa00899d show only most essential stuff in add and edit event form 2011-09-27 21:56:16 +02:00
Frank Karlitschek 10c5178e31 check for php modules 2011-09-27 19:08:38 +02:00
Frank Karlitschek bf3248bee9 remove warning by check cookie before accessing it. 2011-09-27 15:31:30 +02:00
Scott Barnett 83ccbbe49f Fixed table gap from appearing. 2011-09-27 06:48:05 +10:00
Scott Barnett 861ef363a5 Merge branch 'master' of git://gitorious.org/owncloud/owncloud 2011-09-27 05:49:49 +10:00
Scott Barnett f4ecf47e61 Fixed delete cross positioning issue. 2011-09-27 05:26:49 +10:00
Bart Visscher 3fcc7b5949 Use correct name for function state for addScript/addStyle in js 2011-09-26 21:18:56 +02:00
Bart Visscher 2d3c1a3f00 Fix space in comment 2011-09-26 21:18:37 +02:00
Bart Visscher 5fbf378d10 Small textual update to password recovery templates 2011-09-26 21:17:26 +02:00
Bart Visscher 676838ac31 Implement mailing of password reset link 2011-09-26 21:17:26 +02:00
Bart Visscher f149303895 Add email field to personal preferences 2011-09-26 21:17:26 +02:00
Bart Visscher 950d4e1da4 Move lostpassword code to own app 2011-09-26 21:17:26 +02:00
Bart Visscher aae6881494 Move display of login page to function in OC_Util 2011-09-26 21:17:17 +02:00
Bartek Przybylski e4dc33b368 Reverting: initial commit for gallery app 2011-09-26 20:05:36 +02:00
Robin Appelman bcf92badd1 dont set content type to json for Apps 2011-09-26 00:19:34 +02:00
Bartek Przybylski 63e6863222 Merge branch 'master' of git://gitorious.org/owncloud/owncloud 2011-09-25 22:32:16 +02:00
Bartek Przybylski bc43851d74 initial commit for gallery app 2011-09-25 22:32:08 +02:00
Bart Visscher 17e631bc5e Use OC_JSON for json responses
Create OC_JSON class, for single point of creating json responses.
No real logic change, this just cleans up the code a bit.
2011-09-25 22:19:28 +02:00
Scott Barnett dbddec9160 Fixed minor issue. 2011-09-26 04:18:33 +10:00
Scott Barnett 1985bfd9eb Fixed uploaded file hover issue. 2011-09-26 04:08:28 +10:00
Robin Appelman fb01a72693 fix creating users 2011-09-25 15:58:10 +02:00
Robin Appelman 64b68f2474 correctly update the collection when music files are moved around 2011-09-25 01:34:55 +02:00
Robin Appelman 6c2b22406c remove some debug statements 2011-09-25 01:33:53 +02:00
Robin Appelman 57bffdb46a fix uploading files using webdav 2011-09-25 01:20:43 +02:00
Robin Appelman c16a9a83ba actually check the correct password when changing the password 2011-09-25 01:06:00 +02:00
Robin Appelman 09092dd2d2 check for old password when changing passwords 2011-09-25 01:02:22 +02:00
Jan-Christoph Borchardt ae4c83af91 moved scanning to controls bar 2011-09-25 00:17:54 +02:00
Jan-Christoph Borchardt 368412a730 lots of music improvements, might break some things though 2011-09-25 00:02:50 +02:00
Jan-Christoph Borchardt 700ac75565 updated translations 2011-09-24 23:12:18 +02:00
Jan-Christoph Borchardt a54ea3246c removed 'share by publiclink' app as it has been superseded by Sharing 2011-09-24 23:03:28 +02:00
Jan-Christoph Borchardt ce2c7bad44 widened inputs for language and timezone 2011-09-24 22:14:41 +02:00
Jan-Christoph Borchardt 7f83176306 no mickey mouse hand for quota bar 2011-09-24 22:13:35 +02:00