Georg Ehrke
|
6e405513ab
|
Merge branch 'master' into calendar_export
|
2012-06-18 15:59:21 +02:00 |
|
Bart Visscher
|
79f9d61ec8
|
Allow apps to load before login, needed for user_openid
|
2012-06-18 15:40:48 +02:00 |
|
Georg Ehrke
|
c2b7d05188
|
Merge branch 'master' into calendar_export
|
2012-06-18 14:34:38 +02:00 |
|
Thomas Tanghus
|
e5feb4e1aa
|
Remove obsolete js.
|
2012-06-18 02:22:22 +02:00 |
|
Thomas Tanghus
|
73fd4c979a
|
Update js after contactlist change.
|
2012-06-18 02:21:29 +02:00 |
|
Thomas Tanghus
|
a4f53922c2
|
Removed erroneous value attributes. Partial fix for oc-1029.
|
2012-06-18 00:36:25 +02:00 |
|
Thomas Tanghus
|
cab4a634df
|
Save addressbook id to be able to rearrange contacts properly.
|
2012-06-17 23:14:02 +02:00 |
|
Thomas Tanghus
|
3efec3fde9
|
Make contact list fit in viewport.
|
2012-06-17 23:12:48 +02:00 |
|
Thomas Tanghus
|
ea4d8ccf70
|
Rearrange markup.
|
2012-06-17 23:12:11 +02:00 |
|
Thomas Tanghus
|
8337b30e43
|
Add thumbnail links so they are loaded when addressbook is expanded.
|
2012-06-17 23:09:25 +02:00 |
|
Thomas Tanghus
|
7d84c4741c
|
Use uasort instead of usort.
|
2012-06-17 21:50:49 +02:00 |
|
Thomas Tanghus
|
46a771d2e6
|
Sort addressbooks.
|
2012-06-17 21:47:15 +02:00 |
|
Thomas Tanghus
|
fb700de4a4
|
Add effect on addressbook show/hide.
|
2012-06-17 21:37:13 +02:00 |
|
Thomas Tanghus
|
9e4a41e9cb
|
Add effect on addressbook show/hide.
|
2012-06-17 21:34:56 +02:00 |
|
Thomas Tanghus
|
5a8f4b8783
|
Adjustments for inview handler etc.
|
2012-06-17 20:25:32 +02:00 |
|
Thomas Tanghus
|
b6b6d69158
|
Moved parsing to the controller and js to contacts.js.
|
2012-06-17 20:25:32 +02:00 |
|
Thomas Tanghus
|
2875901fc7
|
Obsolete language="Javascript".
|
2012-06-17 20:25:32 +02:00 |
|
Thomas Tanghus
|
91f5a1de39
|
Obsolete language="Javascript".
|
2012-06-17 20:25:32 +02:00 |
|
Thomas Tanghus
|
b1cfc99f63
|
Styled address book entries.
|
2012-06-17 20:25:32 +02:00 |
|
Thomas Tanghus
|
56d25d4d1b
|
Make the parsing in the controller, not in the template. Assign only relevant entries to the template.
|
2012-06-17 20:25:32 +02:00 |
|
Stephan Bergemann
|
92e35bd843
|
now a little less in template - more in ajax controller
|
2012-06-17 20:25:32 +02:00 |
|
Stephan Bergemann
|
7f485d1b20
|
contacts app now lists contacts sorted by expandable/collapsable addressbooks
|
2012-06-17 20:25:32 +02:00 |
|
Georg Ehrke
|
4b872d10fc
|
Merge branch 'master' into calendar_export
|
2012-06-17 16:41:44 +02:00 |
|
Tom Needham
|
b064fc6968
|
user_migrate: remove old code
|
2012-06-17 12:06:40 +00:00 |
|
Georg Ehrke
|
a8da950819
|
Merge branch 'master' into calendar_export
|
2012-06-17 08:36:20 +02:00 |
|
Robin Appelman
|
ad4f066bac
|
suppress error when using is_dir on non directory in smb backend
|
2012-06-17 03:09:49 +02:00 |
|
Robin Appelman
|
ed66c63c29
|
improve caching smb results a bit
|
2012-06-17 02:59:38 +02:00 |
|
Robin Appelman
|
769cbe9a4c
|
improve filecache support for smb
|
2012-06-17 02:54:23 +02:00 |
|
Thomas Tanghus
|
9c6d82d00d
|
PDF Viewer: Double encode link.
|
2012-06-16 19:48:33 +02:00 |
|
Georg Ehrke
|
56f8fc0f70
|
Merge branch 'master' into calendar_export
|
2012-06-16 19:04:45 +02:00 |
|
Thomas Tanghus
|
1118498050
|
files_imageviewer: Double encode paths. Fixes oc-1016.
|
2012-06-16 18:54:55 +02:00 |
|
Thomas Tanghus
|
4cbdd59859
|
Fix char encoding.
|
2012-06-16 18:38:20 +02:00 |
|
Thomas Tanghus
|
6642ef6a50
|
Fix string encoding probs.
|
2012-06-16 18:06:47 +02:00 |
|
Georg Ehrke
|
be4820bbca
|
Merge branch 'master' into calendar_export
|
2012-06-16 09:48:32 +02:00 |
|
Georg Ehrke
|
31ec93bd00
|
remove a lot of closing php tags and empty lines at a file's end in calendar app
|
2012-06-16 09:45:17 +02:00 |
|
Georg Ehrke
|
4d392801cc
|
Merge branch 'master' into calendar_export
|
2012-06-16 09:41:24 +02:00 |
|
Georg Ehrke
|
b6375e7a8c
|
remove a closing php tag in calendar
|
2012-06-16 09:40:03 +02:00 |
|
Georg Ehrke
|
81e8ffc4ba
|
Merge branch 'master' into calendar_export
|
2012-06-16 09:35:48 +02:00 |
|
Robin Appelman
|
bf2062b09d
|
write_close the session when scanning files or music
|
2012-06-16 01:35:39 +02:00 |
|
Robin Appelman
|
195c37f88a
|
fix for encryption binary files
|
2012-06-16 01:31:03 +02:00 |
|
Tom Needham
|
8484e16516
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-06-15 23:14:48 +00:00 |
|
Tom Needham
|
e37ef6dd47
|
Move user import to personal settings. Fix user migration between servers.
|
2012-06-15 23:14:40 +00:00 |
|
Bart Visscher
|
4268fe61ba
|
Calendar: Write-close session to enable parallel events.php requests
|
2012-06-16 00:44:23 +02:00 |
|
Bart Visscher
|
6d3ae575b6
|
Remove $DOCUMENTROOT, not used
|
2012-06-16 00:11:36 +02:00 |
|
Robin Appelman
|
03951ccc6b
|
fix encryption proxy for updated filecache
|
2012-06-15 23:11:55 +02:00 |
|
Robin Appelman
|
19bfe21401
|
add binary test case for encryption
|
2012-06-15 23:11:33 +02:00 |
|
Georg Ehrke
|
4d2894f390
|
Merge branch 'master' into calendar_export
|
2012-06-15 20:48:26 +02:00 |
|
Robin Appelman
|
f06c08a637
|
cleanup oc_filecache, splitting it in several parts and using the new hasUpdated
|
2012-06-15 19:56:15 +02:00 |
|
Robin Appelman
|
449760f665
|
add hasUpdated to oc_filestorage
|
2012-06-15 16:43:24 +02:00 |
|
Thomas Tanghus
|
8f6121ffa8
|
Files: Double encode download links. Fix for oc-1016.
|
2012-06-15 15:57:04 +02:00 |
|