]>
source.dussan.org Git - nextcloud-server.git/log
Tom Needham [Fri, 7 Oct 2011 16:02:56 +0000 (17:02 +0100)]
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
Robin Appelman [Fri, 7 Oct 2011 15:02:55 +0000 (17:02 +0200)]
disable openid on default
Robin Appelman [Fri, 7 Oct 2011 14:46:18 +0000 (16:46 +0200)]
Merge branch 'master' of gitorious.org:owncloud/owncloud
Jan-Christoph Borchardt [Fri, 7 Oct 2011 14:30:37 +0000 (16:30 +0200)]
renamed icons
Jan-Christoph Borchardt [Fri, 7 Oct 2011 14:18:47 +0000 (16:18 +0200)]
some icon corrections
Jan-Christoph Borchardt [Fri, 7 Oct 2011 14:05:29 +0000 (16:05 +0200)]
added Silk icons by Mark James (CC-BY)
Bart Visscher [Fri, 7 Oct 2011 14:03:26 +0000 (16:03 +0200)]
Change colorselector to use border for selected color
Robin Appelman [Thu, 6 Oct 2011 22:15:54 +0000 (00:15 +0200)]
Merge branch 'master' of gitorious.org:owncloud/owncloud
Marvin Thomas Rabe [Thu, 6 Oct 2011 20:40:11 +0000 (22:40 +0200)]
conflicts solved
Marvin Thomas Rabe [Thu, 6 Oct 2011 20:37:06 +0000 (22:37 +0200)]
Merge commit 'refs/merge-requests/55' of git://gitorious.org/owncloud/owncloud into merge-requests/55
Marvin Thomas Rabe [Thu, 6 Oct 2011 20:36:34 +0000 (22:36 +0200)]
Merge commit 'refs/merge-requests/52' of git://gitorious.org/owncloud/owncloud into merge-requests/52
Marvin Thomas Rabe [Thu, 6 Oct 2011 20:36:06 +0000 (22:36 +0200)]
Merge commit 'refs/merge-requests/53' of git://gitorious.org/owncloud/owncloud into merge-requests/53
Marvin Thomas Rabe [Thu, 6 Oct 2011 20:35:36 +0000 (22:35 +0200)]
Merge commit 'refs/merge-requests/54' of git://gitorious.org/owncloud/owncloud into merge-requests/54
Bart Visscher [Thu, 6 Oct 2011 19:22:55 +0000 (21:22 +0200)]
Add icon for calendar color selector
Bart Visscher [Thu, 6 Oct 2011 19:22:01 +0000 (21:22 +0200)]
Start using OC_JSON in gallery app
Bart Visscher [Thu, 6 Oct 2011 09:45:49 +0000 (11:45 +0200)]
Replace _ in timezone setting with a space
Bart Visscher [Thu, 6 Oct 2011 09:14:07 +0000 (11:14 +0200)]
Implement timezone fix from Stephen Rees-Carter
Georg Ehrke [Thu, 6 Oct 2011 11:21:38 +0000 (13:21 +0200)]
Merge branch 'master' of gitorious.org:owncloud/owncloud
Georg Ehrke [Thu, 6 Oct 2011 11:21:13 +0000 (13:21 +0200)]
support of RRULE in calendar app
Stephen Rees-Carter [Wed, 5 Oct 2011 23:31:05 +0000 (10:31 +1100)]
BUGFIX: removed the hard-coded Continent selection for Calendar Timezones.
Stephen Rees-Carter [Wed, 5 Oct 2011 23:30:17 +0000 (10:30 +1100)]
Updating .gitignore to ignore *.geany project files.
Tom Needham [Wed, 5 Oct 2011 20:59:03 +0000 (21:59 +0100)]
Updated saving feedback
Bartek Przybylski [Wed, 5 Oct 2011 20:28:17 +0000 (22:28 +0200)]
another query fix
Tom Needham [Wed, 5 Oct 2011 19:49:08 +0000 (20:49 +0100)]
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
Michiel@unhosted [Wed, 5 Oct 2011 18:01:58 +0000 (20:01 +0200)]
correct wrong variable name in remoteStorage app
Bartek Przybylski [Wed, 5 Oct 2011 17:32:30 +0000 (19:32 +0200)]
gallery db query fix
Tom Needham [Wed, 5 Oct 2011 15:32:01 +0000 (16:32 +0100)]
Moved addScript and addStyle calls to app.php
Tom Needham [Wed, 5 Oct 2011 15:10:11 +0000 (16:10 +0100)]
Cleanup of code. Fixed breadcrumb removal issue
Jan-Christoph Borchardt [Wed, 5 Oct 2011 12:54:34 +0000 (14:54 +0200)]
disabled gallery app by default until it's in a branch
Jan-Christoph Borchardt [Wed, 5 Oct 2011 12:32:25 +0000 (14:32 +0200)]
removed extra calendar settings. Also, table layout?
Borjan Tchakaloff [Wed, 5 Oct 2011 11:16:34 +0000 (15:16 +0400)]
Added the missing quotes on the filename.
Borjan Tchakaloff [Wed, 5 Oct 2011 10:31:33 +0000 (14:31 +0400)]
Fixed the 'Undefined index "user_id"' bug when requesting a publicly shared folder and being logged-out.
The OC_App::navigation array contains by default only the help menu.
Borjan Tchakaloff [Wed, 5 Oct 2011 10:27:50 +0000 (14:27 +0400)]
Fixed the file sharing listing bug (filename is empty when it has no extension in a publicly shared folder).
Robin Appelman [Wed, 5 Oct 2011 00:44:24 +0000 (02:44 +0200)]
use texteditor for search results
Robin Appelman [Wed, 5 Oct 2011 00:38:55 +0000 (02:38 +0200)]
remove now unneeded textviewer
Robin Appelman [Wed, 5 Oct 2011 00:36:27 +0000 (02:36 +0200)]
move some code to where it belongs and remove duplicated editor app
Robin Appelman [Wed, 5 Oct 2011 00:11:44 +0000 (02:11 +0200)]
Merge branch 'master' of gitorious.org:owncloud/owncloud
Florian Jacob [Tue, 4 Oct 2011 22:23:16 +0000 (00:23 +0200)]
Added all the remaining extensions to filetypes
mapping which ace-editor supports.
Marvin Thomas Rabe [Tue, 4 Oct 2011 19:39:13 +0000 (21:39 +0200)]
updated margins
Tom Needham [Tue, 4 Oct 2011 19:20:08 +0000 (20:20 +0100)]
Control events are now bound on the page load rather than everytime the editor is loaded.
Bart Visscher [Tue, 4 Oct 2011 19:16:48 +0000 (21:16 +0200)]
Add new contact name to end of cantact list
Bart Visscher [Tue, 4 Oct 2011 19:13:44 +0000 (21:13 +0200)]
All the basic field for add contact added
Tom Needham [Tue, 4 Oct 2011 19:15:20 +0000 (20:15 +0100)]
Save button now removed after closing editor
Marvin Thomas Rabe [Tue, 4 Oct 2011 19:05:49 +0000 (21:05 +0200)]
fixed another bug with breadcrumbs
Marvin Thomas Rabe [Tue, 4 Oct 2011 19:01:05 +0000 (21:01 +0200)]
fixed scrollbar issues. fixed missing breadcrumb image.
Tom Needham [Tue, 4 Oct 2011 18:46:27 +0000 (19:46 +0100)]
Added fillHeight() js function for resizing editor
Tom Needham [Tue, 4 Oct 2011 18:17:23 +0000 (19:17 +0100)]
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
Tom Needham [Tue, 4 Oct 2011 18:07:22 +0000 (19:07 +0100)]
Fixed breadcrumb issue.
Marvin Thomas Rabe [Tue, 4 Oct 2011 17:41:00 +0000 (19:41 +0200)]
remeber cookie bug fixed
Marvin Thomas Rabe [Tue, 4 Oct 2011 17:37:54 +0000 (19:37 +0200)]
Merge branch 'master' of gitorious.org:owncloud/owncloud
Marvin Thomas Rabe [Tue, 4 Oct 2011 17:37:26 +0000 (19:37 +0200)]
updated calendar settings
Marvin Thomas Rabe [Tue, 4 Oct 2011 17:27:57 +0000 (19:27 +0200)]
redirect url fixed
Marvin Thomas Rabe [Tue, 4 Oct 2011 16:58:38 +0000 (18:58 +0200)]
changed shadow transparency to 50%
Marvin Thomas Rabe [Tue, 4 Oct 2011 16:54:07 +0000 (18:54 +0200)]
fixed scrollbar issues
Tom Needham [Tue, 4 Oct 2011 16:43:13 +0000 (17:43 +0100)]
Updated saving feedback to use loading.gif
Marvin Thomas Rabe [Tue, 4 Oct 2011 16:42:53 +0000 (18:42 +0200)]
fixed height of infield labels
Tom Needham [Tue, 4 Oct 2011 15:31:26 +0000 (16:31 +0100)]
Updated control bar styling and save feedback.
Tom Needham [Tue, 4 Oct 2011 14:27:29 +0000 (15:27 +0100)]
HTML data is now encoded before being shown.
Georg Ehrke [Tue, 4 Oct 2011 08:17:55 +0000 (10:17 +0200)]
Merge branch 'master' of gitorious.org:owncloud/owncloud
Georg Ehrke [Tue, 4 Oct 2011 08:17:11 +0000 (10:17 +0200)]
fix ical import
Jan-Christoph Borchardt [Tue, 4 Oct 2011 08:07:46 +0000 (10:07 +0200)]
renamed unhosted to remoteStorage (needs to be updated with coming protocol version)
Tom Needham [Mon, 3 Oct 2011 22:43:58 +0000 (23:43 +0100)]
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
Tom Needham [Mon, 3 Oct 2011 22:41:32 +0000 (23:41 +0100)]
Fixed ajax urls
Tom Needham [Mon, 3 Oct 2011 22:28:47 +0000 (23:28 +0100)]
Fixed file saving issue.
Tom Needham [Mon, 3 Oct 2011 21:59:40 +0000 (22:59 +0100)]
Added breadcrumb and control bar.
Georg Ehrke [Mon, 3 Oct 2011 20:52:13 +0000 (22:52 +0200)]
fix checkLoggedIn function in import of ical files
Georg Ehrke [Mon, 3 Oct 2011 20:50:10 +0000 (22:50 +0200)]
added import function as filehandler
Bart Visscher [Mon, 3 Oct 2011 18:41:52 +0000 (20:41 +0200)]
Move lostpassword to core dir
Bart Visscher [Mon, 3 Oct 2011 18:32:31 +0000 (20:32 +0200)]
Add user friendly calendar color chooser
Bart Visscher [Fri, 30 Sep 2011 23:14:09 +0000 (01:14 +0200)]
Take setting default value out of loop
Marvin Thomas Rabe [Mon, 3 Oct 2011 13:18:48 +0000 (15:18 +0200)]
Merge commit 'refs/merge-requests/51' of git://gitorious.org/owncloud/owncloud into merge-requests/51
Marvin Thomas Rabe [Mon, 3 Oct 2011 12:47:41 +0000 (14:47 +0200)]
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
Weng Xuetian [Mon, 3 Oct 2011 12:44:03 +0000 (20:44 +0800)]
fix add bookmark bug.
Marvin Thomas Rabe [Mon, 3 Oct 2011 12:41:55 +0000 (14:41 +0200)]
added infield labels. readded fade in of login button. updated label on install page.
Marvin Thomas Rabe [Mon, 3 Oct 2011 11:32:16 +0000 (13:32 +0200)]
Show database only in advanced
Georg Ehrke [Mon, 3 Oct 2011 10:16:06 +0000 (12:16 +0200)]
added mime type for calendar files
Marvin Thomas Rabe [Mon, 3 Oct 2011 00:01:24 +0000 (02:01 +0200)]
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
Marvin Thomas Rabe [Sun, 2 Oct 2011 23:44:49 +0000 (01:44 +0200)]
Removed jquery ui files and added own cross image to css.
Robin Appelman [Sun, 2 Oct 2011 17:42:14 +0000 (19:42 +0200)]
use browsercache for gallery covers
Robin Appelman [Sun, 2 Oct 2011 17:33:55 +0000 (19:33 +0200)]
show galleries in search results
Frank Karlitschek [Sun, 2 Oct 2011 16:53:47 +0000 (18:53 +0200)]
enable by default
Frank Karlitschek [Sun, 2 Oct 2011 16:15:01 +0000 (18:15 +0200)]
bump version number
Bartek Przybylski [Sun, 2 Oct 2011 15:52:11 +0000 (17:52 +0200)]
adding tmp icon for app, extending memory size for php in .htaccess
Bartek Przybylski [Sun, 2 Oct 2011 15:48:02 +0000 (17:48 +0200)]
adding missing files, don know why they disappeared
Bartek Przybylski [Sun, 2 Oct 2011 15:17:46 +0000 (17:17 +0200)]
merge 'gallery_app_devel' to 'master'
Marvin Thomas Rabe [Sun, 2 Oct 2011 14:06:30 +0000 (16:06 +0200)]
Added translatable text.
Marvin Thomas Rabe [Sun, 2 Oct 2011 13:56:51 +0000 (15:56 +0200)]
Removed unused javascript
Marvin Thomas Rabe [Sun, 2 Oct 2011 13:55:23 +0000 (15:55 +0200)]
Add translation and fixed some css problems
Marvin Thomas Rabe [Sun, 2 Oct 2011 13:51:24 +0000 (15:51 +0200)]
Changed multiple select for days of weekend to 'chosen'. Cleaned up some code. Removed success message when changing timezone.
Marvin Thomas Rabe [Sun, 2 Oct 2011 13:38:51 +0000 (15:38 +0200)]
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
Marvin Thomas Rabe [Sun, 2 Oct 2011 13:38:07 +0000 (15:38 +0200)]
problem with previous selected groups fixed
Robin Appelman [Sun, 2 Oct 2011 12:30:51 +0000 (14:30 +0200)]
add OC_Appconfig::hasKey
Robin Appelman [Sun, 2 Oct 2011 12:00:55 +0000 (14:00 +0200)]
Merge commit 'refs/merge-requests/39' of git://gitorious.org/owncloud/owncloud
Bartek Przybylski [Sun, 2 Oct 2011 11:52:04 +0000 (13:52 +0200)]
avoid creating empty albums, removing od depreciated code openings
Bartek Przybylski [Sun, 2 Oct 2011 10:24:02 +0000 (12:24 +0200)]
changing <? to <?php
Tom Needham [Sat, 1 Oct 2011 21:48:00 +0000 (22:48 +0100)]
Editor now loads on top of files app.
Georg Ehrke [Sat, 1 Oct 2011 21:19:06 +0000 (23:19 +0200)]
added function to export single events
Georg Ehrke [Sat, 1 Oct 2011 20:53:18 +0000 (22:53 +0200)]
choosable default duration of event
Bartek Przybylski [Sat, 1 Oct 2011 20:36:01 +0000 (22:36 +0200)]
removing add new album button, removing logs, and unused code
Georg Ehrke [Sat, 1 Oct 2011 19:09:08 +0000 (21:09 +0200)]
fix duration bug