Georg Ehrke
|
16560fe5c1
|
Merge branch 'master' into calendar_repeat
|
2012-06-18 15:59:26 +02:00 |
|
Georg Ehrke
|
6e405513ab
|
Merge branch 'master' into calendar_export
|
2012-06-18 15:59:21 +02:00 |
|
Georg Ehrke
|
13aad8f06d
|
some little fixes for repeating events caching
|
2012-06-18 15:58:01 +02:00 |
Bart Visscher
|
2f00384b51
|
Use TemplateLayout functions for finding js and css files in minimizer
|
2012-06-18 15:40:48 +02:00 |
|
Bart Visscher
|
3000e8f9d5
|
Prepare template js and css functions for use in the js and css minimizers
|
2012-06-18 15:40:48 +02:00 |
|
Bart Visscher
|
180243d92a
|
Move page layout handling to its own class
|
2012-06-18 15:40:48 +02:00 |
|
Bart Visscher
|
332603a263
|
Move formfactor code to OC_Template
|
2012-06-18 15:40:48 +02:00 |
|
Bart Visscher
|
79f9d61ec8
|
Allow apps to load before login, needed for user_openid
|
2012-06-18 15:40:48 +02:00 |
Bjoern Schiessle
|
405ac36e0c
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-06-18 15:38:24 +02:00 |
|
Bjoern Schiessle
|
2fd7df57d9
|
don't add the "Shared"-directory size to users quota
|
2012-06-18 15:35:22 +02:00 |
|
Georg Ehrke
|
beed6e0f0e
|
Revert "Revert "create OC_Calendar_Object::generateStartEndDate function""
This reverts commit e3b58f6783.
|
2012-06-18 14:47:58 +02:00 |
|
Georg Ehrke
|
e3b58f6783
|
Revert "create OC_Calendar_Object::generateStartEndDate function"
This reverts commit aa7ce480f4.
|
2012-06-18 14:47:09 +02:00 |
|
Georg Ehrke
|
e31c9a7b6f
|
Merge branch 'master' into oc_error
|
2012-06-18 14:34:49 +02:00 |
|
Georg Ehrke
|
6b6d3d68d4
|
Merge branch 'master' into calendar_repeat
|
2012-06-18 14:34:43 +02:00 |
|
Georg Ehrke
|
c2b7d05188
|
Merge branch 'master' into calendar_export
|
2012-06-18 14:34:38 +02:00 |
Florian Hülsmann
|
7064f3a8a8
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-06-18 13:37:25 +02:00 |
|
Florian Hülsmann
|
4a50c15a8e
|
corrected header width and floating (can now dynamically add stuff to header); someone may test this in IE
|
2012-06-18 13:36:49 +02:00 |
|
Bart Visscher
|
977cd0df6b
|
Fix errors for minimizer
|
2012-06-18 11:33:24 +02:00 |
|
Bart Visscher
|
a5a1a9fd4a
|
Forgot a file
|
2012-06-18 11:12:53 +02:00 |
|
Bart Visscher
|
617de811f7
|
Cache the minimized output also on the server
|
2012-06-18 11:11:46 +02:00 |
|
Bjoern Schiessle
|
91f69858e4
|
escape log messages to avoid possible js execution
|
2012-06-18 09:42:31 +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
|
1710086b67
|
Merge branch 'master' into oc_error
|
2012-06-17 16:41:54 +02:00 |
|
Georg Ehrke
|
b8daae30b6
|
Merge branch 'master' into calendar_repeat
|
2012-06-17 16:41:49 +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
|
06c610c2ee
|
Merge branch 'master' into oc_error
|
2012-06-17 08:36:33 +02:00 |
|
Georg Ehrke
|
229587a31e
|
Merge branch 'master' into calendar_repeat
|
2012-06-17 08:36:26 +02: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 |