8450785379
Merge commit 'refs/merge-requests/57' of git://gitorious.org/owncloud/owncloud
2011-10-14 20:38:42 +02:00
ea8461e83d
scrolling in calendar
2011-10-14 13:46:28 +02:00
a01d10e57d
Merge branch 'master' into calendar
2011-10-13 21:59:16 +02:00
8da00e2d9a
avoiding notice if ['HTTPS'] is not set
2011-10-13 15:50:08 +02:00
c86d1824fe
Improve handling of calendar export $_GET params
...
* a notice would be reported if either of the 'cal' or 'event' $_GET params
where not supplied, which would result in 'Cannot modify header information'
warnings
2011-10-12 15:23:39 +11:00
ef8826ac2d
remove 'description' from OC_Connector_Sabre_CalDAV propertyMap
...
* the description field was removed in commit:
f3f5d775b5
2011-10-12 15:10:59 +11:00
4cbae823eb
Merge branch 'master' into calendar
2011-10-10 21:08:11 +02:00
f49ecee24c
reload calendar automatically
2011-10-10 12:03:30 +02:00
e2468c4343
fix webfinger install script
2011-10-09 17:24:18 +02:00
6e62911a4e
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-09 17:13:34 +02:00
f4fb6356cd
use install.php properly
2011-10-09 17:12:16 +02:00
203f7a3a87
Move contact delete button to top right corner
2011-10-09 00:04:37 +02:00
88aa40e6ac
Show add contact form on opening contacts page
2011-10-09 00:04:37 +02:00
19d4e6e1d5
apps/bookmarks: remove unused variable
...
This is not needed anymore since commit
6b64aa3faf
2011-10-08 21:07:43 +02:00
4a4e6eb071
apps/bookmarks: follow redirects when fetching title
...
This solves a problem where hitting a redirect page would lead to a "302
Found" title.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-10-08 20:36:40 +02:00
deaeab3d92
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-08 15:47:03 +01:00
adebefad84
Fixed editor loading and file saving issue
2011-10-08 15:46:38 +01:00
6b64aa3faf
removed description. changed target to _blank. removed sorting. updated layout.
2011-10-08 13:54:45 +02:00
f3f5d775b5
removed description field for calendar
2011-10-08 13:28:01 +02:00
39e7db7db4
added missing files
2011-10-08 13:11:13 +02:00
590ff0ced9
moved bookmarklet to personal. username must be provided when adding a new user.
2011-10-08 13:10:49 +02:00
0bb3270503
Revert "support of RRULE in calendar app"
...
Reverting as per Georg's request (not stable enough yet)
This reverts commit 55ab68a332
2011-10-08 00:12:57 +02:00
a13d42fdaf
Fixes for adding contact property
2011-10-07 23:01:49 +02:00
46b8703b71
Display contact name without label and in bold
2011-10-07 22:42:50 +02:00
f95e8c62c9
Save the right contact property
2011-10-07 22:38:19 +02:00
8ea9c39241
Fix saving properties with a new contact
2011-10-07 22:25:26 +02:00
bc54f13636
Fix name when adding contact
2011-10-07 21:59:25 +02:00
7e0da0cb25
fix amapache url
2011-10-07 18:13:46 +02:00
65a491eabd
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-07 17:02:56 +01:00
6449a45695
disable openid on default
2011-10-07 17:02:55 +02:00
4fc8e28fba
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-07 16:46:18 +02:00
fa72f1c3cc
some icon corrections
2011-10-07 16:18:47 +02:00
980a0893f0
Change colorselector to use border for selected color
2011-10-07 16:03:26 +02:00
20554be9f4
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-07 00:15:54 +02:00
e345fbd386
conflicts solved
2011-10-06 22:40:11 +02:00
bb26fe9300
Merge commit 'refs/merge-requests/55' of git://gitorious.org/owncloud/owncloud into merge-requests/55
2011-10-06 22:37:06 +02:00
ae56bb63c6
Merge commit 'refs/merge-requests/52' of git://gitorious.org/owncloud/owncloud into merge-requests/52
2011-10-06 22:36:34 +02:00
878178145d
Merge commit 'refs/merge-requests/54' of git://gitorious.org/owncloud/owncloud into merge-requests/54
2011-10-06 22:35:36 +02:00
3cc7212c82
Add icon for calendar color selector
2011-10-06 21:22:55 +02:00
b0847a61f5
Start using OC_JSON in gallery app
2011-10-06 21:22:01 +02:00
4786ed321e
Replace _ in timezone setting with a space
2011-10-06 13:22:36 +02:00
c28f1e0276
Implement timezone fix from Stephen Rees-Carter
2011-10-06 13:22:36 +02:00
bf017fb4bd
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-06 13:21:38 +02:00
55ab68a332
support of RRULE in calendar app
2011-10-06 13:21:13 +02:00
c853fc75a1
BUGFIX: removed the hard-coded Continent selection for Calendar Timezones.
2011-10-06 10:31:05 +11:00
d9464de690
Updated saving feedback
2011-10-05 21:59:03 +01:00
f92fa6989e
another query fix
2011-10-05 22:28:17 +02:00
30343f15e2
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-05 20:49:08 +01:00
af6eb52b5e
correct wrong variable name in remoteStorage app
2011-10-05 20:01:58 +02:00
d5931b8c48
gallery db query fix
2011-10-05 19:32:30 +02:00
edd958836e
Moved addScript and addStyle calls to app.php
2011-10-05 16:32:01 +01:00
86825ee3b5
Cleanup of code. Fixed breadcrumb removal issue
2011-10-05 16:10:11 +01:00
28dcbe3cb0
disabled gallery app by default until it's in a branch
2011-10-05 14:54:34 +02:00
8e532b5ceb
removed extra calendar settings. Also, table layout?
2011-10-05 14:32:25 +02:00
5570222b40
Added the missing quotes on the filename.
2011-10-05 15:20:32 +04:00
0cde2a3146
Fixed the file sharing listing bug (filename is empty when it has no extension in a publicly shared folder).
2011-10-05 14:27:50 +04:00
15e5bd16ab
use texteditor for search results
2011-10-05 02:44:24 +02:00
c6a73bee5e
remove now unneeded textviewer
2011-10-05 02:38:55 +02:00
1fba8619d4
move some code to where it belongs and remove duplicated editor app
2011-10-05 02:36:54 +02:00
a8621265e2
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-05 02:11:44 +02:00
813e8b274a
Added all the remaining extensions to filetypes
...
mapping which ace-editor supports.
2011-10-05 00:23:16 +02:00
7579fc7bc9
updated margins
2011-10-04 21:39:13 +02:00
93ed844015
Control events are now bound on the page load rather than everytime the editor is loaded.
2011-10-04 20:20:08 +01:00
2c95c799e6
Add new contact name to end of cantact list
2011-10-04 21:16:57 +02:00
fada3517b0
All the basic field for add contact added
2011-10-04 21:16:57 +02:00
39d42fc62b
Save button now removed after closing editor
2011-10-04 20:15:20 +01:00
0179b61f69
fixed another bug with breadcrumbs
2011-10-04 21:05:49 +02:00
451b5940ea
fixed scrollbar issues. fixed missing breadcrumb image.
2011-10-04 21:01:05 +02:00
fa203d186e
Added fillHeight() js function for resizing editor
2011-10-04 19:46:27 +01:00
2d9c3d75f3
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-04 19:17:23 +01:00
09c1179094
Fixed breadcrumb issue.
2011-10-04 19:07:22 +01:00
340f6bbaba
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-04 19:37:54 +02:00
d1518f2901
updated calendar settings
2011-10-04 19:37:26 +02:00
de21378291
fixed scrollbar issues
2011-10-04 18:54:07 +02:00
5c9b069fe5
Updated saving feedback to use loading.gif
2011-10-04 17:43:13 +01:00
9d918b5ac8
Updated control bar styling and save feedback.
2011-10-04 16:31:26 +01:00
58d284419c
HTML data is now encoded before being shown.
2011-10-04 15:27:29 +01:00
70091ec649
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-04 10:17:55 +02:00
33b660857a
fix ical import
2011-10-04 10:17:11 +02:00
79da90bb08
renamed unhosted to remoteStorage (needs to be updated with coming protocol version)
2011-10-04 10:07:46 +02:00
45fda6f43e
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-03 23:43:58 +01:00
6c9ff0e47e
Fixed ajax urls
2011-10-03 23:41:32 +01:00
32ce0d3c6e
Fixed file saving issue.
2011-10-03 23:28:47 +01:00
02d7b1a1fc
Added breadcrumb and control bar.
2011-10-03 22:59:40 +01:00
77e12a15b1
fix checkLoggedIn function in import of ical files
2011-10-03 22:52:13 +02:00
c40a1fcede
added import function as filehandler
2011-10-03 22:50:10 +02:00
dec8106665
Add user friendly calendar color chooser
2011-10-03 20:42:47 +02:00
6159b79715
Take setting default value out of loop
2011-10-03 20:42:47 +02:00
ffc5c4dabe
Merge commit 'refs/merge-requests/51' of git://gitorious.org/owncloud/owncloud into merge-requests/51
2011-10-03 15:18:48 +02:00
acbd31255e
fix add bookmark bug.
2011-10-03 20:44:03 +08:00
a2bcbec791
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
2011-10-03 02:01:24 +02:00
36196b6c2d
use browsercache for gallery covers
2011-10-02 19:42:14 +02:00
7bcc0efd6a
show galleries in search results
2011-10-02 19:33:55 +02:00
39c4d9b2ca
enable by default
2011-10-02 18:53:47 +02:00
c3d7ffc877
adding tmp icon for app, extending memory size for php in .htaccess
2011-10-02 17:52:11 +02:00
ee62eb7bb0
adding missing files, don know why they disappeared
2011-10-02 17:48:02 +02:00
6643f68663
merge 'gallery_app_devel' to 'master'
2011-10-02 17:17:46 +02:00
bdcf31cc73
Added translatable text.
2011-10-02 16:06:30 +02:00
213275a1f8
Add translation and fixed some css problems
2011-10-02 15:55:23 +02:00
daee88fd26
Changed multiple select for days of weekend to 'chosen'. Cleaned up some code. Removed success message when changing timezone.
2011-10-02 15:51:24 +02:00
Robin Appelman
Georg Ehrke
Michiel@unhosted
John Kristensen
Bart Visscher
Florian Pritz
Tom Needham
Marvin Thomas Rabe
Jan-Christoph Borchardt
Stephen Rees-Carter
Bartek Przybylski
Borjan Tchakaloff
Florian Jacob
Weng Xuetian
Frank Karlitschek